mikf/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[twitter] fall back to unfiltered search (#2766)

Browse Source
This commit is contained in:
Mike Fährmann 2022-07-20 15:12:08 +02:00
parent 0aa8345a13
commit 8d0801ad8e
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gallery_dl/extractor/twitter.py
View File

@ -454,7 +454,6 @@ class TwitterTimelineExtractor(TwitterExtractor):
tweet = None
for tweet in self._select_tweet_source()(self.user):
yield tweet
if tweet is None:
return
@ -463,12 +462,19 @@ class TwitterTimelineExtractor(TwitterExtractor):
self._user["name"], tweet["rest_id"])
if self.retweets:
query += " include:retweets include:nativeretweets"
if not self.textonly:
query += (" (filter:images OR"
" filter:native_video OR"
" card_name:animated_gif)")
# yield search results starting from last tweet id
if not self.textonly:
# try to search for media-only tweets
tweet = None
for tweet in self.api.search_adaptive(query + (
" (filter:images OR"
" filter:native_video OR"
" card_name:animated_gif)")):
yield tweet
if tweet is not None:
return
# yield unfiltered search results
yield from self.api.search_adaptive(query)
def _select_tweet_source(self):