From 6cbc434b54e285d901f6e0a9c3682175facc368b Mon Sep 17 00:00:00 2001 From: ActuallyKit <54536660+ActuallyKit@users.noreply.github.com> Date: Sun, 9 Jul 2023 02:28:35 +0700 Subject: [PATCH 1/3] Fix users pagination --- gallery_dl/extractor/twitter.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py index c0b4ab615f..8cf8f19454 100644 --- a/gallery_dl/extractor/twitter.py +++ b/gallery_dl/extractor/twitter.py @@ -1762,9 +1762,8 @@ def _pagination_users(self, endpoint, variables, path=None): yield user elif entry["entryId"].startswith("cursor-bottom-"): cursor = entry["content"]["value"] - elif instr["type"] == "TimelineTerminateTimeline": - if instr["direction"] == "Bottom": - stop = True + if (cursor.startswith("-1|") or cursor.startswith("0|")): + stop = True if stop or not cursor or not entry: return From a437a34bcf925243edee0f43e5cc86b11e1610b4 Mon Sep 17 00:00:00 2001 From: ActuallyKit <54536660+ActuallyKit@users.noreply.github.com> Date: Sun, 9 Jul 2023 02:41:46 +0700 Subject: [PATCH 2/3] fix lint i guess? --- gallery_dl/extractor/twitter.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py index 8cf8f19454..420212a1b7 100644 --- a/gallery_dl/extractor/twitter.py +++ b/gallery_dl/extractor/twitter.py @@ -1762,7 +1762,9 @@ def _pagination_users(self, endpoint, variables, path=None): yield user elif entry["entryId"].startswith("cursor-bottom-"): cursor = entry["content"]["value"] - if (cursor.startswith("-1|") or cursor.startswith("0|")): + if (cursor.startswith("-1|")): + stop = True + if (cursor.startswith("0|")): stop = True if stop or not cursor or not entry: From c321c773f2cbc8cd1cb4ced405c7abcbac705b96 Mon Sep 17 00:00:00 2001 From: ActuallyKit <54536660+ActuallyKit@users.noreply.github.com> Date: Sun, 9 Jul 2023 02:52:04 +0700 Subject: [PATCH 3/3] make the code less ugly --- gallery_dl/extractor/twitter.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py index 420212a1b7..ff2e858c64 100644 --- a/gallery_dl/extractor/twitter.py +++ b/gallery_dl/extractor/twitter.py @@ -1762,9 +1762,8 @@ def _pagination_users(self, endpoint, variables, path=None): yield user elif entry["entryId"].startswith("cursor-bottom-"): cursor = entry["content"]["value"] - if (cursor.startswith("-1|")): - stop = True - if (cursor.startswith("0|")): + if cursor.startswith("-1|") or \ + cursor.startswith("0|"): stop = True if stop or not cursor or not entry: