diff --git a/user_scanner/user_scan/community/amongtubers.py b/user_scanner/user_scan/community/amongtubers.py index 1f8c91f7..0e44cdc5 100644 --- a/user_scanner/user_scan/community/amongtubers.py +++ b/user_scanner/user_scan/community/amongtubers.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_amongtubers(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://amongtubers.miraheze.org/w/api.php" show_url = f"https://amongtubers.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/community/anythingdexofficial.py b/user_scanner/user_scan/community/anythingdexofficial.py index a1da39ad..736ed4dd 100644 --- a/user_scanner/user_scan/community/anythingdexofficial.py +++ b/user_scanner/user_scan/community/anythingdexofficial.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_anythingdexofficial(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://anythingdexofficial.miraheze.org/w/api.php" show_url = f"https://anythingdexofficial.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/community/aucklandtransport.py b/user_scanner/user_scan/community/aucklandtransport.py index 00f70a5b..6f1b336c 100644 --- a/user_scanner/user_scan/community/aucklandtransport.py +++ b/user_scanner/user_scan/community/aucklandtransport.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_aucklandtransport(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://aucklandtransport.miraheze.org/w/api.php" show_url = f"https://aucklandtransport.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/community/site_100applianceparts.py b/user_scanner/user_scan/community/site_100applianceparts.py index e36be183..442f441d 100644 --- a/user_scanner/user_scan/community/site_100applianceparts.py +++ b/user_scanner/user_scan/community/site_100applianceparts.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_site_100applianceparts(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://100applianceparts.miraheze.org/w/api.php" show_url = f"https://100applianceparts.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/dev/aboutpcs.py b/user_scanner/user_scan/dev/aboutpcs.py index 484d48ff..940f5178 100644 --- a/user_scanner/user_scan/dev/aboutpcs.py +++ b/user_scanner/user_scan/dev/aboutpcs.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_aboutpcs(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://aboutpcs.miraheze.org/w/api.php" show_url = f"https://aboutpcs.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/dev/ballsdexselfhost.py b/user_scanner/user_scan/dev/ballsdexselfhost.py index 1813595a..2f94cee2 100644 --- a/user_scanner/user_scan/dev/ballsdexselfhost.py +++ b/user_scanner/user_scan/dev/ballsdexselfhost.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_ballsdexselfhost(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://ballsdexselfhost.miraheze.org/w/api.php" show_url = f"https://ballsdexselfhost.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/dev/wiki_gab_pt_eu_org.py b/user_scanner/user_scan/dev/wiki_gab_pt_eu_org.py index bfa36df7..5ff38e24 100644 --- a/user_scanner/user_scan/dev/wiki_gab_pt_eu_org.py +++ b/user_scanner/user_scan/dev/wiki_gab_pt_eu_org.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_wiki_gab_pt_eu_org(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://wiki.gab.pt.eu.org/w/api.php" show_url = f"https://wiki.gab.pt.eu.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/entertainment/abnormalitiesapartmentroblox.py b/user_scanner/user_scan/entertainment/abnormalitiesapartmentroblox.py index 135785f0..a17bf2ab 100644 --- a/user_scanner/user_scan/entertainment/abnormalitiesapartmentroblox.py +++ b/user_scanner/user_scan/entertainment/abnormalitiesapartmentroblox.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_abnormalitiesapartmentroblox(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://abnormalitiesapartmentroblox.miraheze.org/w/api.php" show_url = f"https://abnormalitiesapartmentroblox.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/entertainment/adelis.py b/user_scanner/user_scan/entertainment/adelis.py index 09846a17..70f62edd 100644 --- a/user_scanner/user_scan/entertainment/adelis.py +++ b/user_scanner/user_scan/entertainment/adelis.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_adelis(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://adelis.miraheze.org/w/api.php" show_url = f"https://adelis.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/entertainment/aetheria.py b/user_scanner/user_scan/entertainment/aetheria.py index f3e7b8af..8950b764 100644 --- a/user_scanner/user_scan/entertainment/aetheria.py +++ b/user_scanner/user_scan/entertainment/aetheria.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_aetheria(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://aetheria.miraheze.org/w/api.php" show_url = f"https://aetheria.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/entertainment/aftertherevolution.py b/user_scanner/user_scan/entertainment/aftertherevolution.py index c21ab267..71d0c5e6 100644 --- a/user_scanner/user_scan/entertainment/aftertherevolution.py +++ b/user_scanner/user_scan/entertainment/aftertherevolution.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_aftertherevolution(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://aftertherevolution.miraheze.org/w/api.php" show_url = f"https://aftertherevolution.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/entertainment/site_0verflow.py b/user_scanner/user_scan/entertainment/site_0verflow.py index d6dcab82..b12efbcd 100644 --- a/user_scanner/user_scan/entertainment/site_0verflow.py +++ b/user_scanner/user_scan/entertainment/site_0verflow.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_site_0verflow(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://0verflow.miraheze.org/w/api.php" show_url = f"https://0verflow.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/entertainment/site_100kanojo.py b/user_scanner/user_scan/entertainment/site_100kanojo.py index e87383c8..c2726161 100644 --- a/user_scanner/user_scan/entertainment/site_100kanojo.py +++ b/user_scanner/user_scan/entertainment/site_100kanojo.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_site_100kanojo(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://100kanojo.miraheze.org/w/api.php" show_url = f"https://100kanojo.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/gaming/abyssalsoulwiki.py b/user_scanner/user_scan/gaming/abyssalsoulwiki.py index 8c640237..0f7f6200 100644 --- a/user_scanner/user_scan/gaming/abyssalsoulwiki.py +++ b/user_scanner/user_scan/gaming/abyssalsoulwiki.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_abyssalsoulwiki(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://abyssalsoulwiki.miraheze.org/w/api.php" show_url = f"https://abyssalsoulwiki.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/gaming/adoh.py b/user_scanner/user_scan/gaming/adoh.py index ba903fbc..81aad65f 100644 --- a/user_scanner/user_scan/gaming/adoh.py +++ b/user_scanner/user_scan/gaming/adoh.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_adoh(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://adoh.miraheze.org/w/api.php" show_url = f"https://adoh.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/gaming/site_5b5t.py b/user_scanner/user_scan/gaming/site_5b5t.py index 7f3617a5..12ff4e20 100644 --- a/user_scanner/user_scan/gaming/site_5b5t.py +++ b/user_scanner/user_scan/gaming/site_5b5t.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_site_5b5t(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://5b5t.miraheze.org/w/api.php" show_url = f"https://5b5t.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/learning/site_2021pedia.py b/user_scanner/user_scan/learning/site_2021pedia.py index 14e31f43..87fd34ce 100644 --- a/user_scanner/user_scan/learning/site_2021pedia.py +++ b/user_scanner/user_scan/learning/site_2021pedia.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_site_2021pedia(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://2021pedia.miraheze.org/w/api.php" show_url = f"https://2021pedia.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/music/bloomarocksc.py b/user_scanner/user_scan/music/bloomarocksc.py index 74e5334c..3401c233 100644 --- a/user_scanner/user_scan/music/bloomarocksc.py +++ b/user_scanner/user_scan/music/bloomarocksc.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_bloomarocksc(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://bloomarocksc.miraheze.org/w/api.php" show_url = f"https://bloomarocksc.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/music/site_4chanmusic.py b/user_scanner/user_scan/music/site_4chanmusic.py index e4f19e89..f922ae4c 100644 --- a/user_scanner/user_scan/music/site_4chanmusic.py +++ b/user_scanner/user_scan/music/site_4chanmusic.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_site_4chanmusic(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://4chanmusic.miraheze.org/w/api.php" show_url = f"https://4chanmusic.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/other/adamastor.py b/user_scanner/user_scan/other/adamastor.py index a83d47a9..09798a5d 100644 --- a/user_scanner/user_scan/other/adamastor.py +++ b/user_scanner/user_scan/other/adamastor.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_adamastor(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://adamastor.miraheze.org/w/api.php" show_url = f"https://adamastor.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/other/aethelgardia.py b/user_scanner/user_scan/other/aethelgardia.py index d7b16650..c2e0a830 100644 --- a/user_scanner/user_scan/other/aethelgardia.py +++ b/user_scanner/user_scan/other/aethelgardia.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_aethelgardia(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://aethelgardia.miraheze.org/w/api.php" show_url = f"https://aethelgardia.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, ) diff --git a/user_scanner/user_scan/other/backroomswikisw.py b/user_scanner/user_scan/other/backroomswikisw.py index 01d678a2..c55c16cc 100644 --- a/user_scanner/user_scan/other/backroomswikisw.py +++ b/user_scanner/user_scan/other/backroomswikisw.py @@ -1,17 +1,13 @@ import urllib.parse -from user_scanner.core.helpers import get_random_user_agent -from user_scanner.core.orchestrator import Result, generic_validate +from user_scanner.core.impersonate import impersonate_validate +from user_scanner.core.orchestrator import Result def validate_backroomswikisw(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://backroomswikisw.miraheze.org/w/api.php" show_url = f"https://backroomswikisw.miraheze.org/wiki/User:{encoded_user}" - headers = { - "User-Agent": get_random_user_agent(), - "Accept": "application/json", - } params = { "action": "query", "format": "json", @@ -52,11 +48,11 @@ def process(response) -> Result: return Result.error(f"Unexpected response status {response.status_code}") - return generic_validate( + return impersonate_validate( url, process, - headers=headers, params=params, show_url=show_url, - follow_redirects=True, + impersonate="chrome", + allow_redirects=True, )