merge #3549: [twitter] fix search (#3536)

mikf · Jan 20, 2023 · 137de09 · 137de09
2 parents 02e314c + ab58c37
commit 137de09
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py
@@ -1101,7 +1101,7 @@ def search_adaptive(self, query):
         endpoint = "/2/search/adaptive.json"
         params = self.params.copy()
         params["q"] = query
-        #  params["tweet_search_mode"] = "live"
+        params["tweet_search_mode"] = "live"
         params["query_source"] = "typed_query"
         params["pc"] = "1"
         params["spelling_corrections"] = "1"
@@ -1241,6 +1241,7 @@ def _call(self, endpoint, params, method="GET", auth=True):
 
     def _pagination_legacy(self, endpoint, params):
         original_retweets = (self.extractor.retweets == "original")
+        bottom = ("cursor-bottom-", "sq-cursor-bottom")
 
         while True:
             data = self._call(endpoint, params)
@@ -1261,7 +1262,7 @@ def _pagination_legacy(self, endpoint, params):
                     entries = instr["addEntries"]["entries"]
                 elif "replaceEntry" in instr:
                     entry = instr["replaceEntry"]["entry"]
-                    if entry["entryId"].startswith("cursor-bottom-"):
+                    if entry["entryId"].startswith(bottom):
                         cursor = (entry["content"]["operation"]
                                   ["cursor"]["value"])
 
@@ -1278,7 +1279,7 @@ def _pagination_legacy(self, endpoint, params):
                         entry["content"]["timelineModule"]["metadata"]
                         ["conversationMetadata"]["allTweetIds"][::-1])
 
-                elif entry_startswith(("cursor-bottom-", "sq-cursor-bottom")):
+                elif entry_startswith(bottom):
                     cursor = entry["content"]["operation"]["cursor"]
                     if not cursor.get("stopOnEmptyResponse", True):
                         # keep going even if there are no tweets