diff --git a/msgs.py b/msgs.py index d554d4d..0711f10 100644 --- a/msgs.py +++ b/msgs.py @@ -1,5 +1,7 @@ failedToScan="Failed to scan your link! This may be due to an incorrect link, private/suspended account, deleted tweet, or Twitter itself might be having issues (Check here: https://api.twitterstat.us/)" failedToScanExtra = "\n\nTwitter gave me this error: " +tweetNotFound="Tweet not found." +tweetSuspended="This Tweet is from a suspended account." def genLikesDisplay(vnf): return ("\n\nšŸ’– " + str(vnf['likes']) + " šŸ” " + str(vnf['rts']) + "\n") diff --git a/test_vx.py b/test_vx.py index cbf02a3..3417286 100644 --- a/test_vx.py +++ b/test_vx.py @@ -3,9 +3,8 @@ from wsgiref import headers os.environ["RUNNING_TESTS"]="1" import twitfix,twExtract -import pytest -import json import cache +import msgs from flask.testing import FlaskClient client = FlaskClient(twitfix.app) @@ -133,4 +132,14 @@ def test_embedFromOutdatedCache(): # presets a cache that has VNF's with missing resp = client.get(testMediaTweet.replace("https://twitter.com",""),headers={"User-Agent":"test"}) assert resp.status_code==200 resp = client.get(testMultiMediaTweet.replace("https://twitter.com",""),headers={"User-Agent":"test"}) - assert resp.status_code==200 \ No newline at end of file + assert resp.status_code==200 + +def test_directEmbed(): + resp = client.get(testVideoTweet.replace("https://twitter.com","")+".mp4",headers={"User-Agent":"test"}) + assert resp.status_code==200 + assert videoVNF_compare["url"] in str(resp.data) + +def test_message404(): + resp = client.get("https://twitter.com/jack/status/12345",headers={"User-Agent":"test"}) + assert resp.status_code==200 + assert msgs.tweetNotFound in str(resp.data) \ No newline at end of file diff --git a/twitfix.py b/twitfix.py index feb89e0..dbed626 100644 --- a/twitfix.py +++ b/twitfix.py @@ -208,9 +208,9 @@ def vnfFromCacheOrDL(video_link): return vnf,None except ExtractorError as exErr: if 'HTTP Error 404' in exErr.msg: - exErr.msg="Tweet not found." + exErr.msg=msgs.tweetNotFound elif 'suspended' in exErr.msg: - exErr.msg="This Tweet is from a suspended account." + exErr.msg=msgs.tweetSuspended else: exErr.msg=None return None,exErr.msg