Simplified code. Removed pixivMoe, old.reddit.com #239

2 files changed, 52 insertions, 65 deletions

diff --git a/src/pages/options/twitter/twitter.html b/src/pages/options/twitter/twitter.html
index d7b14abf..d553d72c 100644
--- a/src/pages/options/twitter/twitter.html
+++ b/src/pages/options/twitter/twitter.html
@@ -23,7 +23,6 @@
       <div class="title"> <img src="../../../assets/images/tiktok-icon.png"><a href="../tiktok/tiktok.html" data-localise="__MSG_tiktok__">TikTok</a></div>
       <div class="title"> <img src="../../../assets/images/reddit-icon.png"><a href="../reddit/reddit.html" data-localise="__MSG_reddit__">Reddit</a></div>
       <div class="title"> <img src="../../../assets/images/imgur-icon.png"><a href="../imgur/imgur.html" data-localise="__MSG_imgur__">Imgur</a></div>
-      <div class="title"> <img src="../../../assets/images/pixiv-icon.svg"><a href="../pixiv/pixiv.html" data-localise="__MSG_pixiv__">Pixiv</a></div>
       <div class="title"> <img src="../../../assets/images/librespeed-icon.svg"><a href="../speedtest/speedtest.html" data-localise="__MSG_speedtest__">Speedtest</a></div>
       <div class="title"> <img src="../../../assets/images/spotify-icon.png"><a href="../spotify/spotify.html" data-localise="__MSG_spotify__">Spotify</a></div>
       <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg"><a href="../wikipedia/wikipedia.html" data-localise="__MSG_wikipedia__">Wikipedia</a></div>
diff --git a/src/pages/options/twitter/twitter.js b/src/pages/options/twitter/twitter.js
index bd611497..b77f5ecc 100644
--- a/src/pages/options/twitter/twitter.js
+++ b/src/pages/options/twitter/twitter.js
@@ -21,8 +21,56 @@ let hlsPlayback = document.getElementById('nitter').getElementsByClassName('hlsP
 let proxyVideos = document.getElementById('nitter').getElementsByClassName('proxyVideos')[0];
 let muteVideos = document.getElementById('nitter').getElementsByClassName('muteVideos')[0];
 let autoplayGifs = document.getElementById('nitter').getElementsByClassName('autoplayGifs')[0];
-
 let nitterElement = document.getElementById("nitter");
+
+browser.storage.local.get(
+    [
+        "disableTwitter",
+        "twitterProtocol",
+        "enableTwitterCustomSettings",
+        "bypassWatchOnTwitter",
+        "nitterTheme",
+        "nitterInfiniteScroll",
+        "nitterStickyProfile",
+        "nitterBidiSupport",
+        "nitterHideTweetStats",
+        "nitterHideBanner",
+        "nitterHidePins",
+        "nitterHideReplies",
+        "nitterSquareAvatars",
+        "nitterMp4Playback",
+        "nitterHlsPlayback",
+        "nitterProxyVideos",
+        "nitterMuteVideos",
+        "nitterAutoplayGifs",
+    ],
+    r => {
+        disableTwitterElement.checked = !r.disableTwitter;
+        enableYoutubeCustomSettingsElement.checked = r.enableTwitterCustomSettings;
+        bypassWatchOnTwitterElement.checked = r.bypassWatchOnTwitter;
+        protocolElement.value = r.twitterProtocol;
+        changeProtocolSettings(r.twitterProtocol);
+        
+        // Display
+        theme.value = r.nitterTheme;
+        infiniteScroll.checked = r.nitterInfiniteScroll;
+        stickyProfile.checked = r.nitterStickyProfile;
+        bidiSupport.checked = r.nitterBidiSupport;
+        hideTweetStats.checked = r.nitterHideTweetStats;
+        hideBanner.checked = r.nitterHideBanner;
+        hidePins.checked = r.nitterHidePins;
+        hideReplies.checked = r.nitterHideReplies;
+        squareAvatars.checked = r.nitterSquareAvatars;
+        
+        // Media
+        mp4Playback.checked = r.nitterMp4Playback;
+        hlsPlayback.checked = r.nitterHlsPlayback;
+        proxyVideos.checked = r.nitterProxyVideos;
+        muteVideos.checked = r.nitterMuteVideos;
+        autoplayGifs.checked = r.nitterAutoplayGifs;
+    }
+)
+
 document.addEventListener("change", async () => {
     await browser.storage.local.set({
         disableTwitter: !disableTwitterElement.checked,
@@ -68,58 +116,8 @@ function changeProtocolSettings(protocol) {
         for (const item of customSettingsDivElement) item.style.display = 'none';
 }
 
-function init() {
-    twitterHelper.init().then(() => {
-        disableTwitterElement.checked = !twitterHelper.getDisable();
-        enableYoutubeCustomSettingsElement.checked = twitterHelper.getEnableCustomSettings();
-        bypassWatchOnTwitterElement.checked = twitterHelper.getBypassWatchOnTwitter();
-
-        let protocol = twitterHelper.getProtocol();
-        protocolElement.value = protocol;
-        changeProtocolSettings(protocol);
-        theme.value = twitterHelper.getTheme();
-        infiniteScroll.checked = twitterHelper.getInfiniteScroll();
-        stickyProfile.checked = twitterHelper.getStickyProfile();
-        bidiSupport.checked = twitterHelper.getBidiSupport();
-        hideTweetStats.checked = twitterHelper.getHideTweetStats();
-        hideBanner.checked = twitterHelper.getHideBanner();
-        hidePins.checked = twitterHelper.getHidePins();
-        hideReplies.checked = twitterHelper.getHideReplies();
-        squareAvatars.checked = twitterHelper.getSquareAvatars();
-        mp4Playback.checked = twitterHelper.getMp4Playback();
-        hlsPlayback.checked = twitterHelper.getHlsPlayback();
-        proxyVideos.checked = twitterHelper.getProxyVideos();
-        muteVideos.checked = twitterHelper.getMuteVideos();
-        autoplayGifs.checked = twitterHelper.getAutoplayGifs();
-
-        browser.storage.local.get("nitterLatency").then(r => {
-            commonHelper.processDefaultCustomInstances(
-                'nitter',
-                'normal',
-                twitterHelper,
-                document,
-                twitterHelper.getNitterNormalRedirectsChecks,
-                twitterHelper.setNitterNormalRedirectsChecks,
-                twitterHelper.getNitterNormalCustomRedirects,
-                twitterHelper.setNitterNormalCustomRedirects,
-                r.nitterLatency,
-            );
-        });
-
-        commonHelper.processDefaultCustomInstances(
-            'nitter',
-            'tor',
-            twitterHelper,
-            document,
-            twitterHelper.getNitterTorRedirectsChecks,
-            twitterHelper.setNitterTorRedirectsChecks,
-            twitterHelper.getNitterTorCustomRedirects,
-            twitterHelper.setNitterTorCustomRedirects
-        )
-    });
-}
-init();
-
+// commonHelper.processDefaultCustomInstances('nitter', 'normal', twitterHelper, document);
+// commonHelper.processDefaultCustomInstances('nitter', 'tor', twitterHelper, document)
 window.onblur = twitterHelper.initNitterCookies;
 
 let latencyElement = document.getElementById("latency");
@@ -135,17 +133,7 @@ latencyElement.addEventListener("click",
         commonHelper.testLatency(latencyLabel, redirects.nitter.normal).then(r => {
             browser.storage.local.set({ nitterLatency: r });
             latencyLabel.innerHTML = oldHtml;
-            commonHelper.processDefaultCustomInstances(
-                'nitter',
-                'normal',
-                twitterHelper,
-                document,
-                twitterHelper.getNitterNormalRedirectsChecks,
-                twitterHelper.setNitterNormalRedirectsChecks,
-                twitterHelper.getNitterNormalCustomRedirects,
-                twitterHelper.setNitterNormalCustomRedirects,
-                r,
-            )
+            commonHelper.processDefaultCustomInstances('nitter', 'normal', twitterHelper, document)
             latencyElement.removeEventListener("click", reloadWindow)
         });
     }