From f1ea12d731047a3f371208d11b1120a299324090 Mon Sep 17 00:00:00 2001 From: weekend sorrow Date: Fri, 27 Oct 2023 22:43:45 +0300 Subject: [PATCH] Updating site checkers, disabling suspended sites (#1266) * Fixing checks for broken sites and repairing the ones that were changed * little tweaks * little tweaks --------- Co-authored-by: Weekrow --- cookies.txt | 2 +- maigret/checking.py | 3 + maigret/maigret.py | 2 +- maigret/resources/data.json | 115 +++++++++++++++++++++++------------- 4 files changed, 78 insertions(+), 44 deletions(-) diff --git a/cookies.txt b/cookies.txt index ddc6b7bb..3a457c3d 100644 --- a/cookies.txt +++ b/cookies.txt @@ -10,4 +10,4 @@ pixabay.com FALSE / FALSE 0 anonymous_user_id c1e4ee09-5674-4252-aa94-8c47b1ea80ab pixabay.com FALSE / FALSE 1647214439 csrftoken vfetTSvIul7gBlURt6s985JNM18GCdEwN5MWMKqX4yI73xoPgEj42dbNefjGx5fr pixabay.com FALSE / FALSE 1647300839 client_width 1680 -pixabay.com FALSE / FALSE 748111764839 is_human 1 +pixabay.com FALSE / FALSE 748111764839 is_human 1 \ No newline at end of file diff --git a/maigret/checking.py b/maigret/checking.py index 7667580d..c88c5c29 100644 --- a/maigret/checking.py +++ b/maigret/checking.py @@ -156,6 +156,9 @@ def __init__(self, *args, **kwargs): class AiodnsDomainResolver(CheckerBase): + if sys.platform == 'win32': # Temporary workaround for Windows + asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy()) + def __init__(self, *args, **kwargs): loop = asyncio.get_event_loop() self.logger = kwargs.get('logger', Mock()) diff --git a/maigret/maigret.py b/maigret/maigret.py index aafb55e6..6e745981 100755 --- a/maigret/maigret.py +++ b/maigret/maigret.py @@ -487,7 +487,7 @@ async def main(): arg_parser = setup_arguments_parser(settings) args = arg_parser.parse_args() - # Re-set loggging level based on args + # Re-set logging level based on args if args.debug: log_level = logging.DEBUG elif args.info: diff --git a/maigret/resources/data.json b/maigret/resources/data.json index 02907c20..ba612f1f 100644 --- a/maigret/resources/data.json +++ b/maigret/resources/data.json @@ -293,6 +293,7 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "4cheat": { + "disabled": true, "tags": [ "forum", "ru" @@ -653,7 +654,10 @@ "tags": [ "us" ], - "checkType": "status_code", + "checkType": "message", + "absenceStrs": [ + "Allrecipes Member | Allrecipes" + ], "alexaRank": 983, "urlMain": "https://www.allrecipes.com/", "url": "https://www.allrecipes.com/cook/{username}", @@ -1656,7 +1660,7 @@ "alexaRank": 8074009, "urlMain": "https://automania.ru", "url": "https://automania.ru/author/{username}/", - "usernameClaimed": "Bones", + "usernameClaimed": "autozak23", "usernameUnclaimed": "noonewouldeverusethis7" }, "Avforums": { @@ -2033,7 +2037,7 @@ "Bentbox": { "checkType": "message", "absenceStrs": [ - "This user page is currently not available" + "This user is currently not available" ], "presenseStrs": [ "id=\"followingUser\"" @@ -2480,7 +2484,7 @@ "" ], "presenseStrs": [ - "Boosty" + "Boosty " ], "alexaRank": 36134, "urlMain": "https://boosty.to", @@ -3042,6 +3046,7 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "Cfire": { + "disabled": true, "tags": [ "ru" ], @@ -3764,16 +3769,17 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "DTF": { + "disabled": true, "tags": [ "ru" ], "checkType": "message", "absenceStrs": [ - "\u041c\u044b \u0432\u0441\u0435 \u0432\u043d\u0438\u043c\u0430\u0442\u0435\u043b\u044c\u043d\u043e \u043f\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u043b\u0438, \u043d\u043e \u043d\u0438\u0447\u0435\u0433\u043e \u043d\u0435 \u043d\u0430\u0448\u043b\u0438 :(" + "\u0421\u0442\u0440\u0430\u043d\u0438\u0446\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430 " ], "alexaRank": 16528, "urlMain": "https://dtf.ru", - "url": "https://dtf.ru/search/v2/subsite/relevant?query={username}", + "url": "https://dtf.ru/search/v2/subsite/relevant?query={username}&strict=1", "usernameClaimed": "adam", "usernameUnclaimed": "noonewouldeverusethis7" }, @@ -4520,8 +4526,8 @@ }, "alexaRank": 39, "urlMain": "https://www.ebay.com/", - "url": "https://ebay.com/usr/{username}", - "usernameClaimed": "blue", + "url": "https://www.ebay.com/usr/{username}", + "usernameClaimed": "adam", "usernameUnclaimed": "noonewouldeverusethis7" }, "Ecoustics": { @@ -4843,6 +4849,7 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "Eurogamer": { + "disabled": true, "tags": [ "us" ], @@ -5099,6 +5106,7 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "FIFA FORUMS": { + "disabled": true, "tags": [ "forum", "gb", @@ -5665,12 +5673,13 @@ ], "checkType": "message", "absenceStrs": [ - "Sorry, but we cannot find this user ..." + "", + "Folkd | Home" ], "alexaRank": 14019, - "urlMain": "http://www.folkd.com/user/", - "url": "http://www.folkd.com/user/{username}", - "usernameClaimed": "Bastian", + "urlMain": "http://www.folkd.com/profile/", + "url": "http://www.folkd.com/profile/{username}", + "usernameClaimed": "staffingservice", "usernameUnclaimed": "noonewouldeverusethis7" }, "Football": { @@ -9110,12 +9119,18 @@ "errors": { "\u041f\u0440\u0438 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0438 \u0437\u0430\u043f\u0440\u043e\u0441\u0430 \u044d\u0442\u043e\u0439 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b \u043f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430.": "Site error" }, - "checkType": "response_url", + "checkType": "message", + "absenseStrs": [ + "xmlns=\"http://www.w3.org/1999/xhtml" + ], + "presenseStrs": [ + "!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN" + ], "alexaRank": 1808, "urlMain": "https://www.liveinternet.ru", "url": "https://www.liveinternet.ru/users/{username}/profile", - "usernameClaimed": "blue", - "usernameUnclaimed": "noonewouldeverusethis7" + "usernameClaimed": "marrietta", + "usernameUnclaimed": "noonewouldevereverusethis7" }, "LiveJournal": { "tags": [ @@ -9255,6 +9270,9 @@ "tags": [ "kr" ], + "headers": { + "accept-language": "en-US,en;q=0.9,es;q=0.8" + }, "checkType": "message", "absenceStrs": [ "No search results" @@ -9338,6 +9356,7 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "Love.Mail.ru": { + "disabled": true, "tags": [ "ru" ], @@ -9767,18 +9786,17 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "Mbclub": { - "disabled": true, "tags": [ "ru" ], "checkType": "message", "absenceStrs": [ - "\u0423\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u0434\u0440\u0443\u0433\u043e\u0435 \u0438\u043c\u044f." + "" ], "alexaRank": 315579, "urlMain": "https://www.mbclub.ru/", - "url": "https://www.mbclub.ru/forum/members/?username={username}", - "usernameClaimed": "adam", + "url": "https://mbclub.ru/members/{username}", + "usernameClaimed": "qruiser.308", "usernameUnclaimed": "noonewouldeverusethis7" }, "Mcbans": { @@ -10387,7 +10405,8 @@ "alexaRank": 1242615, "urlMain": "https://movie-forum.co", "usernameClaimed": "blue", - "usernameUnclaimed": "noonewouldeverusethis7" + "usernameUnclaimed": "noonewouldeverusethis7", + "disabled": true }, "Movie-list": { "urlSubpath": "/forum", @@ -10664,18 +10683,15 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "MyFitnessPal": { - "disabled": true, "tags": [ "us" ], "checkType": "message", "absenceStrs": [ - "The page you were looking for could not be found.", - "\u0417\u0430\u043f\u0440\u043e\u0448\u0435\u043d\u043d\u0430\u044f \u0432\u0430\u043c\u0438 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430." + "meta name=\"robots\" content=\"index,follow\"/>PayPal.Me" + "displayName", + "displayEmail" ], "alexaRank": 223777, "urlMain": "https://www.paypal.me", @@ -11936,6 +11953,7 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "Periscope": { + "disabled": true, "tags": [ "streaming", "us", @@ -15237,7 +15255,7 @@ "Strava | " ], "presenseStrs": [ - "Profile" + "Strava" ], "alexaRank": 1099, "urlMain": "https://www.strava.com/", @@ -15587,6 +15605,7 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "TJournal": { + "disabled": true, "similarSearch": true, "tags": [ "ru" @@ -15725,6 +15744,7 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "Taplink": { + "disabled": true, "tags": [ "links", "ru" @@ -15781,14 +15801,14 @@ "regexCheck": "^[a-zA-Z][a-zA-Z0-9_]{4,}$", "checkType": "message", "absenceStrs": [ - "twitter:title\" content=\"Telegram: Contact", - "a new era of messaging" + "", + "