From 6001985ad1729149f8fe1aed6f2c6808aa9be7e1 Mon Sep 17 00:00:00 2001 From: Amm0ni4 Date: Sat, 24 Feb 2024 11:15:19 +0100 Subject: [PATCH] bumped version from upstream,refactor python scripts, greasyfork back as main source, fix some work.ink cases --- 1_download_untouched.py | 7 ++++--- 3_patch.py | 5 ++++- Bypass_All_Shortlinks.meta.js | 2 +- Bypass_All_Shortlinks.user.js | 8 +++----- README.md | 4 ++-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/1_download_untouched.py b/1_download_untouched.py index 978d290..df81b33 100644 --- a/1_download_untouched.py +++ b/1_download_untouched.py @@ -17,12 +17,13 @@ def modify_file_with_my_fixes(destination): with open(destination, 'r', encoding='utf-8') as file: content = file.read() + # Fixes content = content.replace("BloggerPemula('highkeyfinance.com'", "//BloggerPemula('highkeyfinance.com'") - content = content.replace("adbypass.org/bypass?bypass=' + location.href.split('?')[0]", "adbypass.org/bypass?bypass=' + encodeURIComponent(location.href)") content = content.replace("BypassedByBloggerPemula(/itscybertech.com", "//BypassedByBloggerPemula(/itscybertech.com") content = content.replace("BypassedByBloggerPemula(/linkvertise.com/", "//BypassedByBloggerPemula(/linkvertise.com/") content = content.replace("/stfly.cc|stfly.xyz|techtrendmakers.com|(blogbux|blogesque|exploreera).net/", "/stfly.cc|stfly.xyz|(techtrendmakers|gadnest).com|(blogbux|blogesque|exploreera).net/") - content = content.replace("case 'work.ink': if (/^\/([^\/]+)/.test(h.pathname))", "case 'work.ink': if (/^\/([^\/]+)/.test(h.pathname) && /^https?:\/\/work\.ink\/(?!token\b).*/.test(location.href))") + + content += "\n" with open(destination, 'w', encoding='utf-8') as file: file.write(content) @@ -32,5 +33,5 @@ if __name__ == "__main__": url2 = "https://openuserjs.org/install/Bloggerpemula/Bypass_All_Shortlinks_Manual_Captcha.user.js" destination = "untouched_Bypass_All_Shortlinks.user.js" - download_file(url2, destination) + download_file(url1, destination) modify_file_with_my_fixes(destination) diff --git a/3_patch.py b/3_patch.py index 2f40b75..212b9e3 100644 --- a/3_patch.py +++ b/3_patch.py @@ -50,7 +50,7 @@ def modify_script_extra(file_path): content = content.replace("// @name Bypass All Shortlinks", "// @name Bypass All Shortlinks Debloated") content = content.replace("https://i.ibb.co/qgr0H1n/BASS-Blogger-Pemula.png", "https://cdn-icons-png.flaticon.com/512/14025/14025295.png") content = content.replace("@author Bloggerpemula", "@author Amm0ni4") - content = content.replace("// @description Bypass All Shortlinks Sites Automatically Skips Annoying Link Shorteners , Skip AdFly , Linkvertise and No Annoying Ads, Directly to Your Destination, and now Support Auto Downloading Your Files", + content = content.replace("// @description Bypass All Shortlinks Sites Automatically Skips Annoying Link Shorteners , Skip AdFly and No Annoying Ads, Directly to Your Destination, and now Support Auto Downloading Your Files", "// @description Automatically bypass many link shorteners. Originally by BloggerPemula.\n// @homepageURL https://codeberg.org/Amm0ni4/bypass-all-shortlinks-debloated\n// @supportURL https://codeberg.org/Amm0ni4/bypass-all-shortlinks-debloated/issues") #Change source URL @@ -63,6 +63,9 @@ def modify_script_extra(file_path): content = content.replace("https://openuserjs.org/meta/Bloggerpemula/Bypass_All_Shortlinks_Manual_Captcha.meta.js", "https://codeberg.org/Amm0ni4/bypass-all-shortlinks-debloated/raw/branch/main/Bypass_All_Shortlinks.meta.js") + # Fixes + content = content.replace("case 'work.ink': if (/^\/([^\/]+)/.test(h.pathname))", "case 'work.ink': if (/^\/([^\/]+)/.test(h.pathname) && !location.href.includes('/token/') && !location.href.includes('?r=') && !location.href.includes('?ref='))") + content = content.replace("adbypass.org/bypass?bypass=' + location.href.split('?')[0]", "adbypass.org/bypass?bypass=' + encodeURIComponent(location.href)") #Remove tracking diff --git a/Bypass_All_Shortlinks.meta.js b/Bypass_All_Shortlinks.meta.js index 4622adc..d9fb631 100644 --- a/Bypass_All_Shortlinks.meta.js +++ b/Bypass_All_Shortlinks.meta.js @@ -3,7 +3,7 @@ // @namespace Violentmonkey Scripts // @run-at document-start // @author Amm0ni4 -// @version 91.3.1 +// @version 91.4 // @grant GM_setValue // @grant GM_getValue // @grant GM_addStyle diff --git a/Bypass_All_Shortlinks.user.js b/Bypass_All_Shortlinks.user.js index bfaf1e9..f147cf8 100644 --- a/Bypass_All_Shortlinks.user.js +++ b/Bypass_All_Shortlinks.user.js @@ -3,7 +3,7 @@ // @namespace Violentmonkey Scripts // @run-at document-start // @author Amm0ni4 -// @version 91.3.1 +// @version 91.4 // @grant GM_setValue // @grant GM_getValue // @grant GM_addStyle @@ -732,7 +732,7 @@ // There will be a Special Tricks and Bypass Adblock Codes only for Good Users (Anyone who have good attitude , Good Feedback, will be invited to my group) // Change Your Delay in the settings options from 5 to 10 or 20 if you have issues like Your action marked Suspicious,Don't try to bypass ,Don't use Speedster, etc const window = unsafeWindow; // Some of My Codes Not Running Well Without this , Please Let Me Know if You Find any Bugs - const cfg = new MonkeyConfig({title: 'Bypass Version 91.3 Settings :', menuCommand: true, + const cfg = new MonkeyConfig({title: 'Bypass Version 91.4 Settings :', menuCommand: true, params: {Announcements : {type: 'text', default: 'Enable Always Ready If You Open Multiple Tabs For Shortlink', long: 3}, SetDelay: {label: "Redirect Delay ", type: "number", default: 5,}, BlogDelay: {label: "Use My Blogs For Delays", type: "checkbox", default: true,}, @@ -988,7 +988,7 @@ case 'pixeldrain.com': if (h.href.includes('/u/')) return h.href.replace('u/', '/api/file/') + '?download'; break; case 'www.google.com': if (h.pathname === '/url' && h.searchParams.has('q')) {return h.searchParams.get('q');} break; case 'social-unlock.com': if (/^\/([^\/]+)/.test(h.pathname)) {return 'https://social-unlock.com/redirect/' + RegExp.$1;} break; - case 'work.ink': if (/^\/([^\/]+)/.test(h.pathname) && /^https?:\/\/work\.ink\/(?!token\b).*/.test(location.href)) {return 'https://adbypass.org/bypass?bypass=' + encodeURIComponent(location.href);} break; + case 'work.ink': if (/^\/([^\/]+)/.test(h.pathname) && !location.href.includes('/token/') && !location.href.includes('?r=') && !location.href.includes('?ref=')) {return 'https://adbypass.org/bypass?bypass=' + encodeURIComponent(location.href);} break; case 'nft.blogyindia.com': if (h.pathname === '/safe.php' && h.searchParams.has('link')) {return 'https://go.urlpay.in/' + h.searchParams.get('link');} break; case 'my.dropz.xyz': @@ -1290,8 +1290,6 @@ BypassedByBloggerPemula(/btcsatoshi.net/, async function() {EnableRCF();window.check2();window.check3();ClickIfExists('button.btn.btn-primary.btn-lg');}); BypassedByBloggerPemula(/comohoy.com/, function() {if (location.href.includes('/grab/out.html') && BpParams.has('url')) {meta(atob(BpParams.get('url')));}}); BypassedByBloggerPemula(/apkw.ru/, function() {if (location.href.includes('/away')) {let apkw = location.href.split('/').slice(-1);redirect(atob(apkw),false);}}); - // if you have issues with Linkvertise or work.ink Bypass , Please Join Discord Group owned by @varram https://discord.com/invite/uMEtrpRvAf - //BypassedByBloggerPemula(/linkvertise.com/, function() {if (elementExists('lv-action-box')) {location = 'https://adbypass.org/bypass?bypass=' + encodeURIComponent(location.href);}}); BypassedByBloggerPemula(/ctr.sh/, function() {if (/^\/(.+)/.test(location.pathname) && !BpParams.has('token')) {location = 'https://quesignifi.ca/?url8j=' + location.href;}}); BypassedByBloggerPemula(/(blackleadr|shortcuthigh|newztalkies|cybertyrant).com|hubdrive.me|fileroot.net/, function() {if (BpParams.has('r')) {meta(atob(BpParams.get('r')));}}); BypassedByBloggerPemula(/programasvirtualespc.net/, function() {if (location.href.includes('out/')) {const pvc = location.href.split('?')[1]; redirect(atob(pvc),false);} else {}}); diff --git a/README.md b/README.md index 701568a..f5b4ded 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Automatically bypass many link shorteners. - The script will not inject this weird _"adcopy_response"_. (I don't see a clear purpose for this, since it doesn't seem related in the script to any specific link shortener) - **Removed non-latin non-unicode characters** to avoid potential bug warnings. -Original script by *Bloggerpemula*: [Bypass All Shortlinks Manual Captcha - OpenUserJS](https://openuserjs.org/scripts/Bloggerpemula/Bypass_All_Shortlinks_Manual_Captcha) +Original script by *Bloggerpemula*: [Bypass All Shortlinks | GreasyFork](https://greasyfork.org/scripts/431691) / [OpenUserJS](https://openuserjs.org/scripts/Bloggerpemula/Bypass_All_Shortlinks_Manual_Captcha) ## How I modify the original userscript Executing these python scripts in order: @@ -29,7 +29,7 @@ Executing these python scripts in order: ## Help make this better You can help by: -- Reporting issues to the original script in [OpenUserJS issues](https://openuserjs.org/scripts/Bloggerpemula/Bypass_All_Shortlinks_Manual_Captcha/issues) (before doing this, check the issue is present in the original script) +- Reporting issues to the original script in [GreasyFork feedback](https://greasyfork.org/scripts/431691/feedback) or [OpenUserJS issues](https://openuserjs.org/scripts/Bloggerpemula/Bypass_All_Shortlinks_Manual_Captcha/issues) (before doing this, check the issue is present in the original script) - Reporting issues here on the [issues](https://codeberg.org/Amm0ni4/bypass-all-shortlinks-debloated/issues) tab. Post examples with the source link shortener and link source website. I will only add/fix content-sharing shortlinks, no faucet / crypto rewards. - Suggesting to merge other scripts into this one. - Editing/Adding code with pull requests.