diff --git a/4_add_extra_bypasses.py b/4_add_extra_bypasses.py index b295647..a06da0e 100644 --- a/4_add_extra_bypasses.py +++ b/4_add_extra_bypasses.py @@ -35,6 +35,7 @@ def process_js_files(folder_path, target_file): match_lines = [] include_lines = [] require_lines = [] + resource_lines = [] after_user_script_lines = [] # Traverse through the files in the folder @@ -45,7 +46,7 @@ def process_js_files(folder_path, target_file): # Find lines with "@match" or "@include" or "@require" or "@grant". Add them if they are not already in the target file. for line in lines: - if "@match" in line or "@include" in line or "@require" in line or "@grant" in line: + if "@match" in line or "@include" in line or "@resource" in line or "@require" in line or "@grant" in line: if line not in target_file_lines: if line.startswith("// @grant"): grant_lines.append(line) @@ -55,6 +56,8 @@ def process_js_files(folder_path, target_file): include_lines.append(line) elif line.startswith("// @require"): require_lines.append(line) + elif line.startswith("// @resource"): + require_lines.append(line) # Find lines after "// ==/UserScript==" after_user_script = False @@ -70,7 +73,7 @@ def process_js_files(folder_path, target_file): exclude_index = next((i for i, line in enumerate(content) if "@exclude" in line), None) if exclude_index is not None: # Add match_lines and require_lines before the first @exclude line - content = content[:exclude_index] + grant_lines + match_lines + include_lines + require_lines + content[exclude_index:] + content = content[:exclude_index] + grant_lines + match_lines + include_lines + require_lines + resource_lines + content[exclude_index:] # Add lines after "// ==/UserScript==" content.extend(after_user_script_lines) f.seek(0) diff --git a/Bypass_All_Shortlinks.meta.js b/Bypass_All_Shortlinks.meta.js index a474e08..ee27161 100644 --- a/Bypass_All_Shortlinks.meta.js +++ b/Bypass_All_Shortlinks.meta.js @@ -3,7 +3,8 @@ // @namespace Violentmonkey Scripts // @run-at document-start // @author Amm0ni4 -// @version 91.6.7 +// @version 91.6.8 +// @noframes // @grant GM_setValue // @grant GM_getValue // @grant GM_addStyle @@ -754,6 +755,7 @@ // @include /(loot-link.com|loot-links.com|lootlink.org|lootlinks.co|lootdest.(info|org|com)|links-loot.com|linksloot.net)\/s\?.*$/ // @include /mega-enlace.com/ // @include /(work.ink|workink.click)\/.*$/ +// @resource NOTYF_CSS https://cdn.jsdelivr.net/npm/notyf@3/notyf.min.css // @require https://cdn.jsdelivr.net/npm/notyf@3/notyf.min.js // @exclude /^(https?:\/\/)(.+)?((advertisingexcel|talkforfitness|rsadnetworkinfo|rsinsuranceinfo|rsfinanceinfo|rssoftwareinfo|rshostinginfo|rseducationinfo|gametechreviewer|vegan4k|phineypet|batmanfactor|techedifier|urlhives|linkhives|github|freeoseocheck|greenenez|aliyun|reddit|bing|yahoo|wiki-topia|edonmanor|vrtier|whatsapp|gearsadviser|edonmanor|tunebug|menrealitycalc|amazon|ebay|payoneer|paypal|skrill|stripe|tipalti|wise|discord|tokopedia|taobao|taboola|aliexpress|netflix|citigroup|spotify|bankofamerica|hsbc|(cloud|mail|translate|analytics|accounts|myaccount|contacts|clients6|developers|payments|pay|ogs|safety|wallet).google|(login|signup|account|officeapps|api|mail|hotmail).live).com|(thumb8|thumb9|crewbase|crewus|shinchu|shinbhu|ultraten|uniqueten|topcryptoz|allcryptoz|coinsvalue|cookinguide|cryptowidgets|webfreetools|carstopia|makeupguide|carsmania|nflximg|doubleclick).net|(linksfly|shortsfly|urlsfly|wefly|blog24).me|(greasyfork|openuserjs|adarima|telegram|wikipedia).org|mcrypto.club|misterio.ro|insurancegold.in|coinscap.info|chefknives.expert|(shopee|lazada|rakuten|maybank).*|(dana|ovo|bca.co|bri.co|bni.co|bankmandiri.co|desa|(.*).go).id|(.*).edu|(.*).gov)(\/.*)/ // @downloadURL https://codeberg.org/Amm0ni4/bypass-all-shortlinks-debloated/raw/branch/main/Bypass_All_Shortlinks.user.js diff --git a/Bypass_All_Shortlinks.user.js b/Bypass_All_Shortlinks.user.js index b52e56e..b6f2f0b 100644 --- a/Bypass_All_Shortlinks.user.js +++ b/Bypass_All_Shortlinks.user.js @@ -3,7 +3,8 @@ // @namespace Violentmonkey Scripts // @run-at document-start // @author Amm0ni4 -// @version 91.6.7 +// @version 91.6.8 +// @noframes // @grant GM_setValue // @grant GM_getValue // @grant GM_addStyle @@ -754,6 +755,7 @@ // @include /(loot-link.com|loot-links.com|lootlink.org|lootlinks.co|lootdest.(info|org|com)|links-loot.com|linksloot.net)\/s\?.*$/ // @include /mega-enlace.com/ // @include /(work.ink|workink.click)\/.*$/ +// @resource NOTYF_CSS https://cdn.jsdelivr.net/npm/notyf@3/notyf.min.css // @require https://cdn.jsdelivr.net/npm/notyf@3/notyf.min.js // @exclude /^(https?:\/\/)(.+)?((advertisingexcel|talkforfitness|rsadnetworkinfo|rsinsuranceinfo|rsfinanceinfo|rssoftwareinfo|rshostinginfo|rseducationinfo|gametechreviewer|vegan4k|phineypet|batmanfactor|techedifier|urlhives|linkhives|github|freeoseocheck|greenenez|aliyun|reddit|bing|yahoo|wiki-topia|edonmanor|vrtier|whatsapp|gearsadviser|edonmanor|tunebug|menrealitycalc|amazon|ebay|payoneer|paypal|skrill|stripe|tipalti|wise|discord|tokopedia|taobao|taboola|aliexpress|netflix|citigroup|spotify|bankofamerica|hsbc|(cloud|mail|translate|analytics|accounts|myaccount|contacts|clients6|developers|payments|pay|ogs|safety|wallet).google|(login|signup|account|officeapps|api|mail|hotmail).live).com|(thumb8|thumb9|crewbase|crewus|shinchu|shinbhu|ultraten|uniqueten|topcryptoz|allcryptoz|coinsvalue|cookinguide|cryptowidgets|webfreetools|carstopia|makeupguide|carsmania|nflximg|doubleclick).net|(linksfly|shortsfly|urlsfly|wefly|blog24).me|(greasyfork|openuserjs|adarima|telegram|wikipedia).org|mcrypto.club|misterio.ro|insurancegold.in|coinscap.info|chefknives.expert|(shopee|lazada|rakuten|maybank).*|(dana|ovo|bca.co|bri.co|bni.co|bankmandiri.co|desa|(.*).go).id|(.*).edu|(.*).gov)(\/.*)/ // @downloadURL https://codeberg.org/Amm0ni4/bypass-all-shortlinks-debloated/raw/branch/main/Bypass_All_Shortlinks.user.js @@ -2418,14 +2420,6 @@ (function() { 'use strict'; if (/(work.ink|workink.click)\/.*$/.test(window.location.href)) { - // Overlay text "Bypassing..." - setInterval(() => {if (!document.getElementById('bypassOverlay')) { - const overlay = document.createElement('div'); - overlay.id = 'bypassOverlay'; - overlay.style.cssText = 'position:fixed;top:0;left:0;background:rgba(0,0,0,0.5);padding:20px;z-index:9999;'; - overlay.innerHTML = '