Merge branch 'master' of https://github.com/libredirect/libredirect

4 files changed, 14 insertions, 22 deletions

diff --git a/src/assets/javascripts/helpers/common.js b/src/assets/javascripts/helpers/common.js
index 678b9dd5..50180497 100644
--- a/src/assets/javascripts/helpers/common.js
+++ b/src/assets/javascripts/helpers/common.js
@@ -8,6 +8,7 @@ import searchHelper from "./search.js";
 import translateHelper from "./translate/translate.js";
 import wikipediaHelper from "./wikipedia.js";
 import localise from '../localise.js'
+import sendTargetsHelper from "./sendTargets.js";
 
 function getRandomInstance(instances) {
   return instances[~~(instances.length * Math.random())];
@@ -22,6 +23,7 @@ async function wholeInit() {
   await searchHelper.init();
   await wikipediaHelper.init();
   await mediumHelper.init();
+  await sendTargetsHelper.init();
 }
 
 async function updateInstances() {
@@ -55,6 +57,8 @@ async function updateInstances() {
 
     mediumHelper.setRedirects(instances.scribe);
 
+    sendTargetsHelper.setRedirects(instances.send);
+
     console.info("Successfully updated Instances");
     return true;
   }
diff --git a/src/assets/javascripts/helpers/general.js b/src/assets/javascripts/helpers/general.js
index 67c8b57b..1ee6bcf5 100644
--- a/src/assets/javascripts/helpers/general.js
+++ b/src/assets/javascripts/helpers/general.js
@@ -147,4 +147,4 @@ export default {
 
     isException,
     init,
-}
\ No newline at end of file
+}
diff --git a/src/assets/javascripts/helpers/sendTargets.js b/src/assets/javascripts/helpers/sendTargets.js
index 8cfca7bb..5b6d4201 100644
--- a/src/assets/javascripts/helpers/sendTargets.js
+++ b/src/assets/javascripts/helpers/sendTargets.js
@@ -10,23 +10,7 @@ const targets = [
 
 let redirects = {
     "send": {
-        "normal": [
-            "https://send.silkky.cloud",
-            "https://send.turingpoint.de",
-            "https://send.ephemeral.land",
-            "https://send.monks.tools",
-            "https://send.jeugdhulp.be",
-            "https://send.aurorabilisim.com",
-            "https://nhanh.cloud",
-            "https://send.datahoarder.dev",
-            "https://send.navennec.net",
-            "https://fileupload.ggc-project.de",
-            "https://drop.chapril.org",
-            "https://files.psu.ru",
-            "https://send.portailpro.net",
-            "https://bytefile.de",
-            "https://transfer.acted.org ",
-        ],
+        "normal": [],
         "tor": []
     }
 }
@@ -35,7 +19,8 @@ const getRedirects = () => redirects;
 const getCustomRedirects = function () {
     return {
         "send": {
-            "normal": [...sendNormalRedirectsChecks, ...sendNormalCustomRedirects]
+            "normal": [...sendNormalRedirectsChecks, ...sendNormalCustomRedirects],
+	    "tor": [...sendTorRedirectsChecks, ...sendTorCustomRedirects]
         },
     };
 };
@@ -173,6 +158,7 @@ async function init() {
 
                     protocol = r.sendTargetsProtocol ?? "normal";
 
+		    //redirects.send = dataJson.send;
                     if (r.sendTargetsRedirects) redirects = r.sendTargetsRedirects;
 
                     sendNormalRedirectsChecks = r.sendNormalRedirectsChecks ?? [...redirects.send.normal];
diff --git a/src/assets/javascripts/helpers/youtube/youtube.js b/src/assets/javascripts/helpers/youtube/youtube.js
index a4b6d38e..c2d541e5 100644
--- a/src/assets/javascripts/helpers/youtube/youtube.js
+++ b/src/assets/javascripts/helpers/youtube/youtube.js
@@ -91,11 +91,13 @@ let redirects = {
       "https://piped.kavin.rocks",
       "https://piped.silkky.cloud",
       "https://piped.tokhmi.xyz",
-      "https://piped.mint.lgbt",
+      "https://piped.moomoo.me",
       "https://il.ax",
       "https://piped.syncpundit.com",
+      "https://piped.mha.fi",
+      "https://piped.mint.lgbt",
       "https://piped.privacy.com.de",
-      "https://piped.notyourcomputer.net/"
+      "https://piped.notyourcomputer.net"
     ],
     "tor": [
       "http://piped2bbch4xslbl2ckr6k62q56kon56ffowxaqzy42ai22a4sash3ad.onion"
@@ -850,4 +852,4 @@ export default {
   setPipedMaterialRedirects,
 
   init,
-};
\ No newline at end of file
+};