From b4eb11a6de9391bc83b2201f0aa54f395aef52db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Cort=C3=A9z?= Date: Fri, 27 Nov 2015 09:17:14 -0600 Subject: [PATCH] Some list improvements --- src/sessionmanager/session.py | 5 +++-- src/twitter/buffers/indibidual.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/sessionmanager/session.py b/src/sessionmanager/session.py index bc1552c5..96c7d960 100644 --- a/src/sessionmanager/session.py +++ b/src/sessionmanager/session.py @@ -369,8 +369,9 @@ class Session(object): def remove_stream(self, stream): if stream == "timelinesStream": - self.timelinesStream.disconnect() - del self.timelinesStream + if hasattr(self, "timelinesStream"): + self.timelinesStream.disconnect() + del self.timelinesStream else: self.main_stream.disconnect() del self.main_stream diff --git a/src/twitter/buffers/indibidual.py b/src/twitter/buffers/indibidual.py index 7fc52a6e..d58d67f5 100644 --- a/src/twitter/buffers/indibidual.py +++ b/src/twitter/buffers/indibidual.py @@ -46,7 +46,7 @@ class timelinesStreamer(TwythonStreamer): try: i.users.index(data["user"]["id"]) usr = data["in_reply_to_user_id"] - if (usr != None or usr in self.friends) or data.has_key("retweeted_status"): + if (usr != None and usr in self.friends) or data.has_key("retweeted_status"): data = self.session.check_quoted_status(data) if self.session.settings["general"]["reverse_timelines"] == False: self.session.db["%s" % (i.name,)].append(data) else: self.session.db["%s" % (i.name,)].insert(0, data)