Supported all frontend preferences #234

5 files changed, 71 insertions, 53 deletions

diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index 06957367..d112e000 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -1,6 +1,8 @@
 "use strict";
 
+import generalHelper from "../../assets/javascripts/helpers/general.js";
 import youtubeHelper from "../../assets/javascripts/helpers/youtube/youtube.js";
+import youtubeMusicHelper from "../../assets/javascripts/helpers/youtubeMusic.js";
 import twitterHelper from "../../assets/javascripts/helpers/twitter.js";
 import instagramHelper from "../../assets/javascripts/helpers/instagram.js";
 import redditHelper from "../../assets/javascripts/helpers/reddit.js";
@@ -15,33 +17,42 @@ import sendTargetsHelper from "../../assets/javascripts/helpers/sendTargets.js";
 import peertubeHelper from "../../assets/javascripts/helpers/peertube.js";
 import lbryHelper from "../../assets/javascripts/helpers/lbry.js";
 
-import generalHelper from "../../assets/javascripts/helpers/general.js";
-import youtubeMusicHelper from "../../assets/javascripts/helpers/youtubeMusic.js";
-
 window.browser = window.browser || window.chrome;
 
-browser.runtime.onInstalled.addListener(async details => {
-  if (details.reason == 'install') {
-    fetch('/instances/blocklist.json').then(response => response.text()).then(async data => {
-      await browser.storage.local.set({ cloudflareList: JSON.parse(data) })
-      youtubeHelper.initDefaults();
-      youtubeMusicHelper.initDefaults();
-      twitterHelper.initDefaults();
-      instagramHelper.initDefaults();
-      mapsHelper.initDefaults();
-      searchHelper.initDefaults();
-      translateHelper.initDefaults();
-      mediumHelper.initDefaults();
-      redditHelper.initDefaults();
-      wikipediaHelper.initDefaults();
-      imgurHelper.initDefaults();
-      tiktokHelper.initDefaults();
-      sendTargetsHelper.initDefaults();
-      peertubeHelper.initDefaults();
-      lbryHelper.initDefaults();
-    })
+youtubeHelper.setInvidiousCookies();
+translateHelper.setSimplyTranslateCookies();
+twitterHelper.setNitterCookies();
+wikipediaHelper.setWikilessCookies();
+searchHelper.setSearxCookies();
+searchHelper.setSearxngCookies();
+redditHelper.setLibredditCookies();
+redditHelper.setTedditCookies();
+tiktokHelper.setProxiTokCookies();
+
+browser.runtime.onInstalled.addListener(
+  async details => {
+    if (details.reason == 'install') {
+      fetch('/instances/blocklist.json').then(response => response.text()).then(async data => {
+        await browser.storage.local.set({ cloudflareList: JSON.parse(data) })
+        youtubeHelper.initDefaults();
+        youtubeMusicHelper.initDefaults();
+        twitterHelper.initDefaults();
+        instagramHelper.initDefaults();
+        mapsHelper.initDefaults();
+        searchHelper.initDefaults();
+        translateHelper.initDefaults();
+        mediumHelper.initDefaults();
+        redditHelper.initDefaults();
+        wikipediaHelper.initDefaults();
+        imgurHelper.initDefaults();
+        tiktokHelper.initDefaults();
+        sendTargetsHelper.initDefaults();
+        peertubeHelper.initDefaults();
+        lbryHelper.initDefaults();
+      })
+    }
   }
-})
+)
 
 async function wholeInit() {
   await youtubeHelper.init();
@@ -71,11 +82,10 @@ browser.tabs.onCreated.addListener(
       });
       incognitoInit = true;
     }
-  });
-
+  }
+);
 
 let BYPASSTABs = [];
-
 browser.webRequest.onBeforeRequest.addListener(
   async details => {
     const url = new URL(details.url);
@@ -213,11 +223,9 @@ browser.tabs.onUpdated.addListener(
     let url;
     try { url = new URL(changeInfo.url); }
     catch (_) { return }
-    let result = await youtubeHelper.initPipedLocalStorage(url, tabId);
-    // if (youtubeHelper.isPipedorInvidious(url, 'main_frame', 'pipedMaterial')) youtubeHelper.initPipedMaterialLocalStorage(tabId);
-    // if (translateHelper.isTranslateRedirects(url, 'main_frame', 'lingva')) translateHelper.initLingvaLocalStorage(tabId);
-    // if (instagramHelper.isBibliogram(url)) instagramHelper.initBibliogramCookies(url);
-    // if (changeInfo.url && youtubeHelper.isPipedorInvidious(url, 'main_frame', 'pipedMaterial')) youtubeHelper.initPipedMaterialLocalStorage(tabId);
+    let result = await youtubeHelper.setPipedLocalStorage(url, tabId);
+    if (!result) result = await youtubeHelper.setPipedMaterialLocalStorage(url, tabId);
+    if (!result) result = await translateHelper.initLingvaLocalStorage(url, tabId);
   }
 );
 
@@ -265,14 +273,16 @@ browser.contextMenus.create({
   contexts: ["browser_action"]
 });
 
-browser.contextMenus.onClicked.addListener((info, tab) => {
-  if (info.menuItemId == 'switchInstance') {
-    let url;
-    try { url = new URL(tab.url); }
-    catch (_) { return }
-    let newUrl = changeWholeInstance(url);
-    if (newUrl) browser.tabs.update({ url: newUrl });
+browser.contextMenus.onClicked.addListener(
+  (info, tab) => {
+    if (info.menuItemId == 'switchInstance') {
+      let url;
+      try { url = new URL(tab.url); }
+      catch (_) { return }
+      let newUrl = changeWholeInstance(url);
+      if (newUrl) browser.tabs.update({ url: newUrl });
+    }
+    else if (info.menuItemId == 'settings')
+      browser.runtime.openOptionsPage()
   }
-  else if (info.menuItemId == 'settings')
-    browser.runtime.openOptionsPage()
-});
+);
diff --git a/src/pages/options/youtube/youtube.js b/src/pages/options/youtube/youtube.js
index 07d9ba1d..ce42abdc 100644
--- a/src/pages/options/youtube/youtube.js
+++ b/src/pages/options/youtube/youtube.js
@@ -146,7 +146,7 @@ invidiousForm.addEventListener('submit', async event => {
 // pipedForm.addEventListener('submit', async event => {
 //     event.preventDefault();
 //     const url = new URL(pipedCookies.value);
-//     youtubeHelper.initPipedLocalStorage(url);
+//     youtubeHelper.applyPipedLocalStorage(url);
 // });
 
 commonHelper.processDefaultCustomInstances('youtube', 'invidious', 'normal', document);
diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html
index 0cd1a4f7..b4086ffd 100644
--- a/src/pages/popup/popup.html
+++ b/src/pages/popup/popup.html
@@ -56,14 +56,14 @@
         <h4>LBRY</h4></a>
       <input id="disable-lbry" type="checkbox">
     </div>
-    <div class="some-block" id="search"><a class="title" href="https://search.com">
+    <div class="some-block" id="search"><a class="title" href="https://libredirect.invalid">
         <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
           <path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"></path>
         </svg>
         <h4>Search</h4></a>
       <input id="disable-search" type="checkbox">
     </div>
-    <div class="some-block" id="translate"><a class="title" href="https://translate.com">
+    <div class="some-block" id="translate"><a class="title" href="https://translate.google.com">
         <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
           <path d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z"></path>
         </svg>
@@ -107,6 +107,5 @@
         <h4>Unify Settings</h4></a></div>
     <script type="module" src="../options/init.js"></script>
     <script type="module" src="./popup.js"></script>
-    <script src="../../assets/javascripts/localise.js"></script>
   </body>
 </html>
\ No newline at end of file
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index 61e0ee1b..c6399aeb 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -110,14 +110,23 @@ function unify() {
         let url = new URL(currTab.url);
 
         let result = await youtubeHelper.initInvidiousCookies(url);
-        if (!result) result = await youtubeHelper.copyPipedLocalStorage(url, currTab.id);
+        if (!result) result = await youtubeHelper.initPipedLocalStorage(url, currTab.id);
+        if (!result) result = await youtubeHelper.initPipedMaterialLocalStorage(url, currTab.id);
+
         if (!result) result = await twitterHelper.initNitterCookies(url);
+
         if (!result) result = await redditHelper.initLibredditCookies(url);
         if (!result) result = await redditHelper.initTedditCookies(url);
-        if (!result) result = await redditHelper.initSearxCookies(url);
-        if (!result) result = await redditHelper.initSearxngCookies(url);
+
+        if (!result) result = await searchHelper.initSearxCookies(url);
+        if (!result) result = await searchHelper.initSearxngCookies(url);
+
         if (!result) result = await tiktokHelper.initProxiTokCookies(url);
-        if (!result) result = await tiktokHelper.initWikilessCookies(url);
+
+        if (!result) result = await wikipediaHelper.initWikilessCookies(url);
+
+        if (!result) result = await translateHelper.initSimplyTranslateCookies(url);
+        if (!result) result = await translateHelper.initLingvaLocalStorage(url);
 
         if (result) {
           const textElement = unifyElement.getElementsByTagName('h4')[0]
diff --git a/src/pages/popup/popup.pug b/src/pages/popup/popup.pug
index f2cc4635..31354a4b 100644
--- a/src/pages/popup/popup.pug
+++ b/src/pages/popup/popup.pug
@@ -75,13 +75,13 @@ html(lang="en")
             input#disable-lbry(type="checkbox")
 
         #search.some-block
-            a.title(href="https://search.com")
+            a.title(href="https://libredirect.invalid")
                 +search
                 h4 Search
             input#disable-search(type="checkbox")
 
         #translate.some-block
-            a.title(href="https://translate.com")
+            a.title(href="https://translate.google.com")
                 +translate
                 h4 Translate
             input#disable-simplyTranslate(type="checkbox")
@@ -120,4 +120,4 @@ html(lang="en")
 
         script(type="module" src="../options/init.js")
         script(type="module" src="./popup.js")
-        script(src="../../assets/javascripts/localise.js")
\ No newline at end of file
+        //- script(src="../../assets/javascripts/localise.js")
\ No newline at end of file