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

[instagram] fix 'avatar' & 'info' extractors (#8978)

Browse Source 
export user lookup logic into 'user_by_screen_name' method
This commit is contained in:
Mike Fährmann
2026-02-08 15:54:20 +01:00
parent d3c4328078
commit 53747c63ba
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
gallery_dl/extractor/instagram.py
View File

@@ -570,7 +570,7 @@ class InstagramTaggedExtractor(InstagramExtractor):
user = self.api.user_by_id(self.user_id) user = self.api.user_by_id(self.user_id)
else: else:
self.user_id = self.api.user_id(self.item) self.user_id = self.api.user_id(self.item)
user = self.api.user_by_name(self.item) user = self.api.user_by_screen_name(self.item)
return { return {
"tagged_owner_id" : user["id"], "tagged_owner_id" : user["id"],
@@ -757,7 +757,7 @@ class InstagramInfoExtractor(InstagramExtractor):
if screen_name.startswith("id:"): if screen_name.startswith("id:"):
user = self.api.user_by_id(screen_name[3:]) user = self.api.user_by_id(screen_name[3:])
else: else:
user = self.api.user_by_name(screen_name) user = self.api.user_by_screen_name(screen_name)
return iter(((Message.Directory, "", user),)) return iter(((Message.Directory, "", user),))
@@ -779,7 +779,7 @@ class InstagramAvatarExtractor(InstagramExtractor):
if user.startswith("id:"): if user.startswith("id:"):
user = self.api.user_by_id(user[3:]) user = self.api.user_by_id(user[3:])
else: else:
user = self.api.user_by_name(user) user = self.api.user_by_screen_name(user)
user["pk"] = user["id"] user["pk"] = user["id"]
url = user.get("profile_pic_url_hd") or user["profile_pic_url"] url = user.get("profile_pic_url_hd") or user["profile_pic_url"]
avatar = {"url": url, "width": 0, "height": 0} avatar = {"url": url, "width": 0, "height": 0}
@@ -895,12 +895,7 @@ class InstagramRestAPI():
endpoint = f"/v1/users/{user_id}/info/" endpoint = f"/v1/users/{user_id}/info/"
return self._call(endpoint)["user"] return self._call(endpoint)["user"]
def user_id(self, screen_name, check_private=True): def user_by_screen_name(self, screen_name):
if screen_name.startswith("id:"):
if self.extractor.config("metadata"):
self.extractor._user = self.user_by_id(screen_name[3:])
return screen_name[3:]
user = self.user_by_search(screen_name) user = self.user_by_search(screen_name)
if user is None: if user is None:
self.user_by_search.invalidate(screen_name) self.user_by_search.invalidate(screen_name)
@@ -911,11 +906,20 @@ class InstagramRestAPI():
self.user_by_name.invalidate(screen_name) self.user_by_name.invalidate(screen_name)
raise exception.AuthorizationError( raise exception.AuthorizationError(
"Login required to access this profile") "Login required to access this profile")
if check_private and user["is_private"] and \ return user
not user.get("followed_by_viewer", True):
name = user["username"] def user_id(self, screen_name, check_private=True):
s = "" if name.endswith("s") else "s" if screen_name.startswith("id:"):
self.extractor.log.warning("%s'%s posts are private", name, s) if self.extractor.config("metadata"):
self.extractor._user = self.user_by_id(screen_name[3:])
return screen_name[3:]
user = self.user_by_search(screen_name)
if check_private and user.get("is_private") and \
not user.get("followed_by_viewer", True):
name = user["username"]
s = "" if name.endswith("s") else "s"
self.extractor.log.warning("%s'%s posts are private", name, s)
self.extractor._assign_user(user) self.extractor._assign_user(user)
return user["id"] return user["id"]
@@ -1070,6 +1074,8 @@ class InstagramGraphqlAPI():
self._json_dumps = util.json_dumps self._json_dumps = util.json_dumps
api = InstagramRestAPI(extractor) api = InstagramRestAPI(extractor)
self.user_by_screen_name = api.user_by_screen_name
self.user_by_search = api.user_by_search
self.user_by_name = api.user_by_name self.user_by_name = api.user_by_name
self.user_by_id = api.user_by_id self.user_by_id = api.user_by_id
self.user_id = api.user_id self.user_id = api.user_id