From feb20fe96c41ab7cef4897cada60affe92085c7c Mon Sep 17 00:00:00 2001
From: ManeraKai <manerakai@protonmail.com>
Date: Tue, 1 Mar 2022 22:42:48 +0300
Subject: Fixed bypass to twitter bug #71

---
 src/assets/javascripts/helpers/reddit.js          |  2 +-
 src/assets/javascripts/helpers/twitter.js         | 29 +++++++++++------------
 src/assets/javascripts/helpers/youtube/youtube.js | 24 +++++++++----------
 3 files changed, 26 insertions(+), 29 deletions(-)

(limited to 'src/assets/javascripts/helpers')

diff --git a/src/assets/javascripts/helpers/reddit.js b/src/assets/javascripts/helpers/reddit.js
index a6954791..268c721d 100644
--- a/src/assets/javascripts/helpers/reddit.js
+++ b/src/assets/javascripts/helpers/reddit.js
@@ -214,7 +214,7 @@ function redirect(url, type, initiator) {
       ].includes(initiator.origin) ||
       targets.includes(initiator.host)
     )
-  ) return 'BYBASSTAB';
+  ) return 'BYPASSTAB';
 
   if ((!targets.includes(url.host))) return null;
 
diff --git a/src/assets/javascripts/helpers/twitter.js b/src/assets/javascripts/helpers/twitter.js
index 8b418538..992e44f3 100644
--- a/src/assets/javascripts/helpers/twitter.js
+++ b/src/assets/javascripts/helpers/twitter.js
@@ -94,24 +94,24 @@ function setProtocol(val) {
   console.log("twitterProtocol: ", val)
 }
 
-function isTwitter(url, initiator) {
-  if (disable) return false;
+function redirect(url, initiator) {
+
+  if (disable) return null;
+
+  if (!targets.some((rx) => rx.test(url.href))) return null;
+
   if (url.pathname.split("/").includes("home")) return null;
+
   if (
-    commonHelper.isFirefox() &&
     initiator && (
-      [
-        ...redirects.nitter.normal,
-        ...redirects.nitter.tor,
-        ...nitterTorCustomRedirects,
-        ...nitterNormalCustomRedirects
-      ].includes(initiator.origin) || targets.includes(initiator.host))
-  ) return false;
-
-  return targets.some((rx) => rx.test(url.href));
-}
+      [...redirects.nitter.normal,
+      ...redirects.nitter.tor,
+      ...nitterTorCustomRedirects,
+      ...nitterNormalCustomRedirects
+      ].includes(initiator.origin)
+    )
+  ) return 'BYPASSTAB';
 
-function redirect(url) {
   let instancesList;
   if (protocol == 'normal')
     instancesList = [...nitterNormalRedirectsChecks, ...nitterNormalCustomRedirects];
@@ -216,7 +216,6 @@ export default {
   setProtocol,
 
   redirect,
-  isTwitter,
   init,
   changeInstance,
 };
diff --git a/src/assets/javascripts/helpers/youtube/youtube.js b/src/assets/javascripts/helpers/youtube/youtube.js
index 55f7d7d6..d52cf949 100644
--- a/src/assets/javascripts/helpers/youtube/youtube.js
+++ b/src/assets/javascripts/helpers/youtube/youtube.js
@@ -328,20 +328,18 @@ function redirect(url, details, initiator) {
   if (
     bypassWatchOnYoutube &&
     initiator && (
-      [
-        ...redirects.invidious.normal,
-        ...invidiousNormalCustomRedirects,
-        ...redirects.invidious.tor,
-        ...invidiousTorCustomRedirects,
-
-        ...redirects.piped.normal,
-        ...redirects.piped.tor,
-        ...pipedNormalCustomRedirects,
-        ...pipedTorCustomRedirects
-      ].includes(initiator.origin) ||
-      targets.includes(initiator.host)
+      [...redirects.invidious.normal,
+      ...invidiousNormalCustomRedirects,
+      ...redirects.invidious.tor,
+      ...invidiousTorCustomRedirects,
+
+      ...redirects.piped.normal,
+      ...redirects.piped.tor,
+      ...pipedNormalCustomRedirects,
+      ...pipedTorCustomRedirects
+      ].includes(initiator.origin)
     )
-  ) return 'BYBASSTAB';
+  ) return 'BYPASSTAB';
 
   if (url.pathname.match(/iframe_api/) || url.pathname.match(/www-widgetapi/)) return null; // Don't redirect YouTube Player API.
 
-- 
cgit 1.4.1