From 7dfe2cbb5c201b112bd119812d405e58a7089460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Cort=C3=A9z?= Date: Tue, 3 Nov 2015 05:56:57 -0600 Subject: [PATCH] Lists should work --- src/controller/mainController.py | 3 +-- src/twitter/buffers/indibidual.py | 9 +++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/controller/mainController.py b/src/controller/mainController.py index 5829c135..ffbf6db1 100644 --- a/src/controller/mainController.py +++ b/src/controller/mainController.py @@ -1224,10 +1224,9 @@ class Controller(object): buffer.add_new_item(data) def manage_item_in_list(self, data, user, where): - print "I'm activated!" buffer = self.search_buffer("%s" % (where,), user) if buffer == None: return - play_sound = "tweet_timeline.ogg" + play_sound = "list_tweet.ogg" if "%s" % (where,) not in buffer.session.settings["other_buffers"]["muted_buffers"]: self.notify(buffer.session, play_sound=play_sound) output.speak(_(u"One tweet from %s") % (data["user"]["name"])) diff --git a/src/twitter/buffers/indibidual.py b/src/twitter/buffers/indibidual.py index 23569bae..7fc52a6e 100644 --- a/src/twitter/buffers/indibidual.py +++ b/src/twitter/buffers/indibidual.py @@ -42,23 +42,20 @@ class timelinesStreamer(TwythonStreamer): if self.session.settings["general"]["reverse_timelines"] == False: self.session.db["%s-timeline" % (i,)].append(data) else: self.session.db["%s-timeline" % (i,)].insert(0, data) pub.sendMessage("item-in-timeline", data= data, user= self.session.db["user_name"], who= i) -# return for i in self.session.lists: try: i.users.index(data["user"]["id"]) -# print "Index in the list for the specified user: %d" % (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"): data = self.session.check_quoted_status(data) -# print data if self.session.settings["general"]["reverse_timelines"] == False: self.session.db["%s" % (i.name,)].append(data) - else: self.session.db["%s" % (i,)].insert(0, data) + else: self.session.db["%s" % (i.name,)].insert(0, data) pub.sendMessage("item-in-list", data=data, user=self.session.db["user_name"], where=i.name) elif usr == None: if self.session.settings["general"]["reverse_timelines"] == False: self.session.db["%s" % (i.name,)].append(data) - else: self.session.db["%s" % (i,)].insert(0, data) + else: self.session.db["%s" % (i.name,)].insert(0, data) pub.sendMessage("item-in-list", data=data, user=self.session.db["user_name"], where=i.name) - except NameError: + except ValueError: pass def set_friends(self, friends):