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

All tests re-enabled and passing

Browse Source
This commit is contained in:
Dylan 2023-07-02 18:19:14 +01:00
parent c99f3de6c1
commit abedae385c
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test_vx.py
View File

@ -106,12 +106,11 @@ def test_pollTweetExtract():
tweet = twExtract.extractStatus("https://twitter.com/norm/status/651169346518056960") tweet = twExtract.extractStatus("https://twitter.com/norm/status/651169346518056960")
assert 'card' in tweet assert 'card' in tweet
compareDict(testPoll_comparePoll,tweet['card']) compareDict(testPoll_comparePoll,tweet['card'])
'''
def test_NSFW_TweetExtract(): def test_NSFW_TweetExtract():
tweet = twExtract.extractStatus(testNSFWTweet) # For now just test that there's no error tweet = twExtract.extractStatus(testNSFWTweet) # For now just test that there's no error
''' # this test currently fails due to new Twitter API restrictions
## VNF conversion test ##
## VNF conversion test ##
def test_textTweetVNF(): def test_textTweetVNF():
vnf = twitfix.link_to_vnf_from_unofficial_api(testTextTweet) vnf = twitfix.link_to_vnf_from_unofficial_api(testTextTweet)
compareDict(textVNF_compare,vnf) compareDict(textVNF_compare,vnf)
@ -194,12 +193,12 @@ def test_embedFromCache():
assert resp.status_code==200 assert resp.status_code==200
resp = client.get(testMultiMediaTweet.replace("https://twitter.com",""),headers={"User-Agent":"test"}) resp = client.get(testMultiMediaTweet.replace("https://twitter.com",""),headers={"User-Agent":"test"})
assert resp.status_code==200 assert resp.status_code==200
'''
def test_embedSuggestive(): def test_embedSuggestive():
resp = client.get(testNSFWTweet.replace("https://twitter.com",""),headers={"User-Agent":"test"}) resp = client.get(testNSFWTweet.replace("https://twitter.com",""),headers={"User-Agent":"test"})
assert resp.status_code==200 assert resp.status_code==200
assert "so i had a bot generate it for me" in str(resp.data) assert "so i had a bot generate it for me" in str(resp.data)
''' # this test currently fails due to new Twitter API restrictions
def test_veryLongEmbed(): def test_veryLongEmbed():
cache.clearCache() cache.clearCache()
cache.setCache({'https://twitter.com/TEST/status/1234': cache.setCache({'https://twitter.com/TEST/status/1234':

30
twExtract/__init__.py
View File

@ -77,19 +77,25 @@ def extractUser(url):
else: else:
useId=False useId=False
screen_name = m.group(1) screen_name = m.group(1)
# get guest token
guestToken = getGuestToken()
# get user # get user
if not useId: tokens = config["config"]["workaroundTokens"].split(",")
user = requests.get(f"https://api.twitter.com/1.1/users/show.json?screen_name={screen_name}",headers={"Authorization":bearer, "x-guest-token":guestToken}) for authToken in tokens:
else: try:
user = requests.get(f"https://api.twitter.com/1.1/users/show.json?user_id={screen_name}",headers={"Authorization":bearer, "x-guest-token":guestToken}) csrfToken=str(uuid.uuid4()).replace('-', '')
output = user.json() reqHeaders = {"Authorization":bearer,"Cookie":f"auth_token={authToken}; ct0={csrfToken}; ","x-twitter-active-user":"yes","x-twitter-auth-type":"OAuth2Session","x-twitter-client-language":"en","x-csrf-token":csrfToken,"User-Agent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/116.0"}
if "errors" in output: if not useId:
# pick the first error and create a twExtractError user = requests.get(f"https://api.twitter.com/1.1/users/show.json?screen_name={screen_name}",headers=reqHeaders)
error = output["errors"][0] else:
raise twExtractError.TwExtractError(error["code"], error["message"]) user = requests.get(f"https://api.twitter.com/1.1/users/show.json?user_id={screen_name}",headers=reqHeaders)
return output output = user.json()
if "errors" in output:
# pick the first error and create a twExtractError
error = output["errors"][0]
raise twExtractError.TwExtractError(error["code"], error["message"])
return output
except Exception as e:
continue
raise twExtractError.TwExtractError(400, "Extract error")
#def extractUserByID(id): #def extractUserByID(id):