From 2a83440c44fd2217c7371ca3d82c8d26e9bef28d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Cort=C3=A9z?= Date: Sat, 28 Mar 2015 05:02:17 -0600 Subject: [PATCH] Fixes in inverted buffers, fixes in people buffers too --- src/controller/buffersController.py | 3 +-- src/controller/mainController.py | 2 +- src/twitter/buffers/stream.py | 10 ++++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/controller/buffersController.py b/src/controller/buffersController.py index 638b3fcd..8a4912a2 100644 --- a/src/controller/buffersController.py +++ b/src/controller/buffersController.py @@ -278,7 +278,7 @@ class baseBufferController(bufferController): if self.buffer.list.get_count() == 0: for i in self.session.db[self.name]: tweet = self.compose_function(i, self.session.db, self.session.settings["general"]["relative_times"]) - self.buffer.list.insert_item(self.session.settings["general"]["reverse_timelines"], *tweet) + self.buffer.list.insert_item(False, *tweet) self.buffer.set_position(self.session.settings["general"]["reverse_timelines"]) elif self.buffer.list.get_count() > 0: if self.session.settings["general"]["reverse_timelines"] == False: @@ -556,7 +556,6 @@ class peopleBufferController(baseBufferController): return tweet def add_new_item(self, item): - self.session.db[self.name]["items"].append(item) tweet = self.compose_function(item, self.session.db, self.session.settings["general"]["relative_times"]) if self.session.settings["general"]["reverse_timelines"] == False: self.buffer.list.insert_item(False, *tweet) diff --git a/src/controller/mainController.py b/src/controller/mainController.py index c1d789f5..5c4a2a31 100644 --- a/src/controller/mainController.py +++ b/src/controller/mainController.py @@ -371,7 +371,7 @@ class Controller(object): """ Searches words or users in twitter. This creates a new buffer containing the search results.""" log.debug("Creating a new search...") dlg = dialogs.search.searchDialog(value) - if dlg.get_response() == widgetUtils.OK and dlg.get_text() != "": + if dlg.get_response() == widgetUtils.OK and dlg.get("term") != "": term = dlg.get("term") buffer = self.get_best_buffer() if dlg.get("tweets") == True: diff --git a/src/twitter/buffers/stream.py b/src/twitter/buffers/stream.py index c79645eb..6c822049 100644 --- a/src/twitter/buffers/stream.py +++ b/src/twitter/buffers/stream.py @@ -68,10 +68,16 @@ class streamer(TwythonStreamer): def check_follower(self, data): if data["target"]["screen_name"] == self.session.db["user_name"]: - self.session.db["followers"]["items"].append(data["source"]) + if self.session.settings["general"]["reverse_timelines"] == False: + self.session.db["followers"]["items"].append(data["source"]) + else: + self.session.db["followers"]["items"].insert(0, data["source"]) pub.sendMessage("follower", data=data["source"], user = self.get_user()) else: - self.session.db["friends"]["items"].append(data["target"]) + if self.session.settings["general"]["reverse_timelines"] == False: + self.session.db["friends"]["items"].append(data["target"]) + else: + self.session.db["friends"]["items"].insert(0, data["target"]) pub.sendMessage("friend", data=data["target"], user=self.get_user()) ###