From 41b10e3a843642a84624c29fa045c4a572f0ae28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Cort=C3=A9z?= Date: Thu, 4 Aug 2016 17:40:07 -0500 Subject: [PATCH] Long tweets are displayed properly in lists --- src/controller/buffersController.py | 8 ++++---- src/twitter/buffers/indibidual.py | 8 ++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/controller/buffersController.py b/src/controller/buffersController.py index ad3d6dde..942f6f6a 100644 --- a/src/controller/buffersController.py +++ b/src/controller/buffersController.py @@ -585,10 +585,10 @@ class baseBufferController(bufferController): url=urls_list.get_string() if hasattr(urls_list, "destroy"): urls_list.destroy() if url != '': - try: - sound.URLPlayer.play(url, self.session.settings["sound"]["volume"]) - except: - log.error("Exception while executing audio method.") +# try: + sound.URLPlayer.play(url, self.session.settings["sound"]["volume"]) +# except: +# log.error("Exception while executing audio method.") # @_tweets_exist def url(self, url='', announce=True, *args, **kwargs): diff --git a/src/twitter/buffers/indibidual.py b/src/twitter/buffers/indibidual.py index 3d93d659..98fb23f5 100644 --- a/src/twitter/buffers/indibidual.py +++ b/src/twitter/buffers/indibidual.py @@ -38,25 +38,29 @@ class timelinesStreamer(TwythonStreamer): data_ = self.session.check_quoted_status(data) data_ = self.session.check_long_tweet(data_) data = data_ - except AttributeError: + except ValueError: pass 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"]) usr = data["in_reply_to_user_id"] if (usr != None and usr in self.friends) or data.has_key("retweeted_status"): data = self.session.check_quoted_status(data) + data = self.session.check_long_tweet(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) pub.sendMessage("item-in-list", data=data, user=self.session.db["user_name"], where=i.name) elif usr == None: + data = self.session.check_quoted_status(data) + data = self.session.check_long_tweet(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) pub.sendMessage("item-in-list", data=data, user=self.session.db["user_name"], where=i.name) - except ValueError: + except NameError: pass def set_friends(self, friends):