mirror/instaloader
1
0
Fork 0
mirror of https://github.com/instaloader/instaloader.git synced 2026-10-16 13:48:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix obtaining post metadata when not logged-in

Browse Source 
Fixes #960.
This commit is contained in:
Alexander Graf
2021-01-24 20:47:57 +01:00
parent 3955540080
commit a9cf78655c
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
instaloader/structures.py
+20 -7
View File
@@ -141,11 +141,16 @@ class Post:
def _obtain_metadata(self): def _obtain_metadata(self):
if not self._full_metadata_dict: if not self._full_metadata_dict:
pic_json = self._context.graphql_query( if self._context.is_logged_in:
'2b0673e0dc4580674a88d426fe00ea90', pic_json = self._context.graphql_query(
{'shortcode': self.shortcode} '2b0673e0dc4580674a88d426fe00ea90',
) {'shortcode': self.shortcode}
self._full_metadata_dict = pic_json['data']['shortcode_media'] )
self._full_metadata_dict = pic_json['data']['shortcode_media']
else:
# if not logged in, above graphql query is responded with a redirect to login page
pic_json = self._context.get_json("p/{0}/".format(self.shortcode), params={})
self._full_metadata_dict = pic_json['entry_data']['PostPage'][0]['graphql']['shortcode_media']
if self._full_metadata_dict is None: if self._full_metadata_dict is None:
raise BadResponseException("Fetching Post metadata failed.") raise BadResponseException("Fetching Post metadata failed.")
if self.shortcode != self._full_metadata_dict['shortcode']: if self.shortcode != self._full_metadata_dict['shortcode']:
@@ -449,8 +454,16 @@ class Post:
# Avoid doing additional requests if there are no comments # Avoid doing additional requests if there are no comments
return return
comment_edges = self._field('edge_media_to_comment', 'edges') try:
answers_count = sum([edge['node'].get('edge_threaded_comments', {}).get('count', 0) for edge in comment_edges]) # this seems to be the structure for logged-in accesses
comment_edges = self._field('edge_media_to_comment', 'edges')
answers_count = sum([edge['node'].get('edge_threaded_comments', {}).get('count', 0)
for edge in comment_edges])
except KeyError:
# ... and this for anonymous accesses
comment_edges = self._field('edge_media_to_parent_comment', 'edges')
answers_count = sum([edge['node']['edge_threaded_comments']['count']
for edge in comment_edges])
if self.comments == len(comment_edges) + answers_count: if self.comments == len(comment_edges) + answers_count:
# If the Post's metadata already contains all parent comments, don't do GraphQL requests to obtain them # If the Post's metadata already contains all parent comments, don't do GraphQL requests to obtain them