From e08dd3d5a93074b70d002aa4d097cf2c6a653e34 Mon Sep 17 00:00:00 2001
From: BobIsMyManager <bimmgitsignature.nly8m@simplelogin.co>
Date: Sat, 23 Jul 2022 14:11:44 +0100
Subject: Resolve redirects for neuters and youtube

---
 src/assets/javascripts/reuters.js         | 27 ++++++++++++++++++---------
 src/assets/javascripts/youtube/youtube.js | 22 +++++++++++-----------
 2 files changed, 29 insertions(+), 20 deletions(-)

(limited to 'src/assets/javascripts')

diff --git a/src/assets/javascripts/reuters.js b/src/assets/javascripts/reuters.js
index aaae5d17..01e47010 100644
--- a/src/assets/javascripts/reuters.js
+++ b/src/assets/javascripts/reuters.js
@@ -6,18 +6,27 @@ const targets = [
     /^https?:\/{2}(www\.|)reuters\.com.*/
 ];
 
-let redirects = {}
-
-const frontends = new Array("neuters")
-const protocols = new Array("normal", "tor", "i2p", "loki")
-
-for (let i = 0; i < frontends.length; i++) {
-    redirects[frontends[i]] = {}
-    for (let x = 0; x < protocols.length; x++) {
-        redirects[frontends[i]][protocols[x]] = []
+let redirects = {
+    "neuters": {
+        "normal": [
+            "https://neuters.de"
+        ],
+        "tor": [],
+        "i2p": [],
+        "loki": []
     }
 }
 
+// const frontends = new Array("neuters")
+// const protocols = new Array("normal", "tor", "i2p", "loki")
+
+// for (let i = 0; i < frontends.length; i++) {
+//     redirects[frontends[i]] = {}
+//     for (let x = 0; x < protocols.length; x++) {
+//         redirects[frontends[i]][protocols[x]] = []
+//     }
+// }
+
 function setRedirects(val) {
     browser.storage.local.get('cloudflareBlackList', r => {
         redirects.neuters = val;
diff --git a/src/assets/javascripts/youtube/youtube.js b/src/assets/javascripts/youtube/youtube.js
index 3d7cd892..439f5605 100644
--- a/src/assets/javascripts/youtube/youtube.js
+++ b/src/assets/javascripts/youtube/youtube.js
@@ -54,7 +54,7 @@ function setRedirects(val) {
       pipedNormalRedirectsChecks,
       pipedTorRedirectsChecks: redirects.piped.tor,
       pipedMaterialNormalRedirectsChecks,
-      pipedMaterialTorRedirectsChecks: redirects.pipedMaterial.tor
+      // pipedMaterialTorRedirectsChecks: redirects.pipedMaterial.tor
     })
   })
 }
@@ -81,7 +81,7 @@ let
   pipedLokiCustomRedirects,
   pipedMaterialNormalRedirectsChecks,
   pipedMaterialNormalCustomRedirects,
-  pipedMaterialTorRedirectsChecks,
+  // pipedMaterialTorRedirectsChecks,
   pipedMaterialTorCustomRedirects,
   pipedMaterialI2pCustomRedirects,
   pipedMaterialLokiCustomRedirects;
@@ -111,7 +111,7 @@ function init() {
         "pipedLokiCustomRedirects",
         "pipedMaterialNormalRedirectsChecks",
         "pipedMaterialNormalCustomRedirects",
-        "pipedMaterialTorRedirectsChecks",
+        // "pipedMaterialTorRedirectsChecks",
         "pipedMaterialTorCustomRedirects",
         "pipedMaterialI2pCustomRedirects",
         "pipedMaterialLokiCustomRedirects"
@@ -138,7 +138,7 @@ function init() {
         pipedLokiCustomRedirects = r.pipedLokiCustomRedirects;
         pipedMaterialNormalRedirectsChecks = r.pipedMaterialNormalRedirectsChecks;
         pipedMaterialNormalCustomRedirects = r.pipedMaterialNormalCustomRedirects;
-        pipedMaterialTorRedirectsChecks = r.pipedMaterialTorRedirectsChecks;
+        // pipedMaterialTorRedirectsChecks = r.pipedMaterialTorRedirectsChecks;
         pipedMaterialTorCustomRedirects = r.pipedMaterialTorCustomRedirects;
         pipedMaterialI2pCustomRedirects - r.pipedMaterialI2pCustomRedirects;
         pipedMaterialLokiCustomRedirects = r.pipedMaterialLokiCustomRedirects;
@@ -235,7 +235,7 @@ function redirect(url, type, initiator, disableOverride) {
     let instancesList = [];
     if (protocol == 'loki') instancesList = [...pipedMaterialLokiCustomRedirects];
     else if (protocol == 'i2p') instancesList = [...pipedMaterialI2pCustomRedirects];
-    else if (protocol == 'tor') instancesList = [...pipedMaterialTorRedirectsChecks, ...pipedMaterialTorCustomRedirects];
+    else if (protocol == 'tor') instancesList = [...pipedMaterialTorCustomRedirects]; //...pipedMaterialTorRedirectsChecks, 
     if ((instancesList.length === 0 && protocolFallback) || protocol == 'normal') {
       instancesList = [...pipedMaterialNormalRedirectsChecks, ...pipedMaterialNormalCustomRedirects];
     }
@@ -275,7 +275,7 @@ function switchInstance(url, disableOverride) {
     else if (protocol == 'tor') {
       if (youtubeFrontend == 'invidious') instancesList = [...invidiousTorRedirectsChecks, ...invidiousTorCustomRedirects];
       else if (youtubeFrontend == 'piped') instancesList = [...pipedTorRedirectsChecks, ...pipedTorCustomRedirects];
-      else if (youtubeFrontend == 'pipedMaterial') instancesList = [...pipedMaterialTorRedirectsChecks, ...pipedMaterialTorCustomRedirects];
+      else if (youtubeFrontend == 'pipedMaterial') instancesList = [...pipedMaterialTorCustomRedirects]; //...pipedMaterialTorRedirectsChecks, 
     }
     if ((instancesList.length === 0 && protocolFallback) || protocol == 'normal') {
       if (youtubeFrontend == 'invidious') instancesList = [...invidiousNormalRedirectsChecks, ...invidiousNormalCustomRedirects];
@@ -348,7 +348,7 @@ function initDefaults() {
           pipedMaterialNormalRedirectsChecks: pipedMaterialNormalRedirectsChecks,
           pipedMaterialNormalCustomRedirects: [],
 
-          pipedMaterialTorRedirectsChecks: [...redirects.pipedMaterial.tor],
+          //pipedMaterialTorRedirectsChecks: [...redirects.pipedMaterial.tor],
           pipedMaterialTorCustomRedirects: [],
 
           pipedMaterialI2pCustomRedirects: [],
@@ -469,7 +469,7 @@ function copyPastePipedMaterialLocalStorage(test, url, tabId,) {
     if (![
       ...pipedMaterialNormalRedirectsChecks,
       ...pipedMaterialNormalCustomRedirects,
-      ...pipedMaterialTorRedirectsChecks,
+      //...pipedMaterialTorRedirectsChecks,
       ...pipedMaterialTorCustomRedirects,
       ...pipedMaterialI2pCustomRedirects,
       ...pipedMaterialLokiCustomRedirects
@@ -481,7 +481,7 @@ function copyPastePipedMaterialLocalStorage(test, url, tabId,) {
       let checkedInstances = [];
       if (protocol == 'loki') checkedInstances = [...pipedMaterialLokiCustomRedirects];
       else if (protocol == 'i2p') checkedInstances = [...pipedMaterialI2pCustomRedirects];
-      else if (protocol == 'tor') checkedInstances = [...pipedMaterialTorRedirectsChecks, ...pipedMaterialTorCustomRedirects]
+      else if (protocol == 'tor') checkedInstances = [...pipedMaterialTorCustomRedirects]; //...pipedMaterialTorRedirectsChecks, 
       if ((instancesList.length === 0 && protocolFallback) || protocol == 'normal') {
         checkedInstances = [...pipedMaterialNormalRedirectsChecks, ...pipedMaterialNormalCustomRedirects]
       }
@@ -504,7 +504,7 @@ function pastePipedMaterialLocalStorage() {
     let checkedInstances = [];
     if (protocol == 'loki') checkedInstances = [...pipedMaterialLokiCustomRedirects];
     else if (protocol == 'i2p') checkedInstances = [...pipedMaterialI2pCustomRedirects];
-    else if (protocol == 'tor') checkedInstances = [...pipedMaterialTorRedirectsChecks, ...pipedMaterialTorCustomRedirects]
+    else if (protocol == 'tor') checkedInstances = [...pipedMaterialTorCustomRedirects]; //...pipedMaterialTorRedirectsChecks, 
     if ((instancesList.length === 0 && protocolFallback) || protocol == 'normal') {
       checkedInstances = [...pipedMaterialNormalRedirectsChecks, ...pipedMaterialNormalCustomRedirects]
     }
@@ -536,7 +536,7 @@ function removeXFrameOptions(e) {
         else if (protocol == 'tor') {
           if (youtubeFrontend == 'invidious') instancesList = [...invidiousTorRedirectsChecks, ...invidiousTorCustomRedirects];
           if (youtubeFrontend == 'piped') instancesList = [...pipedTorRedirectsChecks, ...pipedTorCustomRedirects];
-          if (youtubeFrontend == 'pipedMaterial') instancesList = [...pipedMaterialTorRedirectsChecks, ...pipedMaterialTorCustomRedirects];
+          if (youtubeFrontend == 'pipedMaterial') instancesList = [...pipedMaterialTorCustomRedirects]; //...pipedMaterialTorRedirectsChecks, 
         }
         if ((instancesList.length === 0 && protocolFallback) || protocol == 'normal') {
           if (youtubeFrontend == 'invidious') instancesList = [...invidiousNormalRedirectsChecks, ...invidiousNormalCustomRedirects];
-- 
cgit 1.4.1