Merge branch 'next-gen' into unittests

src/application.py

@@ -1,16 +1,14 @@
 # -*- coding: utf-8 -*-
-import datetime
-
 name = 'TWBlue'
 short_name='twblue'
 update_url = 'https://twblue.es/updates/updates.php'
 mirror_update_url = 'https://raw.githubusercontent.com/manuelcortez/TWBlue/next-gen/updates/updates.json'
 authors = ["Manuel Cortéz", "José Manuel Delicado"]
 authorEmail = "manuel@manuelcortez.net"
-copyright = "Copyright (C) 2013-2021, Manuel cortéz."
+copyright = "Copyright (C) 2013-2022, MCV Software."
 description = name+" is an app designed to use Twitter simply and efficiently while using minimal system resources. This app provides access to most Twitter  features."
 translators = ["Manuel Cortéz (English)", "Mohammed Al Shara, Hatoun Felemban (Arabic)", "Francisco Torres (Catalan)", "Manuel cortéz (Spanish)", "Sukil Etxenike Arizaleta (Basque)", "Jani Kinnunen (finnish)", "Corentin Bacqué-Cazenave (Français)", "Juan Buño (Galician)", "Steffen Schultz (German)", "Zvonimir Stanečić (Croatian)", "Robert Osztolykan (Hungarian)", "Christian Leo Mameli (Italian)", "Riku (Japanese)", "Paweł Masarczyk (Polish)", "Odenilton Júnior Santos (Portuguese)", "Florian Ionașcu, Nicușor Untilă (Romanian)", "Natalia Hedlund, Valeria Kuznetsova (Russian)", "Aleksandar Đurić (Serbian)", "Burak Yüksek (Turkish)"]
-url = u"https://twblue.es"
+url = "https://twblue.es"
 report_bugs_url = "https://github.com/manuelcortez/twblue/issues"
 supported_languages = []
 version = "11"

src/controller/buffers/twitter/base.py

@@ -142,7 +142,7 @@ class BaseBuffer(base.Buffer):
             log.debug("Starting stream for buffer %s, account %s and type %s" % (self.name, self.account, self.type))
             log.debug("args: %s, kwargs: %s" % (self.args, self.kwargs))
             if self.name != "direct_messages":
-                val = self.session.call_paged(self.function, *self.args, **self.kwargs)
+                val = self.session.call_paged(self.function, self.name, *self.args, **self.kwargs)
             else:
                 # 50 results are allowed per API call, so let's assume max value can be 50.
                 # reference: https://developer.twitter.com/en/docs/twitter-api/v1/direct-messages/sending-and-receiving/api-reference/list-events

src/sessions/twitter/session.py

@@ -256,21 +256,22 @@ class Session(base.baseSession):
         tl = self.call_paged("favorites", *args, **kwargs)
         return self.order_buffer(name, tl)
 
-    def call_paged(self, update_function, *args, **kwargs):
+    def call_paged(self, update_function, name, *args, **kwargs):
         """ Makes a call to the Twitter API methods several times. Useful for get methods.
         this function is needed for retrieving more than 200 items.
         update_function str: The function to call. This function must be child of self.twitter
         args and kwargs are passed to update_function.
         returns a list with all items retrieved."""
-        max = 0
         results = []
-        data = getattr(self.twitter, update_function)(count=self.settings["general"]["max_tweets_per_call"], *args, **kwargs)
+        if self.db.get(name) == None or self.db.get(name) == []:
+            last_id = None
+        else:
+            if self.settings["general"]["reverse_timelines"] == False:
+                last_id = self.db[name][0].id
+            else:
+                last_id = self.db[name][-1].id
+        data = getattr(self.twitter, update_function)(count=self.settings["general"]["max_tweets_per_call"], since_id=last_id, *args, **kwargs)
         results.extend(data)
-        for i in range(0, max):
-            if i == 0: max_id = results[-1].id
-            else: max_id = results[0].id
-            data = getattr(self.twitter, update_function)(max_id=max_id, count=self.settings["general"]["max_tweets_per_call"], *args, **kwargs)
-            results.extend(data)
         results.reverse()
         return results