From 262f97ce330844159bc4264b2400ec7a4c862747 Mon Sep 17 00:00:00 2001 From: Soxoj <31013580+soxoj@users.noreply.github.com> Date: Fri, 10 Dec 2021 23:01:56 +0300 Subject: [PATCH] Fixed xHamster, added support of proxies to self-check mode (#259) --- maigret/checking.py | 5 ++++- maigret/maigret.py | 1 + maigret/resources/data.json | 8 +++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/maigret/checking.py b/maigret/checking.py index 603eeee..9f368f7 100644 --- a/maigret/checking.py +++ b/maigret/checking.py @@ -764,6 +764,7 @@ async def site_self_check( semaphore, db: MaigretDatabase, silent=False, + proxy=None, tor_proxy=None, i2p_proxy=None, ): @@ -789,6 +790,7 @@ async def site_self_check( forced=True, no_progressbar=True, retries=1, + proxy=proxy, tor_proxy=tor_proxy, i2p_proxy=i2p_proxy, ) @@ -845,6 +847,7 @@ async def self_check( logger, silent=False, max_connections=10, + proxy=None, tor_proxy=None, i2p_proxy=None, ) -> bool: @@ -859,7 +862,7 @@ async def self_check( for _, site in all_sites.items(): check_coro = site_self_check( - site, logger, sem, db, silent, tor_proxy, i2p_proxy + site, logger, sem, db, silent, proxy, tor_proxy, i2p_proxy ) future = asyncio.ensure_future(check_coro) tasks.append(future) diff --git a/maigret/maigret.py b/maigret/maigret.py index 3a5dac0..a722740 100755 --- a/maigret/maigret.py +++ b/maigret/maigret.py @@ -548,6 +548,7 @@ async def main(): db, site_data, logger, + proxy=args.proxy, max_connections=args.connections, tor_proxy=args.tor_proxy, i2p_proxy=args.i2p_proxy, diff --git a/maigret/resources/data.json b/maigret/resources/data.json index 1cbe803..a259797 100644 --- a/maigret/resources/data.json +++ b/maigret/resources/data.json @@ -19922,7 +19922,13 @@ "porn", "us" ], - "checkType": "status_code", + "checkType": "message", + "presenseStrs": [ + "user-info-section" + ], + "absenceStrs": [ + "User not found" + ], "alexaRank": 136, "urlMain": "https://xhamster.com", "url": "https://xhamster.com/users/{username}",