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

[twitter] do not overwrite previously assigned users (#3922)

Browse Source
This commit is contained in:
Mike Fährmann
2023-04-16 17:11:21 +02:00
parent 02ec5bb8e5
commit 480bc34e54
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gallery_dl/extractor/twitter.py
View File

@@ -45,7 +45,8 @@ class TwitterExtractor(Extractor):
if not self.config("transform", True): if not self.config("transform", True):
self._transform_user = util.identity self._transform_user = util.identity
self._transform_tweet = util.identity self._transform_tweet = util.identity
self._user = self._user_obj = None self._user = None
self._user_obj = None
self._user_cache = {} self._user_cache = {}
self._init_sizes() self._init_sizes()
@@ -369,8 +370,9 @@ class TwitterExtractor(Extractor):
return udata return udata
def _assign_user(self, user): def _assign_user(self, user):
self._user_obj = user if self._user_obj is None:
self._user = self._transform_user(user) self._user_obj = user
self._user = self._transform_user(user)
def _users_result(self, users): def _users_result(self, users):
userfmt = self.config("users") userfmt = self.config("users")
@@ -769,6 +771,13 @@ class TwitterTweetExtractor(TwitterExtractor):
"pattern": r"https://pbs\.twimg\.com/media/EaK.+=jpg", "pattern": r"https://pbs\.twimg\.com/media/EaK.+=jpg",
"count": 4, "count": 4,
}), }),
# different 'user' and 'author' in quoted Tweet (#3922)
("https://twitter.com/web/status/1644907989109751810", {
"keyword": {
"author": {"id": 321629993 , "name": "Cakes_Comics"},
"user" : {"id": 718928225360080897, "name": "StobiesGalaxy"},
},
}),
# TwitPic embeds (#579) # TwitPic embeds (#579)
("https://twitter.com/i/web/status/112900228289540096", { ("https://twitter.com/i/web/status/112900228289540096", {
"options": (("twitpic", True), ("cards", False)), "options": (("twitpic", True), ("cards", False)),