2 files changed, 19 insertions, 50 deletions

diff --git a/src/pages/options/lbry/lbry.html b/src/pages/options/lbry/lbry.html
index d5d459f7..4b6033aa 100644
--- a/src/pages/options/lbry/lbry.html
+++ b/src/pages/options/lbry/lbry.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/lbry/lbry.js b/src/pages/options/lbry/lbry.js
index 4511373c..3ab04369 100644
--- a/src/pages/options/lbry/lbry.js
+++ b/src/pages/options/lbry/lbry.js
@@ -2,18 +2,15 @@ import lbryHelper from "../../../assets/javascripts/helpers/lbry.js";
 import commonHelper from "../../../assets/javascripts/helpers/common.js";
 
 let disableLbryElement = document.getElementById("disable-lbry");
-disableLbryElement.addEventListener("change",
-    (event) => lbryHelper.setDisable(!event.target.checked)
-);
-
 let protocolElement = document.getElementById("protocol")
-protocolElement.addEventListener("change",
-    event => {
-        let protocol = event.target.options[protocolElement.selectedIndex].value
-        lbryHelper.setProtocol(protocol);
-        changeProtocolSettings(protocol);
-    }
-);
+
+document.addEventListener("change", async () => {
+    await browser.storage.local.set({
+        disableLbryTargets: !lbryHelper.checked,
+        lbryTargetsProtocol: protocolElement.value,
+    });
+    changeProtocolSettings(protocolElement.value)
+})
 
 function changeProtocolSettings(protocol) {
     let normalDiv = document.getElementsByClassName("normal")[0];
@@ -28,37 +25,20 @@ function changeProtocolSettings(protocol) {
     }
 }
 
-lbryHelper.init().then(() => {
-    disableLbryElement.checked = !lbryHelper.getDisable();
+browser.storage.local.get(
+    [
+        "disableLbryTargets",
+        "lbryTargetsProtocol"
+    ],
+    r => {
+    disableLbryElement.checked = !r.disableLbryTargets;
 
-    let protocol = lbryHelper.getProtocol();
+    let protocol = r.lbryTargetsProtocol;
     protocolElement.value = protocol;
     changeProtocolSettings(protocol);
 
-    browser.storage.local.get("librarianLatency").then(r => {
-        commonHelper.processDefaultCustomInstances(
-            'librarian',
-            'normal',
-            lbryHelper,
-            document,
-            lbryHelper.getLibrarianNormalRedirectsChecks,
-            lbryHelper.setLibrarianNormalRedirectsChecks,
-            lbryHelper.getLibrarianNormalCustomRedirects,
-            lbryHelper.setLibrarianNormalCustomRedirects,
-            r.librarianLatency,
-        );
-    })
-
-    commonHelper.processDefaultCustomInstances(
-        'librarian',
-        'tor',
-        lbryHelper,
-        document,
-        lbryHelper.getLibrarianTorRedirectsChecks,
-        lbryHelper.setLibrarianTorRedirectsChecks,
-        lbryHelper.getLibrarianTorCustomRedirects,
-        lbryHelper.setLibrarianTorCustomRedirects
-    )
+    commonHelper.processDefaultCustomInstances('librarian', 'normal', lbryHelper, document);
+    commonHelper.processDefaultCustomInstances('librarian', 'tor', lbryHelper, document)
 })
 
 
@@ -75,17 +55,7 @@ latencyElement.addEventListener("click",
         commonHelper.testLatency(latencyLabel, redirects.librarian.normal).then(r => {
             browser.storage.local.set({ librarianLatency: r });
             latencyLabel.innerHTML = oldHtml;
-            commonHelper.processDefaultCustomInstances(
-                'librarian',
-                'normal',
-                lbryHelper,
-                document,
-                lbryHelper.getLibrarianNormalRedirectsChecks,
-                lbryHelper.setLibrarianNormalRedirectsChecks,
-                lbryHelper.getLibrarianNormalCustomRedirects,
-                lbryHelper.setLibrarianNormalCustomRedirects,
-                r,
-            );
+            commonHelper.processDefaultCustomInstances('librarian', 'normal', lbryHelper, document);
             latencyElement.removeEventListener("click", reloadWindow);
         });
     }