From 0f1e7ff3199113988e2a9ac9b7f8d1b594f3e113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Mon, 7 Feb 2022 23:18:35 +0100 Subject: [PATCH] [twitter] fix extraction (#2275) --- CHANGELOG.md | 2 ++ gallery_dl/extractor/twitter.py | 8 +++++++- gallery_dl/version.py | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 091bb902..cb6da7a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## Unreleased + ## 1.20.4 - 2022-02-06 ### Additions - [e621] add `favorite` extractor ([#2250](https://github.com/mikf/gallery-dl/issues/2250)) diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py index f459fbac..7af88557 100644 --- a/gallery_dl/extractor/twitter.py +++ b/gallery_dl/extractor/twitter.py @@ -1091,7 +1091,13 @@ class TwitterAPI(): instructions = instructions[key] instructions = instructions["instructions"] - entries = instructions[0]["entries"] + for instr in instructions: + if instr.get("type") == "TimelineAddEntries": + entries = instr["entries"] + break + else: + raise KeyError() + except (KeyError, IndexError): extr.log.debug(data) diff --git a/gallery_dl/version.py b/gallery_dl/version.py index cedbfa06..cb832bb3 100644 --- a/gallery_dl/version.py +++ b/gallery_dl/version.py @@ -6,4 +6,4 @@ # it under the terms of the GNU General Public License version 2 as # published by the Free Software Foundation. -__version__ = "1.20.4" +__version__ = "1.20.5-dev"