Bugfixes and more tests

test_vx_embeds.py

@@ -62,11 +62,53 @@ def test_embed_Suggestive():
     assert "so i had a bot generate it for me" in str(resp.data)
     assert "FfF_gKwXgAIpnpD" in str(resp.data)
 
-def test_embed_direct():
+def test_embed_video_direct():
     resp = client.get(testVideoTweet.replace("https://twitter.com","")+".mp4",headers={"User-Agent":"test"})
     assert resp.status_code==200
     assert testVideoTweet_compare["mediaURLs"][0] in str(resp.data)
 
+def test_embed_video_direct_subdomain():
+    resp = client.get(testVideoTweet.replace("https://twitter.com","https://d.vxtwitter.com"),headers={"User-Agent":"test"})
+    assert resp.status_code==200
+    assert testVideoTweet_compare["mediaURLs"][0] in str(resp.data)
+
+def test_embed_img_direct():
+    resp = client.get(testMediaTweet.replace("https://twitter.com","")+".png",headers={"User-Agent":"test"})
+    assert resp.status_code==302
+    assert testMediaTweet_compare["mediaURLs"][0] in str(resp.data)
+
+def test_embed_img_direct_subdomain():
+    resp = client.get(testMediaTweet.replace("https://twitter.com","https://d.vxtwitter.com"),headers={"User-Agent":"test"})
+    assert resp.status_code==302
+    assert testMediaTweet_compare["mediaURLs"][0] in str(resp.data)
+
+def test_embed_multi_direct():
+    # embed first item
+    resp = client.get(testMultiMediaTweet.replace("https://twitter.com","")+"/1.png",headers={"User-Agent":"test"})
+    assert resp.status_code==302 # images should redirect
+    assert testMultiMediaTweet_compare["mediaURLs"][0] in str(resp.data)
+
+    # embed second item
+    resp = client.get(testMultiMediaTweet.replace("https://twitter.com","")+"/2.mp4",headers={"User-Agent":"test"})
+    assert resp.status_code==302 # images should redirect
+    assert testMultiMediaTweet_compare["mediaURLs"][1] in str(resp.data)
+
+def test_embed_multi_direct_subdomain():
+    # generic embed
+    resp = client.get(testMultiMediaTweet.replace("https://twitter.com","https://d.vxtwitter.com"),headers={"User-Agent":"test"})
+    assert resp.status_code==302 # images should redirect
+    assert testMultiMediaTweet_compare["mediaURLs"][0] in str(resp.data)
+
+    # embed first item
+    resp = client.get(testMultiMediaTweet.replace("https://twitter.com","https://d.vxtwitter.com")+"/1",headers={"User-Agent":"test"})
+    assert resp.status_code==302 # images should redirect
+    assert testMultiMediaTweet_compare["mediaURLs"][0] in str(resp.data)
+
+    # embed second item
+    resp = client.get(testMultiMediaTweet.replace("https://twitter.com","https://d.vxtwitter.com")+"/2",headers={"User-Agent":"test"})
+    assert resp.status_code==302 # images should redirect
+    assert testMultiMediaTweet_compare["mediaURLs"][1] in str(resp.data)
+
 def test_embed_message404():
     resp = client.get("https://twitter.com/jack/status/12345",headers={"User-Agent":"test"})
     assert resp.status_code==200
@@ -79,4 +121,41 @@ def test_combine():
     resp = client.get(f"/rendercombined.jpg?imgs={img1},{img2}",headers={"User-Agent":"test"})
     assert resp.status_code==200
     assert resp.headers["Content-Type"]=="image/jpeg"
-    assert len(resp.data)>1000
+    assert len(resp.data)>1000
+
+def test_embed_combined():
+    twt = twitfix.getTweetData(testMultiMediaTweet)
+    img1 = twt["mediaURLs"][0]
+    img2 = twt["mediaURLs"][1]
+    resp = client.get(testMultiMediaTweet.replace("https://twitter.com",""),headers={"User-Agent":"test"})
+    assert resp.status_code==200
+    assert f"/rendercombined.jpg?imgs={img1},{img2}" in str(resp.data)
+
+def test_embed_multimedia_single():
+    twt = twitfix.getTweetData(testMultiMediaTweet)
+    img1 = twt["mediaURLs"][0]
+    img2 = twt["mediaURLs"][1]
+    resp = client.get(testMultiMediaTweet.replace("https://twitter.com","")+"/1",headers={"User-Agent":"test"})
+    assert resp.status_code==200
+    assert img1 in str(resp.data) and img2 not in str(resp.data)
+    resp = client.get(testMultiMediaTweet.replace("https://twitter.com","")+"/2",headers={"User-Agent":"test"})
+    assert resp.status_code==200
+    assert img1 not in str(resp.data) and img2 in str(resp.data)
+
+def test_embed_mixedMedia():
+    twt = twitfix.getTweetData(testMixedMediaTweet)
+    img1 = twt["mediaURLs"][0]
+    img2 = twt["mediaURLs"][1]
+    resp = client.get(testMixedMediaTweet.replace("https://twitter.com",""),headers={"User-Agent":"test"})
+
+    # Check for default behavior with no index
+    assert resp.status_code==200
+    assert img1 in str(resp.data) and img2 not in str(resp.data)
+    assert "Media 1/2" in str(resp.data) # make sure user knows there are multiple media
+
+    resp = client.get(testMixedMediaTweet.replace("https://twitter.com","")+"/1",headers={"User-Agent":"test"})
+    assert resp.status_code==200
+    assert img1 in str(resp.data) and img2 not in str(resp.data)
+    resp = client.get(testMixedMediaTweet.replace("https://twitter.com","")+"/2",headers={"User-Agent":"test"})
+    assert resp.status_code==200
+    assert img1 not in str(resp.data) and img2 in str(resp.data)