alterware/BetterTwitFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Provide better responses for errors (#196); Fix some extract methods

Browse Source
This commit is contained in:
Dylan
2025-04-29 13:30:57 +01:00
parent 1d03bf80e7
commit 54ec334730
5 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
twExtract/__init__.py
View File

@ -315,7 +315,11 @@ def extractStatusV2Android(url,workaroundTokens):
print(f"Error in output: {json.dumps(output['errors'])}")
# try another token
continue
entries=output['data']['timeline_response']['instructions'][0]['entries']
entries = None
for instruction in output['data']['timeline_response']['instructions']:
if instruction["__typename"] == "TimelineAddEntries":
entries = instruction['entries']
break
tweetEntry=None
for entry in entries:
if 'content' not in entry:
@ -372,7 +376,11 @@ def extractStatusV2TweetDetail(url,workaroundTokens):
print(f"Error in output: {json.dumps(output['errors'])}")
# try another token
continue
entries=output['data']['threaded_conversation_with_injections_v2']['instructions'][0]['entries']
entries = None
for instruction in output['data']['threaded_conversation_with_injections_v2']['instructions']:
if instruction["type"] == "TimelineAddEntries":
entries = instruction['entries']
break
tweetEntry=None
for entry in entries:
if 'content' not in entry:
@ -501,6 +509,8 @@ def extractUser(url,workaroundTokens):
raise TwExtractError(error["code"], error["message"])
return output
except Exception as e:
if hasattr(e,"msg") and (e.msg == 'User has been suspended.' or e.msg == 'User not found.'):
raise e
continue
raise TwExtractError(400, "Extract error")