From 71f22f65c42ec7db1656c80d1a64c953ce396083 Mon Sep 17 00:00:00 2001 From: realize096 <102856702+realize096@users.noreply.github.com> Date: Sun, 10 Sep 2023 02:54:12 +0800 Subject: [PATCH 1/4] update certifi 2022.12.7 to 2022.12.07 (#1173) Co-authored-by: Soxoj <31013580+soxoj@users.noreply.github.com> From 72a1f948bab0fe853a1f1b662a7b95d4c47c37f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 9 Sep 2023 20:54:59 +0200 Subject: [PATCH 2/4] Bump cloudscraper from 1.2.66 to 1.2.71 (#914) Bumps [cloudscraper](https://github.com/venomous/cloudscraper) from 1.2.66 to 1.2.71. - [Release notes](https://github.com/venomous/cloudscraper/releases) - [Commits](https://github.com/venomous/cloudscraper/commits) --- updated-dependencies: - dependency-name: cloudscraper dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Soxoj <31013580+soxoj@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fa436948b..740a974cb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -36,4 +36,4 @@ yarl==1.8.2 networkx==2.6.3 pyvis==0.2.1 reportlab==4.0.4 -cloudscraper==1.2.66 +cloudscraper==1.2.71 From 90599ea3c2c0ce783bbff571a4d3a8fd80080441 Mon Sep 17 00:00:00 2001 From: Soxoj <31013580+soxoj@users.noreply.github.com> Date: Sat, 9 Sep 2023 20:58:01 +0200 Subject: [PATCH 3/4] Some sites fixed & cloudflare detection (#1178) --- maigret/errors.py | 6 +++ maigret/resources/data.json | 73 +++++++++++++++++++++++++++++++++---- 2 files changed, 72 insertions(+), 7 deletions(-) diff --git a/maigret/errors.py b/maigret/errors.py index f92b26367..8036fdbbc 100644 --- a/maigret/errors.py +++ b/maigret/errors.py @@ -58,6 +58,12 @@ def desc(self): 'Сайт заблокирован хостинг-провайдером': CheckError( 'Site-specific', 'Site is disabled (Beget)' ), + 'Generated by cloudfront (CloudFront)': CheckError( + 'Request blocked', 'Cloudflare' + ), + '/cdn-cgi/challenge-platform/h/b/orchestrate/chl_page': CheckError( + 'Just a moment: bot redirect challenge', 'Cloudflare' + ) } ERRORS_TYPES = { diff --git a/maigret/resources/data.json b/maigret/resources/data.json index 89f78b796..75a8b84db 100644 --- a/maigret/resources/data.json +++ b/maigret/resources/data.json @@ -3595,6 +3595,7 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "Crossfire": { + "disabled": true, "tags": [ "gaming", "ru" @@ -4069,6 +4070,7 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "Digitalspy": { + "disabled": true, "tags": [ "forum", "gb", @@ -13878,7 +13880,7 @@ "\u041f\u0440\u043e\u0444\u0438\u043b\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f" ], "alexaRank": 495, - "urlMain": "http://37.1.216.121/", + "urlMain": "https://rutracker.org/", "mirrors": [ "https://rutracker.org/", "http://37.1.216.121/" @@ -14714,6 +14716,7 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "Soloby": { + "disabled": true, "tags": [ "by", "ru" @@ -15228,12 +15231,15 @@ "regexCheck": "^[^\\.]+$", "checkType": "message", "absenceStrs": [ - "Strava | Run and Cycling Tracking on the Social Network for Athletes" + "Strava | " + ], + "presenseStrs": [ + "Profile" ], "alexaRank": 1099, "urlMain": "https://www.strava.com/", "url": "https://www.strava.com/athletes/{username}", - "usernameClaimed": "blue", + "usernameClaimed": "adam", "usernameUnclaimed": "noonewouldeverusethis7" }, "Studfile": { @@ -16612,6 +16618,9 @@ "tags": [ "messaging" ], + "headers": { + "Accept-Language": "en-US,en;q=0.5" + }, "regexCheck": "^[a-zA-Z0-9_]{1,15}$", "checkType": "message", "absenceStrs": [ @@ -16623,14 +16632,13 @@ "
" ], "mirrors": [ - "https://nitter.net/", "https://nitter.42l.fr/", "https://nitter.1d4.us/", "https://nitter.kavin.rocks/" ], "source": "Twitter", "alexaRank": 48, - "urlMain": "https://nitter.kavin.rocks/", + "urlMain": "https://nitter.net/", "url": "{urlMain}{username}", "usernameClaimed": "blue", "usernameUnclaimed": "noonewould123" @@ -17153,7 +17161,7 @@ "video" ], "headers": { - "Authorization": "jwt eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTI4NjczMDAsInVzZXJfaWQiOm51bGwsImFwcF9pZCI6NTg0NzksInNjb3BlcyI6InB1YmxpYyIsInRlYW1fdXNlcl9pZCI6bnVsbH0.C_eyva4vBf9wXlW5NpN94tAuXL-fU0z27JrLyk5-B2M" + "Authorization": "jwt eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTQyODI1ODAsInVzZXJfaWQiOm51bGwsImFwcF9pZCI6NTg0NzksInNjb3BlcyI6InB1YmxpYyIsInRlYW1fdXNlcl9pZCI6bnVsbH0.dIKSNMvYu7qcZ0Q7o9j5XaQH8iNWa-7X5wi2qQofoRo" }, "activation": { "url": "https://vimeo.com/_rv/viewer", @@ -17494,6 +17502,7 @@ "usernameUnclaimed": "noonewouldeverusethis7" }, "Waveapps": { + "disabled": true, "tags": [ "ca", "us" @@ -30720,6 +30729,7 @@ "alexaRank": 141 }, "Weebly": { + "regexCheck": "^[a-zA-Z0-9]+$", "absenceStrs": [ "Error - Page Not Found" ], @@ -34421,6 +34431,54 @@ "tags": [ "crypto" ] + }, + "PromptBase": { + "absenceStrs": [ + "NotFound" + ], + "presenseStrs": [ + "1" + ], + "url": "https://promptbase.com/profile/{username}", + "urlMain": "https://promptbase.com", + "usernameClaimed": "admin", + "usernameUnclaimed": "noonewouldeverusethis7", + "checkType": "message", + "tags": [ + "ai" + ] + }, + "ngl.link": { + "absenceStrs": [ + "Could not find user" + ], + "presenseStrs": [ + "1" + ], + "url": "https://ngl.link/{username}", + "urlMain": "https://ngl.link", + "usernameClaimed": "youbutdumberr", + "usernameUnclaimed": "noonewouldeverusethis7", + "checkType": "message", + "tags": [ + "q&a" + ] + }, + "bitpapa.com": { + "absenceStrs": [ + "/static/page-crash.svg" + ], + "presenseStrs": [ + "lbcUsername" + ], + "url": "https://bitpapa.com/ru/user/{username}", + "urlMain": "https://bitpapa.com", + "usernameClaimed": "Larisa70", + "usernameUnclaimed": "noonewouldeverusethis7", + "checkType": "message", + "tags": [ + "crypto" + ] } }, "engines": { @@ -34699,6 +34757,7 @@ "tor", "i2p", "q&a", - "crypto" + "crypto", + "ai" ] } \ No newline at end of file From 726380ee099d2a95433f984edc1dd91d7d8781a2 Mon Sep 17 00:00:00 2001 From: Sammy Folkhome <71086742+CatchySmile@users.noreply.github.com> Date: Sun, 15 Oct 2023 06:49:40 -0300 Subject: [PATCH 4/4] EasyInstaller bat added (#1212) --- Installer.bat | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 Installer.bat diff --git a/Installer.bat b/Installer.bat new file mode 100644 index 000000000..b41890342 --- /dev/null +++ b/Installer.bat @@ -0,0 +1,128 @@ +@echo off + +REM check if running as admin + +goto check_Permissions + +:check_Permissions +echo Administrative permissions required. Detecting permissions... + +net session >nul 2>&1 +if %errorLevel% == 0 ( + goto 1 +) else ( + cls + echo Failure: You MUST run this as administator, otherwise commands will fail. +) + +pause >nul + + + +REM Step 2: Check if Python and pip3 are installed +python --version >nul 2>&1 +if %errorlevel% neq 0 ( + echo Python is not installed. Please install Python 3.8 or higher. + pause + exit /b +) + +pip3 --version >nul 2>&1 +if %errorlevel% neq 0 ( + echo pip3 is not installed. Please install pip3. + pause + exit /b +) + +REM Step 3: Check Python version +python -c "import sys; exit(0) if sys.version_info >= (3,8) else exit(1)" +if %errorlevel% neq 0 ( + echo Python version 3.8 or higher is required. + pause + exit /b +) + + +:1 +cls +:::=============================================================== +::: ______ __ __ _ _ +::: | ____| | \/ | (_) | | +::: | |__ __ _ ___ _ _ | \ / | __ _ _ __ _ _ __ ___| |_ +::: | __| / _` / __| | | | | |\/| |/ _` | |/ _` | '__/ _ \ __| +::: | |___| (_| \__ \ |_| | | | | | (_| | | (_| | | | __/ |_ +::: |______\__,_|___/\__, | |_| |_|\__,_|_|\__, |_| \___|\__| +::: __/ | __/ | +::: |___/ |___/ +::: +:::=============================================================== +echo. +for /f "delims=: tokens=*" %%A in ('findstr /b ::: "%~f0"') do @echo(%%A +echo. +echo ---------------------------------------------------------------- +echo Python 3.8 or higher and pip3 required. +echo ---------------------------------------------------------------- +echo Press [I] to begin installation. +echo Press [R] If already installed. +echo ---------------------------------------------------------------- +choice /c IR +if %errorlevel%==1 goto install1 +if %errorlevel%==2 goto after + +:install1 +cls +echo ======================================================== +echo Maigret Installation Script +echo ======================================================== +echo. +echo -------------------------------------------------------- +echo If your pip installation is outdated, it could cause +echo cryptography to fail on installation. +echo -------------------------------------------------------- +echo check for and install pip updates now? +echo -------------------------------------------------------- +choice /c YN +if %errorlevel%==1 goto install2 +if %errorlevel%==2 goto install3 + +:install2 +cls +python -m pip install --upgrade pip +goto:install3 + +:install3 +cls +echo ======================================================== +echo Maigret Installation Script +echo ======================================================== +echo. +echo -------------------------------------------------------- +echo Install requirements and maigret? +echo -------------------------------------------------------- +choice /c YN +if %errorlevel%==1 goto install4 +if %errorlevel%==2 goto 1 + +:install4 +cls +pip install -r requirements.txt +pip install maigret +goto:after + +:after +cls +echo ======================================================== +echo Maigret Background Search +echo ======================================================== +echo. +echo -------------------------------------------------------- +echo Please Enter Username / Email +echo -------------------------------------------------------- +set /p input= +maigret %input% +echo. +echo. +echo. +echo. +pause +goto:after \ No newline at end of file