diff --git a/docs/configuration.rst b/docs/configuration.rst index 00bf7978..51be9d30 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -1169,12 +1169,21 @@ Description Extract tweet text as ``content`` metadata. =========== ===== +extractor.twitter.replies +------------------------- +=========== ===== +Type ``bool`` +Default ``true`` +Description Extract media from replies to other Tweets. +=========== ===== + + extractor.twitter.retweets -------------------------- =========== ===== Type ``bool`` Default ``true`` -Description Extract images from retweets. +Description Extract media from Retweets. =========== ===== diff --git a/docs/gallery-dl.conf b/docs/gallery-dl.conf index 83c50880..c6d8b03f 100644 --- a/docs/gallery-dl.conf +++ b/docs/gallery-dl.conf @@ -154,6 +154,7 @@ "twitter": { "content": false, + "replies": true, "retweets": true, "twitpic": false, "videos": true diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py index 3a274c78..c409f54d 100644 --- a/gallery_dl/extractor/twitter.py +++ b/gallery_dl/extractor/twitter.py @@ -33,6 +33,7 @@ class TwitterExtractor(Extractor): self._user_dict = None self.logged_in = False self.retweets = self.config("retweets", True) + self.replies = self.config("replies", True) self.twitpic = self.config("twitpic", False) self.content = self.config("content", False) self.videos = self.config("videos", True) @@ -48,7 +49,9 @@ class TwitterExtractor(Extractor): for tweet in self.tweets(): data = self._data_from_tweet(tweet) - if not data or not self.retweets and data["retweet_id"]: + if not data or \ + not self.retweets and data["retweet_id"] or \ + not self.replies and data["reply"]: continue data.update(metadata) @@ -370,6 +373,11 @@ class TwitterTweetExtractor(TwitterExtractor): "options": (("videos", "ytdl"),), "pattern": r"ytdl:https://twitter.com/i/web.+/1103767554424598528", }), + # 'replies' option (#705) + ("https://twitter.com/tyson_hesse/status/1103767554424598528", { + "options": (("replies", False),), + "count": 0, + }), # /i/web/ URL ("https://twitter.com/i/web/status/1155074198240292865", { "pattern": r"https://pbs.twimg.com/media/EAel0vUUYAAZ4Bq.jpg:orig",