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

2 files changed, 9 insertions, 95 deletions

diff --git a/src/pages/options/spotify/spotify.html b/src/pages/options/spotify/spotify.html
index 0496875a..03a1ca9e 100644
--- a/src/pages/options/spotify/spotify.html
+++ b/src/pages/options/spotify/spotify.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 class="selected" 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>
@@ -62,13 +61,6 @@
       <h4 data-localise="__MSG_enable__">Enable</h4>
       <input id="disable-spotify" type="checkbox">
     </div>
-    <div class="some-block option-block">
-      <h4 data-localise="__MSG_protocol__">Protocol</h4>
-      <select id="protocol">
-        <option value="normal" data-localise="__MSG_normal__">Normal</option>
-        <option value="tor" data-localise="__MSG_tor__">Tor</option>
-      </select>
-    </div>
     <div id="soju">
       <hr>
       <div class="normal">
@@ -99,27 +91,6 @@
                 </label>
                 <input class="button button-inline" id="latency" style="display:none;">
       </div>
-      <div class="tor">
-                <div class="some-block option-block">
-                  <h4 data-localise="__MSG_defaultInstances__">Default Instances</h4>
-                </div>
-                <div class="checklist"></div>
-                <hr>
-                <div class="some-block option-block">
-                  <h4 data-localise="__MSG_customInstances__">Custom Instances</h4>
-                </div>
-                <form class="custom-instance-form">
-                  <div class="some-block option-block">
-                    <input class="custom-instance" placeholder="https://soju.onion" type="url">
-                    <button class="add add-instance" type="submit">
-                      <svg xmlns="https://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor">
-                        <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path>
-                      </svg>
-                    </button>
-                  </div>
-                </form>
-                <div class="checklist custom-checklist"></div>
-      </div>
       <script type="module" src="../init.js"></script>
       <script type="module" src="./spotify.js"></script>
     </div>
diff --git a/src/pages/options/spotify/spotify.js b/src/pages/options/spotify/spotify.js
index d158412d..33cc9e91 100644
--- a/src/pages/options/spotify/spotify.js
+++ b/src/pages/options/spotify/spotify.js
@@ -2,64 +2,17 @@ import spotifyHelper from "../../../assets/javascripts/helpers/spotify.js";
 import commonHelper from "../../../assets/javascripts/helpers/common.js";
 
 let disableSpotifyElement = document.getElementById("disable-spotify");
-disableSpotifyElement.addEventListener("change",
-    (event) => spotifyHelper.setDisable(!event.target.checked)
-);
 
-let protocolElement = document.getElementById("protocol")
-protocolElement.addEventListener("change",
-    (event) => {
-        let protocol = event.target.options[protocolElement.selectedIndex].value
-        spotifyHelper.setProtocol(protocol);
-        changeProtocolSettings(protocol);
+browser.storage.local.get(
+    [
+        "disableSpotifyTargets",
+    ],
+    r => {
+        disableSpotifyElement.checked = !r.disableSpotifyTargets;
     }
-);
+)
 
-function changeProtocolSettings(protocol) {
-    let normalDiv = document.getElementsByClassName("normal")[0];
-    let torDiv = document.getElementsByClassName("tor")[0];
-    if (protocol == 'normal') {
-        normalDiv.style.display = 'block';
-        torDiv.style.display = 'none';
-    }
-    else if (protocol == 'tor') {
-        normalDiv.style.display = 'none';
-        torDiv.style.display = 'block';
-    }
-}
-
-spotifyHelper.init().then(() => {
-    disableSpotifyElement.checked = !spotifyHelper.getDisable();
-
-    let protocol = spotifyHelper.getProtocol();
-    protocolElement.value = protocol;
-    changeProtocolSettings(protocol);
-
-    browser.storage.local.get("sojuLatency").then(r => {
-        commonHelper.processDefaultCustomInstances(
-            'soju',
-            'normal',
-            spotifyHelper,
-            document,
-            spotifyHelper.getSojuNormalRedirectsChecks,
-            spotifyHelper.setSojuNormalRedirectsChecks,
-            spotifyHelper.getSojuNormalCustomRedirects,
-            spotifyHelper.setSojuNormalCustomRedirects,
-            r.sojuLatency,
-        );
-    })
-
-    commonHelper.processDefaultCustomInstances(
-        'soju',
-        'tor',
-        spotifyHelper,
-        document,
-        spotifyHelper.getSojuTorRedirectsChecks,
-        spotifyHelper.setSojuTorRedirectsChecks,
-        spotifyHelper.getSojuTorCustomRedirects,
-        spotifyHelper.setSojuTorCustomRedirects
-    )
-})
+commonHelper.processDefaultCustomInstances('soju', 'normal', spotifyHelper, document);
 
 let latencyElement = document.getElementById("latency");
 let latencyLabel = document.getElementById("latency-label");
@@ -74,17 +27,7 @@ latencyElement.addEventListener("click",
         commonHelper.testLatency(latencyLabel, redirects.soju.normal).then(r => {
             browser.storage.local.set({ sojuLatency: r });
             latencyLabel.innerHTML = oldHtml;
-            commonHelper.processDefaultCustomInstances(
-                'soju',
-                'normal',
-                spotifyHelper,
-                document,
-                spotifyHelper.getSojuNormalRedirectsChecks,
-                spotifyHelper.setSojuNormalRedirectsChecks,
-                spotifyHelper.getSojuNormalCustomRedirects,
-                spotifyHelper.setSojuNormalCustomRedirects,
-                r,
-            )
+            commonHelper.processDefaultCustomInstances('soju', 'normal', spotifyHelper, document)
             latencyElement.removeEventListener("click", reloadWindow)
         });
     }