Commit d4ac0fca authored by nanahira's avatar nanahira

doSearch use same session

parent 328ce5e3
Pipeline #36922 passed with stages
in 1 minute and 49 seconds
...@@ -216,7 +216,7 @@ def extract_tweet(tweet): ...@@ -216,7 +216,7 @@ def extract_tweet(tweet):
return None return None
async def doSearch(screen_name: str) -> Optional[List[dict]]: async def doSearch(screen_name: str, client: httpx.AsyncClient) -> Optional[List[dict]]:
"""Port of `doSearch`; unchanged except for async/await & httpx.""" """Port of `doSearch`; unchanged except for async/await & httpx."""
searchurl_v2 = ( searchurl_v2 = (
...@@ -258,13 +258,12 @@ async def doSearch(screen_name: str) -> Optional[List[dict]]: ...@@ -258,13 +258,12 @@ async def doSearch(screen_name: str) -> Optional[List[dict]]:
"fieldToggles": json.dumps({"withArticleRichContentState": False}), "fieldToggles": json.dumps({"withArticleRichContentState": False}),
} }
async with getTwitterSession() as client: r = await client.get(searchurl_v2, params=params_v2)
r = await client.get(searchurl_v2, params=params_v2) try:
try: data = r.json()
data = r.json() except ValueError:
except ValueError: print("Search Error parsing JSON:", r.text)
print("Search Error parsing JSON:", r.text) return None
return None
global _is_healthy global _is_healthy
_is_healthy = "data" in data _is_healthy = "data" in data
...@@ -317,7 +316,7 @@ async def searchbanLogic(screen_name: str) -> tuple[dict, bool]: ...@@ -317,7 +316,7 @@ async def searchbanLogic(screen_name: str) -> tuple[dict, bool]:
# } # }
} }
async with (getTwitterSession() as client): async with getTwitterSession() as client:
usertlurl = 'https://x.com/i/api/graphql/oUZZZ8Oddwxs8Cd3iW3UEA/UserByScreenName' usertlurl = 'https://x.com/i/api/graphql/oUZZZ8Oddwxs8Cd3iW3UEA/UserByScreenName'
params = { params = {
'variables': json.dumps({ 'variables': json.dumps({
...@@ -411,7 +410,7 @@ async def searchbanLogic(screen_name: str) -> tuple[dict, bool]: ...@@ -411,7 +410,7 @@ async def searchbanLogic(screen_name: str) -> tuple[dict, bool]:
if returnjson["tests"]["typeahead"] != True: if returnjson["tests"]["typeahead"] != True:
print("{} is search suggestion banned or errored, checking search ban.".format(screen_name)) print("{} is search suggestion banned or errored, checking search ban.".format(screen_name))
search_result = await doSearch(screen_name) search_result = await doSearch(screen_name, client)
if search_result is None: if search_result is None:
returnjson["tests"]["search"] = '_error' returnjson["tests"]["search"] = '_error'
hasFailure = True hasFailure = True
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment