diff --git a/test_vx.py b/test_vx.py index a1bed7e..4ab95e6 100644 --- a/test_vx.py +++ b/test_vx.py @@ -53,8 +53,15 @@ def test_syndicationAPI(): assert tweet["full_text"]==testMediaTweet_compare['description'] def test_extractStatusV2Anon(): + tweet = twExtract.extractStatusV2AnonLegacy(testTextTweet,None) + assert tweet["full_text"]==testTextTweet_compare['description'] + tweet = twExtract.extractStatusV2AnonLegacy(testVideoTweet,None) + assert tweet["full_text"]==testVideoTweet_compare['description'] tweet = twExtract.extractStatusV2AnonLegacy(testMediaTweet,None) assert tweet["full_text"]==testMediaTweet_compare['description'] + tweet = twExtract.extractStatusV2AnonLegacy(testMultiMediaTweet,None) + assert tweet["full_text"][:94]==testMultiMediaTweet_compare['description'][:94] + def test_v2API(): tweet = twExtract.extractStatusV2Legacy(testMediaTweet,workaroundTokens=tokens) diff --git a/twitfix.py b/twitfix.py index 8a58a6a..2723e83 100644 --- a/twitfix.py +++ b/twitfix.py @@ -156,12 +156,20 @@ def twitfix(sub_path): image = ( int(request.url[-1]) - 1 ) return embed_video(clean, image) - elif request.url.startswith("https://api.vx"): + elif True:#request.url.startswith("https://api.vx"): twitter_url = "https://twitter.com/" + sub_path try: - tweet = twExtract.extractStatusV2(twitter_url,workaroundTokens=config['config']['workaroundTokens'].split(',')) + try: + tweet = twExtract.extractStatusV2Anon(twitter_url) + except: + tweet = None + if tweet is None: + tweet = twExtract.extractStatusV2(twitter_url,workaroundTokens=config['config']['workaroundTokens'].split(',')) tweetL = tweet["legacy"] - userL = tweet["core"]["user_result"]["result"]["legacy"] + if "user_result" in tweet["core"]: + userL = tweet["core"]["user_result"]["result"]["legacy"] + elif "user_results" in tweet["core"]: + userL = tweet["core"]["user_results"]["result"]["legacy"] media=[] media_extended=[] hashtags=[]