diff --git a/user_scanner/user_scan/community/asg.py b/user_scanner/user_scan/community/asg.py index 7a342d2c..a12b6d89 100644 --- a/user_scanner/user_scan/community/asg.py +++ b/user_scanner/user_scan/community/asg.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_asg(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://asg.miraheze.org/w/api.php" show_url = f"https://asg.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/aurodossa.py b/user_scanner/user_scan/community/aurodossa.py index a13a2db4..3702ec05 100644 --- a/user_scanner/user_scan/community/aurodossa.py +++ b/user_scanner/user_scan/community/aurodossa.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_aurodossa(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://aurodossa.miraheze.org/w/api.php" show_url = f"https://aurodossa.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/auuversewiki.py b/user_scanner/user_scan/community/auuversewiki.py index c7ae5849..53a18a5d 100644 --- a/user_scanner/user_scan/community/auuversewiki.py +++ b/user_scanner/user_scan/community/auuversewiki.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_auuversewiki(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://auuversewiki.miraheze.org/w/api.php" show_url = f"https://auuversewiki.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/creative/airlinesafetycards.py b/user_scanner/user_scan/creative/airlinesafetycards.py index dfd8f56e..b4cb19ea 100644 --- a/user_scanner/user_scan/creative/airlinesafetycards.py +++ b/user_scanner/user_scan/creative/airlinesafetycards.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_airlinesafetycards(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://airlinesafetycards.miraheze.org/w/api.php" show_url = f"https://airlinesafetycards.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/creative/brockvillerailfan.py b/user_scanner/user_scan/creative/brockvillerailfan.py index 104b3db4..1319ed8e 100644 --- a/user_scanner/user_scan/creative/brockvillerailfan.py +++ b/user_scanner/user_scan/creative/brockvillerailfan.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_brockvillerailfan(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://brockvillerailfan.miraheze.org/w/api.php" show_url = f"https://brockvillerailfan.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/abysssmp.py b/user_scanner/user_scan/gaming/abysssmp.py index 7b0bf192..fd38a293 100644 --- a/user_scanner/user_scan/gaming/abysssmp.py +++ b/user_scanner/user_scan/gaming/abysssmp.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_abysssmp(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://abysssmp.miraheze.org/w/api.php" show_url = f"https://abysssmp.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_2001office.py b/user_scanner/user_scan/gaming/site_2001office.py index 4db83e45..80f145c8 100644 --- a/user_scanner/user_scan/gaming/site_2001office.py +++ b/user_scanner/user_scan/gaming/site_2001office.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_2001office(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://2001office.miraheze.org/w/api.php" show_url = f"https://2001office.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_2b2tar.py b/user_scanner/user_scan/gaming/site_2b2tar.py index 2394ecea..2ce548f9 100644 --- a/user_scanner/user_scan/gaming/site_2b2tar.py +++ b/user_scanner/user_scan/gaming/site_2b2tar.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_2b2tar(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://2b2tar.miraheze.org/w/api.php" show_url = f"https://2b2tar.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_5jasmp.py b/user_scanner/user_scan/gaming/site_5jasmp.py index 455a5f8d..7459ed65 100644 --- a/user_scanner/user_scan/gaming/site_5jasmp.py +++ b/user_scanner/user_scan/gaming/site_5jasmp.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_5jasmp(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://5jasmp.miraheze.org/w/api.php" show_url = f"https://5jasmp.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/wiki_3c3u_info.py b/user_scanner/user_scan/gaming/wiki_3c3u_info.py index 81e3796c..a9c1fd31 100644 --- a/user_scanner/user_scan/gaming/wiki_3c3u_info.py +++ b/user_scanner/user_scan/gaming/wiki_3c3u_info.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_3c3u_info(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://wiki.3c3u.info/w/api.php" show_url = f"https://wiki.3c3u.info/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/aikarebirthfanfic.py b/user_scanner/user_scan/learning/aikarebirthfanfic.py index 56019630..51cfd055 100644 --- a/user_scanner/user_scan/learning/aikarebirthfanfic.py +++ b/user_scanner/user_scan/learning/aikarebirthfanfic.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_aikarebirthfanfic(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://aikarebirthfanfic.miraheze.org/w/api.php" show_url = f"https://aikarebirthfanfic.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/akiraworldvisionsongcontest.py b/user_scanner/user_scan/music/akiraworldvisionsongcontest.py index b263dc97..b284b212 100644 --- a/user_scanner/user_scan/music/akiraworldvisionsongcontest.py +++ b/user_scanner/user_scan/music/akiraworldvisionsongcontest.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_akiraworldvisionsongcontest(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://akiraworldvisionsongcontest.miraheze.org/w/api.php" show_url = f"https://akiraworldvisionsongcontest.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/amnhacvietnam.py b/user_scanner/user_scan/music/amnhacvietnam.py index 293491a4..66b98578 100644 --- a/user_scanner/user_scan/music/amnhacvietnam.py +++ b/user_scanner/user_scan/music/amnhacvietnam.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_amnhacvietnam(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://amnhacvietnam.miraheze.org/w/api.php" show_url = f"https://amnhacvietnam.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/andonewiki.py b/user_scanner/user_scan/music/andonewiki.py index 3c7c891c..2ef85488 100644 --- a/user_scanner/user_scan/music/andonewiki.py +++ b/user_scanner/user_scan/music/andonewiki.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_andonewiki(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://andonewiki.miraheze.org/w/api.php" show_url = f"https://andonewiki.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/bumblekast.py b/user_scanner/user_scan/music/bumblekast.py index 3836fa9a..dc38612b 100644 --- a/user_scanner/user_scan/music/bumblekast.py +++ b/user_scanner/user_scan/music/bumblekast.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_bumblekast(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://bumblekast.miraheze.org/w/api.php" show_url = f"https://bumblekast.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_48plus_org.py b/user_scanner/user_scan/music/site_48plus_org.py index 16fb5e2e..d0b4d2ef 100644 --- a/user_scanner/user_scan/music/site_48plus_org.py +++ b/user_scanner/user_scan/music/site_48plus_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_site_48plus_org(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://48plus.org/w/api.php" show_url = f"https://48plus.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/wiki_albrusmusic_ru.py b/user_scanner/user_scan/music/wiki_albrusmusic_ru.py index 53dc7a08..bfebfa49 100644 --- a/user_scanner/user_scan/music/wiki_albrusmusic_ru.py +++ b/user_scanner/user_scan/music/wiki_albrusmusic_ru.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_albrusmusic_ru(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://wiki.albrusmusic.ru/w/api.php" show_url = f"https://wiki.albrusmusic.ru/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/aciespco1921.py b/user_scanner/user_scan/other/aciespco1921.py index 1469f366..b4f59d62 100644 --- a/user_scanner/user_scan/other/aciespco1921.py +++ b/user_scanner/user_scan/other/aciespco1921.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_aciespco1921(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://aciespco1921.miraheze.org/w/api.php" show_url = f"https://aciespco1921.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/adiaproject.py b/user_scanner/user_scan/other/adiaproject.py index 3053b3f2..9bc039d6 100644 --- a/user_scanner/user_scan/other/adiaproject.py +++ b/user_scanner/user_scan/other/adiaproject.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_adiaproject(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://adiaproject.miraheze.org/w/api.php" show_url = f"https://adiaproject.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/afterfortyninewiki.py b/user_scanner/user_scan/other/afterfortyninewiki.py index 57f8e6f9..8b72a5e4 100644 --- a/user_scanner/user_scan/other/afterfortyninewiki.py +++ b/user_scanner/user_scan/other/afterfortyninewiki.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_afterfortyninewiki(user: str) -> Result: encoded_user = urllib.parse.quote(user) url = "https://afterfortyninewiki.miraheze.org/w/api.php" show_url = f"https://afterfortyninewiki.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, )