From dbcf37844b4eb39fdc52e29740fe98b6fcefd42f Mon Sep 17 00:00:00 2001 From: Amm0ni4 Date: Fri, 25 Oct 2024 11:58:11 +0200 Subject: [PATCH] rinku.me fixes https://codeberg.org/Amm0ni4/bypass-all-shortlinks-debloated/issues/165 --- Bypass_All_Shortlinks.meta.js | 4 ++-- Bypass_All_Shortlinks.user.js | 21 +++++++++++++++------ extra_bypasses/rinku.user.js | 19 ++++++++++++++----- supported_sites.txt | 2 +- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/Bypass_All_Shortlinks.meta.js b/Bypass_All_Shortlinks.meta.js index cd31f4f..7f2f81c 100644 --- a/Bypass_All_Shortlinks.meta.js +++ b/Bypass_All_Shortlinks.meta.js @@ -4,7 +4,7 @@ // @run-at document-start // @author Amm0ni4 // @noframes -// @version 92.8.37 +// @version 92.8.38 // @grant GM_setValue // @grant GM_getValue // @grant GM_addStyle @@ -754,7 +754,7 @@ // @include /www.spaste.com/ // @include /filecrypt.(cc|co)/ // @include /(mega-enlace|acortados).com/ -// @include /^(https?:\/\/)(.+)?((actualpost|americanstylo|beautifulfashionnailart|dadinthemaking|glowandglamcorner|listofthis|lobirtech|travelperi|vepiv|seydisehirmansethaber|turkiyertg|tophotelsukraine).com|(makego|sakazi).net|askerlikforum.com.tr)(\/.*)/ +// @include /^(https?:\/\/)(.+)?((actualpost|americanstylo|beautifulfashionnailart|dadinthemaking|glowandglamcorner|listofthis|lobirtech|travelperi|vepiv|seydisehirmansethaber|turkiyertg|tophotelsukraine|balatroltd|tenorminiuk).com|(makego|sakazi).net|askerlikforum.com.tr)(\/.*)/ // @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|accounts.youtube|(cloud|mail|translate|analytics|accounts|myaccount|contacts|clients6|developers|payments|pay|ogs|safety|wallet).google|(login|signup|account|officeapps|api|mail|hotmail).live|basketballsavvy|healthyfollicles|hauntingrealm|pluginmixer|boredboard|boardgamechick|healthyfollicles|atlassian|pinterest|twitter|facebook|tiktok|instagram|linkedin).com|(thumb8|thumb9|crewbase|crewus|shinchu|shinbhu|ultraten|uniqueten|topcryptoz|allcryptoz|coinsvalue|cookinguide|cryptowidgets|webfreetools|carstopia|makeupguide|carsmania|nflximg|doubleclick|luckydice).net|(linksfly|shortsfly|urlsfly|wefly|blog24).me|(greasyfork|openuserjs|adarima|telegram|wikipedia|lichess).org|mcrypto.club|misterio.ro|insurancegold.in|coinscap.info|chefknives.expert|(shopee|lazada|rakuten|maybank|binance).*|(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 // @updateURL https://codeberg.org/Amm0ni4/bypass-all-shortlinks-debloated/raw/branch/main/Bypass_All_Shortlinks.meta.js diff --git a/Bypass_All_Shortlinks.user.js b/Bypass_All_Shortlinks.user.js index 00024ec..e72b774 100644 --- a/Bypass_All_Shortlinks.user.js +++ b/Bypass_All_Shortlinks.user.js @@ -4,7 +4,7 @@ // @run-at document-start // @author Amm0ni4 // @noframes -// @version 92.8.37 +// @version 92.8.38 // @grant GM_setValue // @grant GM_getValue // @grant GM_addStyle @@ -754,7 +754,7 @@ // @include /www.spaste.com/ // @include /filecrypt.(cc|co)/ // @include /(mega-enlace|acortados).com/ -// @include /^(https?:\/\/)(.+)?((actualpost|americanstylo|beautifulfashionnailart|dadinthemaking|glowandglamcorner|listofthis|lobirtech|travelperi|vepiv|seydisehirmansethaber|turkiyertg|tophotelsukraine).com|(makego|sakazi).net|askerlikforum.com.tr)(\/.*)/ +// @include /^(https?:\/\/)(.+)?((actualpost|americanstylo|beautifulfashionnailart|dadinthemaking|glowandglamcorner|listofthis|lobirtech|travelperi|vepiv|seydisehirmansethaber|turkiyertg|tophotelsukraine|balatroltd|tenorminiuk).com|(makego|sakazi).net|askerlikforum.com.tr)(\/.*)/ // @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|accounts.youtube|(cloud|mail|translate|analytics|accounts|myaccount|contacts|clients6|developers|payments|pay|ogs|safety|wallet).google|(login|signup|account|officeapps|api|mail|hotmail).live|basketballsavvy|healthyfollicles|hauntingrealm|pluginmixer|boredboard|boardgamechick|healthyfollicles|atlassian|pinterest|twitter|facebook|tiktok|instagram|linkedin).com|(thumb8|thumb9|crewbase|crewus|shinchu|shinbhu|ultraten|uniqueten|topcryptoz|allcryptoz|coinsvalue|cookinguide|cryptowidgets|webfreetools|carstopia|makeupguide|carsmania|nflximg|doubleclick|luckydice).net|(linksfly|shortsfly|urlsfly|wefly|blog24).me|(greasyfork|openuserjs|adarima|telegram|wikipedia|lichess).org|mcrypto.club|misterio.ro|insurancegold.in|coinscap.info|chefknives.expert|(shopee|lazada|rakuten|maybank|binance).*|(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 // @updateURL https://codeberg.org/Amm0ni4/bypass-all-shortlinks-debloated/raw/branch/main/Bypass_All_Shortlinks.meta.js @@ -2922,7 +2922,7 @@ (function() { "use strict"; - const domainRegex = /(actualpost|americanstylo|beautifulfashionnailart|dadinthemaking|glowandglamcorner|listofthis|lobirtech|travelperi|vepiv|seydisehirmansethaber|turkiyertg|tophotelsukraine).com|(makego|sakazi).net|askerlikforum.com.tr/ + const domainRegex = /(actualpost|americanstylo|beautifulfashionnailart|dadinthemaking|glowandglamcorner|listofthis|lobirtech|travelperi|vepiv|seydisehirmansethaber|turkiyertg|tophotelsukraine|balatroltd|tenorminiuk).com|(makego|sakazi).net|askerlikforum.com.tr/ if (domainRegex.test(window.location.href)) { // Backup the current Rinku.me Code in case we get to 404 and we need to try again @@ -2959,17 +2959,26 @@ return true; // Always return true }; - // Function to check for "Click Any Ad & Keep It Open For 15 Seconds To Continue" and reload the page if it exists - function checkForMessage() { + // Functions to check for "Click Any Ad & Keep It Open For 15 Seconds To Continue" and reload the page if it exists + function checkForMessage_fallback() { const paragraphs = document.getElementsByTagName("p"); for (let p of paragraphs) { - if (/.*Click.+Ad.*To Continue.*/is.test(p.textContent) || (/.*Click.+Ad.*To.+Unlock.+Captcha.*/is.test(p.textContent) && isElementVisibleAndEnabled(p)) || ('You Must Click And Stay On The Ad Page To Continue!'.test(p.textContent) && isElementVisibleAndEnabled(p))) { + if ((/.*Click.+Ad.*To.+Continue.*/is.test(p.textContent) || /.*Click.+Ad.*To.+Unlock.+Captcha.*/is.test(p.textContent) || /.*Open.*To.+Unlock.+Captcha.*/is.test(p.textContent) || /.*Open.*To.+Continue.*/is.test(p.textContent)) && isElementVisibleAndEnabled(p)) { location.reload(); // Reload the page return; // Exit the function after reloading } } } + function checkForMessage() { + const p = document.getElementById("click"); + if (!p) { + checkForMessage_fallback(); + } else if (p.textContent.trim() !== "" && isElementVisibleAndEnabled(p)) { + location.reload(); // Reload the page + } + } + // Function to check and click the button function clickStepButton() { const buttons = document.querySelectorAll("button"); diff --git a/extra_bypasses/rinku.user.js b/extra_bypasses/rinku.user.js index be636cc..ce7f7ba 100644 --- a/extra_bypasses/rinku.user.js +++ b/extra_bypasses/rinku.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name Rinku autoclick -// @include /^(https?:\/\/)(.+)?((actualpost|americanstylo|beautifulfashionnailart|dadinthemaking|glowandglamcorner|listofthis|lobirtech|travelperi|vepiv|seydisehirmansethaber|turkiyertg|tophotelsukraine).com|(makego|sakazi).net|askerlikforum.com.tr)(\/.*)/ +// @include /^(https?:\/\/)(.+)?((actualpost|americanstylo|beautifulfashionnailart|dadinthemaking|glowandglamcorner|listofthis|lobirtech|travelperi|vepiv|seydisehirmansethaber|turkiyertg|tophotelsukraine|balatroltd|tenorminiuk).com|(makego|sakazi).net|askerlikforum.com.tr)(\/.*)/ // @run-at document-start // ==/UserScript== @@ -10,7 +10,7 @@ (function() { "use strict"; - const domainRegex = /(actualpost|americanstylo|beautifulfashionnailart|dadinthemaking|glowandglamcorner|listofthis|lobirtech|travelperi|vepiv|seydisehirmansethaber|turkiyertg|tophotelsukraine).com|(makego|sakazi).net|askerlikforum.com.tr/ + const domainRegex = /(actualpost|americanstylo|beautifulfashionnailart|dadinthemaking|glowandglamcorner|listofthis|lobirtech|travelperi|vepiv|seydisehirmansethaber|turkiyertg|tophotelsukraine|balatroltd|tenorminiuk).com|(makego|sakazi).net|askerlikforum.com.tr/ if (domainRegex.test(window.location.href)) { // Backup the current Rinku.me Code in case we get to 404 and we need to try again @@ -47,17 +47,26 @@ return true; // Always return true }; - // Function to check for "Click Any Ad & Keep It Open For 15 Seconds To Continue" and reload the page if it exists - function checkForMessage() { + // Functions to check for "Click Any Ad & Keep It Open For 15 Seconds To Continue" and reload the page if it exists + function checkForMessage_fallback() { const paragraphs = document.getElementsByTagName("p"); for (let p of paragraphs) { - if (/.*Click.+Ad.*To Continue.*/is.test(p.textContent) || (/.*Click.+Ad.*To.+Unlock.+Captcha.*/is.test(p.textContent) && isElementVisibleAndEnabled(p)) || ('You Must Click And Stay On The Ad Page To Continue!'.test(p.textContent) && isElementVisibleAndEnabled(p))) { + if ((/.*Click.+Ad.*To.+Continue.*/is.test(p.textContent) || /.*Click.+Ad.*To.+Unlock.+Captcha.*/is.test(p.textContent) || /.*Open.*To.+Unlock.+Captcha.*/is.test(p.textContent) || /.*Open.*To.+Continue.*/is.test(p.textContent)) && isElementVisibleAndEnabled(p)) { location.reload(); // Reload the page return; // Exit the function after reloading } } } + function checkForMessage() { + const p = document.getElementById("click"); + if (!p) { + checkForMessage_fallback(); + } else if (p.textContent.trim() !== "" && isElementVisibleAndEnabled(p)) { + location.reload(); // Reload the page + } + } + // Function to check and click the button function clickStepButton() { const buttons = document.querySelectorAll("button"); diff --git a/supported_sites.txt b/supported_sites.txt index 387a3dc..cfd0127 100644 --- a/supported_sites.txt +++ b/supported_sites.txt @@ -735,4 +735,4 @@ https://paster.so/* /www.spaste.com/ /filecrypt.(cc|co)/ /(mega-enlace|acortados).com/ -/^(https?:\/\/)(.+)?((actualpost|americanstylo|beautifulfashionnailart|dadinthemaking|glowandglamcorner|listofthis|lobirtech|travelperi|vepiv|seydisehirmansethaber|turkiyertg|tophotelsukraine).com|(makego|sakazi).net|askerlikforum.com.tr)(\/.*)/ +/^(https?:\/\/)(.+)?((actualpost|americanstylo|beautifulfashionnailart|dadinthemaking|glowandglamcorner|listofthis|lobirtech|travelperi|vepiv|seydisehirmansethaber|turkiyertg|tophotelsukraine|balatroltd|tenorminiuk).com|(makego|sakazi).net|askerlikforum.com.tr)(\/.*)/