Changing way of handling variables and settings

14 files changed, 97 insertions, 81 deletions

diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index 68b6db55..05403a88 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -24,9 +24,19 @@ window.browser = window.browser || window.chrome;
 //   : [];
 // data.invidiousSubtitles = result.invidiousSubtitles || "";
 
+googleMaps.init()
+searchHelper.init()
+googleTranslateHelper.init()
+instagramHelper.init()
+mediumHelper.init()
+redditHelper.init()
+twitterHelper.init()
+wikipediaHelper.init()
+youtubeHelper.init()
+
 
 browser.webRequest.onBeforeRequest.addListener(
-  (details) => {
+  async (details) => {
     const url = new URL(details.url);
     let initiator;
     if (details.originUrl)
@@ -34,25 +44,25 @@ browser.webRequest.onBeforeRequest.addListener(
     else if (details.initiator)
       initiator = new URL(details.initiator);
 
-    let newUrl;
+    var newUrl;
 
-    if (youtubeHelper.targets.includes(url.host)) newUrl = youtubeHelper.redirect(url, initiator, details.type)
+    if (youtubeHelper.targets.includes(url.host)) newUrl = await youtubeHelper.redirect(url, initiator, details.type)
 
-    else if (twitterHelper.targets.includes(url.host)) newUrl = redirectTwitter(url, initiator);
+    else if (twitterHelper.targets.includes(url.host)) newUrl = await twitterHelper.redirect(url, initiator);
 
-    else if (instagramHelper.targets.includes(url.host)) newUrl = redirectInstagram(url, initiator, details.type);
+    else if (instagramHelper.targets.includes(url.host)) newUrl = await instagramHelper.redirect(url, initiator, details.type);
 
-    else if (url.href.match(mapsHelper.targets)) newUrl = redirectGoogleMaps(url, initiator);
+    else if (url.href.match(mapsHelper.targets)) newUrl = await mapsHelper.redirect(url, initiator);
 
-    else if (redditHelper.targets.includes(url.host)) newUrl = redirectReddit(url, initiator, details.type);
+    else if (redditHelper.targets.includes(url.host)) newUrl = await redditHelper.redirect(url, initiator, details.type);
 
-    else if (mediumHelper.targets.some((rx) => rx.test(url.host))) newUrl = redirectMedium(url, initiator);
+    else if (mediumHelper.targets.some((rx) => rx.test(url.host))) newUrl = await mediumHelper.redirect(url, initiator);
 
-    else if (searchHelper.targets.some((rx) => rx.test(url.href))) newUrl = redirectSearch(url, initiator);
+    else if (searchHelper.targets.some((rx) => rx.test(url.href))) newUrl = await searchHelper.redirect(url, initiator)
 
-    else if (googleTranslateHelper.targets.includes(url.host)) newUrl = redirectGoogleTranslate(url, initiator);
+    else if (googleTranslateHelper.targets.includes(url.host)) newUrl = await googleTranslateHelper.redirect(url, initiator);
 
-    else if (url.host.match(wikipediaHelper.targets)) newUrl = redirectWikipedia(url, initiator);
+    else if (url.host.match(wikipediaHelper.targets)) newUrl = await wikipediaHelper.redirect(url, initiator);
 
     if (newUrl) {
       console.info("Redirecting", url.href, "=>", newUrl);
diff --git a/src/pages/options/init.js b/src/pages/options/init.js
index f9de76f1..09b41fd8 100644
--- a/src/pages/options/init.js
+++ b/src/pages/options/init.js
@@ -1,8 +1,3 @@
-browser.storage.sync.get(
-    [
-        "theme"
-    ],
-    (result) => {
-        if (result.theme) document.body.classList.add(result.theme);
-    }
-)
\ No newline at end of file
+browser.storage.sync.get("theme", (result) => {
+    if (result.theme) document.body.classList.add(result.theme);
+})
\ No newline at end of file
diff --git a/src/pages/options/instagram.js b/src/pages/options/instagram.js
index 77438742..7be11ff1 100644
--- a/src/pages/options/instagram.js
+++ b/src/pages/options/instagram.js
@@ -2,7 +2,9 @@ import instagramHelper from "../../assets/javascripts/helpers/instagram.js";
 
 let disableBibliogramElement = document.getElementById("disable-bibliogram");
 
-disableBibliogramElement.checked = !instagramHelper.getDisableBibliogram();
+instagramHelper.init().then(() => {
+    disableBibliogramElement.checked = !instagramHelper.getDisableBibliogram();
+})
 
 disableBibliogramElement.addEventListener("change",
     (event) => instagramHelper.setDisableBibliogram(!event.target.checked)
diff --git a/src/pages/options/maps.js b/src/pages/options/maps.js
index 310f9285..a8819a50 100644
--- a/src/pages/options/maps.js
+++ b/src/pages/options/maps.js
@@ -2,7 +2,9 @@ import mapsHelper from "../../assets/javascripts/helpers/google-maps.js";
 
 let disableOsmElement = document.getElementById("disable-osm");
 
-disableOsmElement.checked = !mapsHelper.getDisableOsm();
+mapsHelper.init().then(() => {
+    disableOsmElement.checked = !mapsHelper.getDisableOsm();
+})
 
 disableOsmElement.addEventListener("change",
     (event) => mapsHelper.setDisableOsm(!event.target.checked)
diff --git a/src/pages/options/medium.js b/src/pages/options/medium.js
index bcd2c2e4..5f41282e 100644
--- a/src/pages/options/medium.js
+++ b/src/pages/options/medium.js
@@ -2,7 +2,9 @@ import mediumHelper from "../../assets/javascripts/helpers/medium.js";
 
 let disableScribeElement = document.getElementById("disable-scribe");
 
-disableScribeElement.checked = !mediumHelper.getDisableScribe();
+mediumHelper.init().then(() => {
+    disableScribeElement.checked = !mediumHelper.getDisableScribe();
+})
 
 disableScribeElement.addEventListener("change",
     (event) => mediumHelper.setDisableScribe(!event.target.checked)
diff --git a/src/pages/options/reddit.js b/src/pages/options/reddit.js
index 96b736be..0222c6dd 100644
--- a/src/pages/options/reddit.js
+++ b/src/pages/options/reddit.js
@@ -1,15 +1,17 @@
-import reddit from "../../assets/javascripts/helpers/reddit.js";
+import redditHelper from "../../assets/javascripts/helpers/reddit.js";
 
 let disableRedditElement = document.getElementById("disable-reddit");
 let redditFrontendElement = document.getElementById("reddit-frontend");
 
-disableRedditElement.checked = !reddit.getDisableReddit();
-redditFrontendElement.value = reddit.getRedditFrontend();
+redditHelper.init().then(() => {
+    disableRedditElement.checked = !redditHelper.getDisableReddit();
+    redditFrontendElement.value = redditHelper.getRedditFrontend();
+})
 
 disableRedditElement.addEventListener("change",
-    (event) => reddit.setDisableReddit(!event.target.checked)
+    (event) => redditHelper.setDisableReddit(!event.target.checked)
 );
 
 redditFrontendElement.addEventListener("change",
-    (event) => reddit.setRedditFrontend(event.target.options[redditFrontendElement.selectedIndex].value)
+    (event) => redditHelper.setRedditFrontend(event.target.options[redditFrontendElement.selectedIndex].value)
 );
\ No newline at end of file
diff --git a/src/pages/options/search.html b/src/pages/options/search.html
index 77bd4d23..d0510eed 100644
--- a/src/pages/options/search.html
+++ b/src/pages/options/search.html
@@ -65,6 +65,7 @@
 
 
     <script type="module" src="./init.js"></script>
+    <script type="module" src="./init.js"></script>
     <script type="module" src="./search.js"></script>
     <script src="../../assets/javascripts/localise.js"></script>
 </body>
diff --git a/src/pages/options/search.js b/src/pages/options/search.js
index 85e39749..37e095a0 100644
--- a/src/pages/options/search.js
+++ b/src/pages/options/search.js
@@ -3,8 +3,10 @@ import searchHelper from "../../assets/javascripts/helpers/google-search.js";
 let disableSearchElement = document.getElementById("disable-search");
 let searchFrontendElement = document.getElementById("search-frontend");
 
-disableSearchElement.checked = !searchHelper.getDisableSearch();
-searchFrontendElement.value = searchHelper.getSearchFrontend();
+searchHelper.init().then(() => {
+  disableSearchElement.checked = !searchHelper.getDisableSearch();
+  searchFrontendElement.value = searchHelper.getSearchFrontend();
+});
 
 searchFrontendElement.addEventListener("change",
   (event) => searchHelper.setSearchFrontend(event.target.options[searchFrontendElement.selectedIndex].value)
diff --git a/src/pages/options/shared.js b/src/pages/options/shared.js
index caa3a407..62da2504 100644
--- a/src/pages/options/shared.js
+++ b/src/pages/options/shared.js
@@ -17,7 +17,6 @@ function parseURL(urlString) {
         return "";
 }
 
-
 function autocomplete(input, list) {
     let currentFocus;
     input.addEventListener("focus", (e) => {
@@ -109,9 +108,6 @@ function autocomplete(input, list) {
 }
 
 
-
-
-
 export default {
     autocompletes,
     parseURL,
diff --git a/src/pages/options/translate.js b/src/pages/options/translate.js
index 4e254446..c6182fc2 100644
--- a/src/pages/options/translate.js
+++ b/src/pages/options/translate.js
@@ -2,7 +2,9 @@ import googleTranslateHelper from "../../assets/javascripts/helpers/google-trans
 
 let disableSimplyTranslateElement = document.getElementById("disable-simplyTranslate");
 
-disableSimplyTranslateElement.checked = !googleTranslateHelper.getDisableSimplyTranslate();
+googleTranslateHelper.init().then(() => {
+    disableSimplyTranslateElement.checked = !googleTranslateHelper.getDisableSimplyTranslate();
+});
 
 disableSimplyTranslateElement.addEventListener("change",
     (event) => googleTranslateHelper.setDisableSimplyTranslate(!event.target.checked)
diff --git a/src/pages/options/twitter.js b/src/pages/options/twitter.js
index 60be6cb0..bf4f6b98 100644
--- a/src/pages/options/twitter.js
+++ b/src/pages/options/twitter.js
@@ -3,8 +3,10 @@ import twitterHelper from "../../assets/javascripts/helpers/twitter.js";
 let removeTwitterSWElement = document.getElementById("remove-twitter-sw");
 let disableNitterElement = document.getElementById("disable-nitter");
 
-disableNitterElement.checked = !twitterHelper.getDisableNitter();
-removeTwitterSWElement.checked = !remove.getRemoveTwitterSW; // Problem
+twitterHelper.init().then(() => {
+    disableNitterElement.checked = !twitterHelper.getDisableNitter();
+    removeTwitterSWElement.checked = !remove.getRemoveTwitterSW; // Problem
+});
 
 disableNitterElement.addEventListener("change",
     (event) => twitterHelper.setDisableNitter(!event.target.checked)
diff --git a/src/pages/options/wikipedia.js b/src/pages/options/wikipedia.js
index b2e7d23c..95ef6406 100644
--- a/src/pages/options/wikipedia.js
+++ b/src/pages/options/wikipedia.js
@@ -2,7 +2,9 @@ import wikipediaHelper from "../../assets/javascripts/helpers/wikipedia.js";
 
 let disableWikipediaElement = document.getElementById("disable-wikipedia");
 
-disableWikipediaElement.checked = !wikipediaHelper.getDisableWikipedia();
+wikipediaHelper.init().then(() => {
+    disableWikipediaElement.checked = !wikipediaHelper.getDisableWikipedia();
+})
 
 disableWikipediaElement.addEventListener("change",
     (event) => wikipediaHelper.setDisableWikipedia(!event.target.checked)
diff --git a/src/pages/options/youtube.js b/src/pages/options/youtube.js
index 95e7d2c9..a05f4c14 100644
--- a/src/pages/options/youtube.js
+++ b/src/pages/options/youtube.js
@@ -19,13 +19,13 @@ youtubeHelper.init().then(() => {
     invidiousDarkModeElement.checked = youtubeHelper.getInvidiousDarkMode();
     persistInvidiousPrefsElement.checked = youtubeHelper.getPersistInvidiousPrefs();
     invidiousVolumeElement.value = youtubeHelper.getInvidiousVolume();
-    invidiousVolumeValueElement.textContent = youtubeHelper.getInvidiousVolume() ? `${youtubeHelper.getInvidiousVolume()}%` : " - ";
-    invidiousPlayerStyleElement.value = youtubeHelper.getInvidiousPlayerStyle() || "";
-    invidiousSubtitlesElement.value = youtubeHelper.getInvidiousSubtitles() || "";
+    invidiousVolumeValueElement.textContent = `${youtubeHelper.getInvidiousVolume()}%`;
+    invidiousPlayerStyleElement.value = youtubeHelper.getInvidiousPlayerStyle();
+    invidiousSubtitlesElement.value = youtubeHelper.getInvidiousSubtitles();
     useFreeTubeElement.checked = youtubeHelper.getUseFreeTube();
     invidiousOnlyEmbeddedVideoElement.checked = youtubeHelper.getInvidiousOnlyEmbeddedVideo();
     invidiousAlwaysProxyElement.checked = youtubeHelper.getInvidiousAlwaysProxy();
-    invidiousVideoQualityElement.value = youtubeHelper.getInvidiousVideoQuality() || "";
+    invidiousVideoQualityElement.value = youtubeHelper.getInvidiousVideoQuality();
     invidiousAutoplayElement.checked = youtubeHelper.getInvidiousAutoplay();
 });
 
@@ -43,11 +43,10 @@ persistInvidiousPrefsElement.addEventListener("change",
 );
 
 invidiousVolumeElement.addEventListener("input",
-    commonHelper.debounce(() => {
+    () => {
         youtubeHelper.setInvidiousVolume(invidiousVolumeElement.value);
-        console.info("youtubeHelper.invidiousVolume:", youtubeHelper.getInvidiousVolume());
         invidiousVolumeValueElement.textContent = `${invidiousVolumeElement.value}%`;
-    }, 1)
+    }
 );
 
 invidiousPlayerStyleElement.addEventListener("change",
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index 5f570774..30587d3e 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -2,6 +2,15 @@
 
 import commonHelper from "../../assets/javascripts/helpers/common.js";
 import data from "../../assets/javascripts/data.js";
+import twitterHelper from "../../assets/javascripts/helpers/twitter.js";
+import youtubeHelper from "../../assets/javascripts/helpers/youtube.js";
+import instagramHelper from "../../assets/javascripts/helpers/instagram.js";
+import mapsHelper from "../../assets/javascripts/helpers/google-maps.js";
+import redditHelper from "../../assets/javascripts/helpers/reddit.js";
+import searchHelper from "../../assets/javascripts/helpers/google-search.js";
+import translateHelper from "../../assets/javascripts/helpers/google-translate.js";
+import wikipediaHelper from "../../assets/javascripts/helpers/wikipedia.js";
+import mediumHelper from "../../assets/javascripts/helpers/medium.js";
 
 let disableNitterElement = document.querySelector("#disable-nitter");
 let disableInvidiousElement = document.querySelector("#disable-invidious");
@@ -29,51 +38,41 @@ disableWikipediaElement.checked = !data.disableWikipedia;
 disableScribeElement.checked = !data.disableScribe;
 
 
-disableNitterElement.addEventListener("change", (event) => {
-  data.disableNitter = !event.target.checked;
-  browser.storage.sync.set({ disableNitter: data.disableNitter });
-});
+disableNitterElement.addEventListener("change",
+  (event) => twitterHelper.setDisableNitter(!event.target.checked)
+);
 
-disableInvidiousElement.addEventListener("change", (event) => {
-  data.disableInvidious = !event.target.checked;
-  browser.storage.sync.set({ disableInvidious: data.disableInvidious });
-});
+disableInvidiousElement.addEventListener("change",
+  (event) => youtubeHelper.setDisableInvidious(!event.target.checked)
+);
 
-disableBibliogramElement.addEventListener("change", (event) => {
-  data.disableBibliogram = !event.target.checked;
-  browser.storage.sync.set({ disableBibliogram: data.disableBibliogram });
-});
+disableBibliogramElement.addEventListener("change",
+  (event) => instagramHelper.setDisableBibliogram(!event.target.checked)
+);
 
-disableOsmElement.addEventListener("change", (event) => {
-  data.disableOsm = !event.target.checked;
-  browser.storage.sync.set({ disableOsm: data.disableOsm });
-});
+disableOsmElement.addEventListener("change",
+  (event) => mapsHelper.setDisableOsm(!event.target.checked)
+);
 
-disableRedditElement.addEventListener("change", (event) => {
-  data.disableReddit = !event.target.checked;
-  browser.storage.sync.set({ disableReddit: data.disableReddit });
-});
+disableRedditElement.addEventListener("change",
+  (event) => redditHelper.setDisableReddit(!event.target.checked)
+);
 
-disableSearchElement.addEventListener("change", (event) => {
-  data.disableSearch = !event.target.checked;
-  console.log("DisableSearch", data.disableSearch)
-  browser.storage.sync.set({ disableSearch: data.disableSearch });
-});
+disableSearchElement.addEventListener("change",
+  (event) => searchHelper.setDisableSearch(!event.target.checked)
+);
 
-disableSimplyTranslateElement.addEventListener("change", (event) => {
-  data.disableSimplyTranslate = !event.target.checked;
-  browser.storage.sync.set({ disableSimplyTranslate: data.disableSimplyTranslate });
-});
+disableSimplyTranslateElement.addEventListener("change",
+  (event) => translateHelper.setDisableSimplyTranslate(!event.target.checked)
+);
 
-disableWikipediaElement.addEventListener("change", (event) => {
-  data.disableWikipedia = !event.target.checked;
-  browser.storage.sync.set({ disableWikipedia: data.disableWikipedia });
-});
+disableWikipediaElement.addEventListener("change",
+  (event) => wikipediaHelper.setDisableWikipedia(!event.target.checked)
+);
 
-disableScribeElement.addEventListener("change", (event) => {
-  data.disableScribe = !event.target.checked;
-  browser.storage.sync.set({ disableScribe: data.disableScribe });
-});
+disableScribeElement.addEventListener("change",
+  (event) => mediumHelper.setDisableScribe(!event.target.checked)
+);
 
 
 document.querySelector("#update-instances").addEventListener("click", () => {