From 6caaceb42c40dff13b68537e618bce3a50810f4e Mon Sep 17 00:00:00 2001
From: Amm0ni4 <gi0a0pc2@anonaddy.me>
Date: Wed, 4 Dec 2024 22:12:23 +0100
Subject: [PATCH] stop using bypass.vip free API and use bypass.city instead

https://codeberg.org/Amm0ni4/bypass-all-shortlinks-debloated/issues/202
---
 Bypass_All_Shortlinks.meta.js |  2 +-
 Bypass_All_Shortlinks.user.js | 17 +++--------------
 README.md                     |  3 +--
 extra_bypasses/apis.user.js   | 15 ++-------------
 4 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/Bypass_All_Shortlinks.meta.js b/Bypass_All_Shortlinks.meta.js
index c8b09f5..0c6c103 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        93.2.5
+// @version        93.2.6
 // @grant          GM_setValue
 // @grant          GM_getValue
 // @grant          GM_addStyle
diff --git a/Bypass_All_Shortlinks.user.js b/Bypass_All_Shortlinks.user.js
index f3eedcb..c169606 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        93.2.5
+// @version        93.2.6
 // @grant          GM_setValue
 // @grant          GM_getValue
 // @grant          GM_addStyle
@@ -1697,20 +1697,9 @@
         const rParam = new URLSearchParams(window.location.search).get('r');
         if (rParam) {window.location.assign(atob(rParam));};
 
-    // Linkvertise hard case and Admaven. First try bypass.vip, fallback to bypass.city
+    // Linkvertise hard case and Admaven using bypass.city
     } else if (admavenRegex.test(window.location.href) || linkvertiseRegex.test(window.location.href) || lootlinkRegex.test(window.location.href)) {
-        fetch(`https://api.bypass.vip/bypass?url=${encodeURIComponent(window.location.href)}`)
-            .then(response => response.json())
-            .then(data => {
-                if (data.status == 'success') {
-                    window.location.assign(data.result);
-                } else {
-                    window.location.assign(`https://adbypass.org/bypass?bypass=${encodeURIComponent(window.location.href)}`);
-                }
-            })
-            .catch(err => {
-                window.location.assign(`https://adbypass.org/bypass?bypass=${encodeURIComponent(window.location.href)}`);
-            });
+        window.location.assign(`https://adbypass.org/bypass?bypass=${encodeURIComponent(window.location.href)}`);
     }
 })();
 // ----- ------ ----------
diff --git a/README.md b/README.md
index 0045bf8..ed434a9 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,7 @@ You can help by:
 This script contains code I took, or redirects to free services from other developers for certain bypasses.
 Thanks to:
 - [BloggerPemula](https://greasyfork.org/users/810571-bloggerpemula)
-- [bypass.vip](https://bypass.vip/) Free API used for l1nkv3rt1s3, Admaven and Loot-link.
-- [bypass.city](https://bypass.city/) / [2](https://adbypass.org/) Fallback for bypass.vip.
+- [bypass.city](https://bypass.city/) / [2](https://adbypass.org/) used for l1nkv3rt1s3, Admaven and Loot-link.
 - [StephenP](https://greasyfork.org/users/104167-stephenp) for the filecrypt bypass.
 - [Rust1667](https://greasyfork.org/users/980489-rust1667) for some bypasses.
 - [AdamWr](https://github.com/AdamWr) from AdGuard for the mega-enlace and acortalink.me bypasses.
diff --git a/extra_bypasses/apis.user.js b/extra_bypasses/apis.user.js
index c0cb154..da1b235 100644
--- a/extra_bypasses/apis.user.js
+++ b/extra_bypasses/apis.user.js
@@ -20,20 +20,9 @@
         const rParam = new URLSearchParams(window.location.search).get('r');
         if (rParam) {window.location.assign(atob(rParam));};
 
-    // Linkvertise hard case and Admaven. First try bypass.vip, fallback to bypass.city
+    // Linkvertise hard case and Admaven using bypass.city
     } else if (admavenRegex.test(window.location.href) || linkvertiseRegex.test(window.location.href) || lootlinkRegex.test(window.location.href)) {
-        fetch(`https://api.bypass.vip/bypass?url=${encodeURIComponent(window.location.href)}`)
-            .then(response => response.json())
-            .then(data => {
-                if (data.status == 'success') {
-                    window.location.assign(data.result);
-                } else {
-                    window.location.assign(`https://adbypass.org/bypass?bypass=${encodeURIComponent(window.location.href)}`);
-                }
-            })
-            .catch(err => {
-                window.location.assign(`https://adbypass.org/bypass?bypass=${encodeURIComponent(window.location.href)}`);
-            });
+        window.location.assign(`https://adbypass.org/bypass?bypass=${encodeURIComponent(window.location.href)}`);
     }
 })();
 // ----- ------ ----------