Re-enabled Switch Instances

6 files changed, 23 insertions, 19 deletions

diff --git a/src/assets/javascripts/helpers/medium.js b/src/assets/javascripts/helpers/medium.js
index 0a028f07..7be6b0d1 100644
--- a/src/assets/javascripts/helpers/medium.js
+++ b/src/assets/javascripts/helpers/medium.js
@@ -111,7 +111,8 @@ function redirect(url, type, initiator) {
 }
 
 function switchInstance(url) {
-  return new Promise(resolve => {
+  return new Promise(async resolve => {
+    await init();
     let protocolHost = utils.protocolHost(url);
     const all = [
       ...mediumRedirects.scribe.tor,
diff --git a/src/assets/javascripts/helpers/peertube.js b/src/assets/javascripts/helpers/peertube.js
index cf532e23..ed15bce9 100644
--- a/src/assets/javascripts/helpers/peertube.js
+++ b/src/assets/javascripts/helpers/peertube.js
@@ -100,7 +100,8 @@ function redirect(url, type, initiator) {
 }
 
 function switchInstance(url) {
-    return new Promise(resolve => {
+    return new Promise(async resolve => {
+        await init();
         const protocolHost = utils.protocolHost(url);
         if (!all().includes(protocolHost)) { resolve(); return; }
 
diff --git a/src/assets/javascripts/helpers/sendTargets.js b/src/assets/javascripts/helpers/sendTargets.js
index c4caefb3..a3e87268 100644
--- a/src/assets/javascripts/helpers/sendTargets.js
+++ b/src/assets/javascripts/helpers/sendTargets.js
@@ -78,7 +78,8 @@ function all() {
 }
 
 function switchInstance(url) {
-    return new Promise(resolve => {
+    return new Promise(async resolve => {
+        await init();
         const protocolHost = utils.protocolHost(url);
         if (!all().includes(protocolHost)) { resolve(); return; }
         if (url.pathname != '/') { resolve(); return; }
diff --git a/src/assets/javascripts/helpers/twitter.js b/src/assets/javascripts/helpers/twitter.js
index 78beb86f..dc48f9b1 100644
--- a/src/assets/javascripts/helpers/twitter.js
+++ b/src/assets/javascripts/helpers/twitter.js
@@ -113,15 +113,16 @@ function reverse(url) {
 
 function switchInstance(url) {
   return new Promise(async resolve => {
+    await init();
     const protocolHost = utils.protocolHost(url);
-    if (!all().includes(protocolHost)) { resolve; return; }
+    if (!all().includes(protocolHost)) { resolve(); return; }
     let instancesList;
     if (twitterProtocol == 'normal') instancesList = [...nitterNormalRedirectsChecks, ...nitterNormalCustomRedirects];
     else if (twitterProtocol == 'tor') instancesList = [...nitterTorRedirectsChecks, ...nitterTorCustomRedirects];
 
     let index = instancesList.indexOf(protocolHost);
     if (index > -1) instancesList.splice(index, 1);
-    if (instancesList.length === 0) { resolve; return; }
+    if (instancesList.length === 0) { resolve(); return; }
 
     const randomInstance = utils.getRandomInstance(instancesList);
     resolve(`${randomInstance}${url.pathname}${url.search}`);
diff --git a/src/assets/javascripts/helpers/utils.js b/src/assets/javascripts/helpers/utils.js
index 8ca49438..95d96c7e 100644
--- a/src/assets/javascripts/helpers/utils.js
+++ b/src/assets/javascripts/helpers/utils.js
@@ -386,17 +386,17 @@ function switchInstance(test) {
         try { url = new URL(currTab.url); }
         catch { resolve(); return };
         let newUrl = await youtubeHelper.switchInstance(url);
-        // if (!newUrl) newUrl = twitterHelper.switchInstance(url);
-        // if (!newUrl) newUrl = instagramHelper.switchInstance(url);
-        // if (!newUrl) newUrl = redditHelper.switchInstance(url);
-        // if (!newUrl) newUrl = searchHelper.switchInstance(url);
+        if (!newUrl) newUrl = await twitterHelper.switchInstance(url);
+        if (!newUrl) newUrl = await instagramHelper.switchInstance(url);
+        if (!newUrl) newUrl = await redditHelper.switchInstance(url);
+        if (!newUrl) newUrl = await searchHelper.switchInstance(url);
         if (!newUrl) newUrl = await translateHelper.switchInstance(url);
-        // if (!newUrl) newUrl = mediumHelper.switchInstance(url);
-        // if (!newUrl) newUrl = sendTargetsHelper.switchInstance(url);
-        // if (!newUrl) newUrl = peertubeHelper.switchInstance(url);
-        // if (!newUrl) newUrl = lbryHelper.switchInstance(url);
-        // if (!newUrl) newUrl = imgurHelper.switchInstance(url);
-        // if (!newUrl) newUrl = wikipediaHelper.switchInstance(url);
+        if (!newUrl) newUrl = await mediumHelper.switchInstance(url);
+        if (!newUrl) newUrl = await sendTargetsHelper.switchInstance(url);
+        if (!newUrl) newUrl = await peertubeHelper.switchInstance(url);
+        if (!newUrl) newUrl = await lbryHelper.switchInstance(url);
+        if (!newUrl) newUrl = await imgurHelper.switchInstance(url);
+        if (!newUrl) newUrl = await wikipediaHelper.switchInstance(url);
 
         if (newUrl) {
           if (!test)
diff --git a/src/assets/javascripts/helpers/wikipedia.js b/src/assets/javascripts/helpers/wikipedia.js
index 59351c62..868bb01c 100644
--- a/src/assets/javascripts/helpers/wikipedia.js
+++ b/src/assets/javascripts/helpers/wikipedia.js
@@ -163,8 +163,8 @@ function switchInstance(url) {
       ...wikilessNormalCustomRedirects,
       ...wikilessTorCustomRedirects,
       ...wikilessI2pCustomRedirects
-    ]
-    if (!wikipediaList.includes(protocolHost)) return;
+    ];
+    if (!wikipediaList.includes(protocolHost)) { resolve(); return; }
 
     let instancesList;
     if (wikipediaProtocol == 'normal') instancesList = [...wikilessNormalCustomRedirects, ...wikilessNormalRedirectsChecks];
@@ -173,10 +173,10 @@ function switchInstance(url) {
 
     let index = instancesList.indexOf(protocolHost);
     if (index > -1) instancesList.splice(index, 1);
-    if (instancesList.length === 0) return;
+    if (instancesList.length === 0) { resolve(); return; }
 
     const randomInstance = utils.getRandomInstance(instancesList);
-    return `${randomInstance}${url.pathname}${url.search}`;
+    resolve(`${randomInstance}${url.pathname}${url.search}`);
   })
 }