From 2145027196fd64c7271a66f092ffbc34c42afda4 Mon Sep 17 00:00:00 2001 From: Soxoj Date: Fri, 7 May 2021 01:20:20 +0300 Subject: [PATCH] Added several sites, some improvements --- maigret/checking.py | 3 +- maigret/maigret.py | 2 +- maigret/resources/data.json | 173 +++++++++++++++++++++++++++++++----- maigret/submit.py | 1 + 4 files changed, 157 insertions(+), 22 deletions(-) diff --git a/maigret/checking.py b/maigret/checking.py index 5080024..ee35119 100644 --- a/maigret/checking.py +++ b/maigret/checking.py @@ -6,6 +6,7 @@ import ssl import sys import tqdm from typing import Tuple, Optional, Dict, List +from urllib.parse import quote import aiohttp import tqdm.asyncio @@ -308,7 +309,7 @@ def make_site_result( # URL of user on site (if it exists) url = site.url.format( - urlMain=site.url_main, urlSubpath=site.url_subpath, username=username + urlMain=site.url_main, urlSubpath=site.url_subpath, username=quote(username) ) # workaround to prevent slash errors diff --git a/maigret/maigret.py b/maigret/maigret.py index 5eae2bc..440c43a 100755 --- a/maigret/maigret.py +++ b/maigret/maigret.py @@ -491,7 +491,7 @@ async def main(): top=args.top_sites, tags=args.tags, names=args.site_list, - disabled=False, + disabled=args.use_disabled_sites, id_type=x, ) diff --git a/maigret/resources/data.json b/maigret/resources/data.json index 2f676c7..1f55dc1 100644 --- a/maigret/resources/data.json +++ b/maigret/resources/data.json @@ -625,7 +625,6 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "AllTheSoft": { - "disabled": true, "tags": [ "in" ], @@ -781,7 +780,6 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "Anarcho-punk": { - "disabled": true, "tags": [ "us" ], @@ -2031,7 +2029,6 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "Blu-ray": { - "disabled": true, "tags": [ "us" ], @@ -3307,7 +3304,6 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "DefenceForumIndia": { - "disabled": true, "tags": [ "in" ], @@ -3882,7 +3878,6 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "Ebay": { - "disabled": true, "tags": [ "shopping", "us" @@ -3891,9 +3886,12 @@ "absenceStrs": [ "

" ], + "headers": { + "user-agent": "Curl" + }, "alexaRank": 38, "urlMain": "https://www.ebay.com/", - "url": "https://www.ebay.com/usr/{username}", + "url": "https://ebay.com/usr/{username}", "usernameClaimed": "blue", "usernameUnclaimed": "noonewouldeverusethis7" }, @@ -4513,7 +4511,6 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "FilmWeb": { - "disabled": true, "tags": [ "movies", "pl" @@ -5450,6 +5447,7 @@ "gaming", "us" ], + "regexCheck": "^\\S+$", "errors": { "Are You a Robot?": "Captcha detected", "Your IP address has been temporarily blocked due to a large number of HTTP requests": "Too many requests" @@ -5487,7 +5485,6 @@ "usernameUnclaimed": "noonewouldeverusethis" }, "Gamesubject": { - "disabled": true, "tags": [ "ru" ], @@ -8570,7 +8567,6 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "Minecraft-statistic": { - "disabled": true, "tags": [ "ru", "ua", @@ -10030,7 +10026,6 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "Parkrocker": { - "disabled": true, "tags": [ "de" ], @@ -10040,7 +10035,6 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "Partyflock": { - "disabled": true, "tags": [ "in", "nl" @@ -14566,7 +14560,7 @@ "video" ], "headers": { - "Authorization": "jwt eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MjAxNzAyMjAsInVzZXJfaWQiOm51bGwsImFwcF9pZCI6NTg0NzksInNjb3BlcyI6InB1YmxpYyIsInRlYW1fdXNlcl9pZCI6bnVsbH0.TbxzgFVMQsgYz4vTiFE-_P1qydzqP9ADUsPxl8U4bZE" + "Authorization": "jwt eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MjAzMzYzMDAsInVzZXJfaWQiOm51bGwsImFwcF9pZCI6NTg0NzksInNjb3BlcyI6InB1YmxpYyIsInRlYW1fdXNlcl9pZCI6bnVsbH0.P3qWyKupuox4SXs3g7Hlqd5H03mVffnVh6DzIbh8OVQ" }, "activation": { "url": "https://vimeo.com/_rv/viewer", @@ -14699,7 +14693,6 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "Volgogradru": { - "disabled": true, "tags": [ "ru" ], @@ -15924,7 +15917,6 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "australianfrequentflyer.com.au": { - "disabled": true, "tags": [ "au" ], @@ -20775,7 +20767,6 @@ "usernameClaimed": "alex" }, "torrents-igra.ucoz.ru": { - "disabled": true, "engine": "uCoz", "alexaRank": 9524899, "urlMain": "http://torrents-igra.ucoz.ru", @@ -22736,7 +22727,6 @@ "usernameClaimed": "admin" }, "admin-soft.ucoz.ru": { - "disabled": true, "engine": "uCoz", "urlMain": "http://admin-soft.ucoz.ru", "usernameUnclaimed": "noonewouldeverusethis7", @@ -22878,7 +22868,6 @@ "usernameClaimed": "admin" }, "thelike.ru": { - "disabled": true, "engine": "uCoz", "urlMain": "http://thelike.ru", "usernameUnclaimed": "noonewouldeverusethis7", @@ -22898,7 +22887,6 @@ "usernameClaimed": "alex" }, "show.co.ua": { - "disabled": true, "engine": "uCoz", "alexaRank": 3178739, "urlMain": "http://show.co.ua", @@ -23206,7 +23194,6 @@ "usernameClaimed": "red" }, "usersoft.ucoz.ru": { - "disabled": true, "engine": "uCoz", "urlMain": "http://usersoft.ucoz.ru", "usernameUnclaimed": "noonewouldeverusethis7", @@ -24036,7 +24023,6 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "brute.pw": { - "disabled": true, "tags": [ "ru" ], @@ -25992,6 +25978,153 @@ "tags": [ "us" ] + }, + "www.itemfix.com": { + "absenceStrs": [ + "ItemFix - Channel: " + ], + "presenseStrs": [ + "user_token" + ], + "url": "https://www.itemfix.com/c/{username}", + "urlMain": "https://www.itemfix.com", + "usernameClaimed": "William_Pickton", + "usernameUnclaimed": "noonewouldeverusethis7", + "checkType": "message" + }, + "www.opendiary.com": { + "urlSubpath": "/m", + "urlMain": "https://www.opendiary.com", + "engine": "Wordpress/Author", + "usernameClaimed": "oniongirl", + "usernameUnclaimed": "noonewouldeverusethis7" + }, + "fediverse.party": { + "absenceStrs": [ + "Fediverse.Party - explore federated networks", + " error__page" + ], + "presenseStrs": [ + "mastodon-share", + "mastodon", + "socialhome", + ">