Removed cloudflare instances & disabled YT Music by default #218

3 files changed, 146 insertions, 155 deletions

diff --git a/src/pages/options/youtube/invidious.js b/src/pages/options/youtube/invidious.js
index d314607e..fb1ddff7 100644
--- a/src/pages/options/youtube/invidious.js
+++ b/src/pages/options/youtube/invidious.js
@@ -80,84 +80,82 @@ invidious.addEventListener("change", async _ => {
         invidiousDefaultHome: default_home.value,
         invidiousFeedMenuList: feedMenuList,
       });
-      init();
     }
   )
 });
 
-function init() {
-  browser.storage.local.get(
-    [
-      "youtubeListen",
-      "youtubeVolume",
-      "youtubeAutoplay",
-      "invidiousQuality",
-      "invidiousAlwaysProxy",
-      "invidiousQuality",
-      "invidiousPlayerStyle",
-      "invidiousVideoLoop",
-      "invidiousContinueAutoplay",
-      "invidiousContinue",
-      "invidiousSpeed",
-      "invidiousQualityDash",
-      "invidiousComments",
-      "invidiousCaptions",
-      "invidiousRelatedVideos",
-      "invidiousAnnotations",
-      "invidiousExtendDesc",
-      "invidiousVrMode",
-      "invidiousSavePlayerPos",
-      "invidiousRegion",
-      "invidiousDarkMode",
-      "invidiousThinMode",
-      "invidiousDefaultHome",
-      "invidiousFeedMenuList",
-    ],
-    r => {
-      videoLoop.checked = r.invidiousVideoLoop;
-      autoplay.checked = r.youtubeAutoplay;
-      playerStyle.value = r.invidiousPlayerStyle;
+browser.storage.local.get(
+  [
+    "youtubeListen",
+    "youtubeVolume",
+    "youtubeAutoplay",
+    "invidiousQuality",
+    "invidiousAlwaysProxy",
+    "invidiousQuality",
+    "invidiousPlayerStyle",
+    "invidiousVideoLoop",
+    "invidiousContinueAutoplay",
+    "invidiousContinue",
+    "invidiousSpeed",
+    "invidiousQualityDash",
+    "invidiousComments",
+    "invidiousCaptions",
+    "invidiousRelatedVideos",
+    "invidiousAnnotations",
+    "invidiousExtendDesc",
+    "invidiousVrMode",
+    "invidiousSavePlayerPos",
+    "invidiousRegion",
+    "invidiousDarkMode",
+    "invidiousThinMode",
+    "invidiousDefaultHome",
+    "invidiousFeedMenuList",
+  ],
+  r => {
+    videoLoop.checked = r.invidiousVideoLoop;
+    autoplay.checked = r.youtubeAutoplay;
+    playerStyle.value = r.invidiousPlayerStyle;
 
-      continueAutoplay.checked = r.invidiousContinueAutoplay;
-      invidiousContinue.checked = r.invidiousContinue;
-      alwaysProxy.checked = r.invidiousAlwaysProxy;
-      youtubeListen.checked = r.youtubeListen;
+    continueAutoplay.checked = r.invidiousContinueAutoplay;
+    invidiousContinue.checked = r.invidiousContinue;
+    alwaysProxy.checked = r.invidiousAlwaysProxy;
+    youtubeListen.checked = r.youtubeListen;
 
-      speed.value = r.invidiousSpeed;
-      quality.value = r.invidiousQuality;
-      qualityDash.value = r.invidiousQualityDash;
+    speed.value = r.invidiousSpeed;
+    quality.value = r.invidiousQuality;
+    qualityDash.value = r.invidiousQualityDash;
 
-      volume.value = r.youtubeVolume;
-      volumeValue.textContent = `${r.youtubeVolume}%`;
+    volume.value = r.youtubeVolume;
+    volumeValue.textContent = `${r.youtubeVolume}%`;
 
-      comments0.value = r.invidiousComments[0];
-      comments1.value = r.invidiousComments[1];
+    comments0.value = r.invidiousComments[0];
+    comments1.value = r.invidiousComments[1];
 
-      captions0.value = r.invidiousCaptions[0];
-      captions1.value = r.invidiousCaptions[1];
-      captions2.value = r.invidiousCaptions[2];
+    captions0.value = r.invidiousCaptions[0];
+    captions1.value = r.invidiousCaptions[1];
+    captions2.value = r.invidiousCaptions[2];
 
-      relatedVideo.checked = r.invidiousRelatedVideos;
-      annotations.checked = r.invidiousAnnotations;
-      extendDesc.checked = r.invidiousExtendDesc;
-      vrMode.checked = r.invidiousVrMode;
-      savePlayerPos.checked = r.invidiousSavePlayerPos;
+    relatedVideo.checked = r.invidiousRelatedVideos;
+    annotations.checked = r.invidiousAnnotations;
+    extendDesc.checked = r.invidiousExtendDesc;
+    vrMode.checked = r.invidiousVrMode;
+    savePlayerPos.checked = r.invidiousSavePlayerPos;
 
-      region.value = r.invidiousRegion;
-      darkMode.value = r.invidiousDarkMode;
-      thin_mode.checked = r.invidiousThinMode;
-      default_home.value = r.invidiousDefaultHome;
+    region.value = r.invidiousRegion;
+    darkMode.value = r.invidiousDarkMode;
+    thin_mode.checked = r.invidiousThinMode;
+    default_home.value = r.invidiousDefaultHome;
 
-      feed_menu0.value = r.invidiousFeedMenuList[0];
-      feed_menu1.value = r.invidiousFeedMenuList[1];
+    feed_menu0.value = r.invidiousFeedMenuList[0];
+    feed_menu1.value = r.invidiousFeedMenuList[1];
 
-      commonHelper.processDefaultCustomInstances('invidious', 'normal', youtubeHelper, document);
-      commonHelper.processDefaultCustomInstances('invidious', 'tor', youtubeHelper, document);
-    }
-  )
-}
 
-init();
+  }
+)
+
+commonHelper.processDefaultCustomInstances('youtube', 'invidious', 'normal', document);
+commonHelper.processDefaultCustomInstances('youtube', 'invidious', 'tor', document);
+
 
 let latencyInvidiousElement = document.getElementById("latency-invidious");
 let latencyInvidiousLabel = document.getElementById("latency-invidious-label");
@@ -172,7 +170,7 @@ latencyInvidiousElement.addEventListener("click",
     commonHelper.testLatency(latencyInvidiousLabel, redirects.invidious.normal).then(r => {
       browser.storage.local.set({ invidiousLatency: r });
       latencyInvidiousLabel.innerHTML = oldHtml;
-      commonHelper.processDefaultCustomInstances('invidious', 'normal', youtubeHelper, document);
+      commonHelper.processDefaultCustomInstances('youtube', 'invidious', 'normal', document);
       latencyInvidiousElement.removeEventListener("click", reloadWindow);
     });
   }
diff --git a/src/pages/options/youtube/piped.js b/src/pages/options/youtube/piped.js
index 6e30b8e6..d8ebe2a4 100644
--- a/src/pages/options/youtube/piped.js
+++ b/src/pages/options/youtube/piped.js
@@ -76,65 +76,61 @@ piped.addEventListener("change", async () => {
         youtubeListen: pipedListen.checked,
         pipedSelectedSkip: selectSkip,
     });
-    init();
 });
 
-async function init() {
-    await browser.storage.local.get(
-        [
-            "youtubeVolume",
-            "youtubeAutoplay",
-            "youtubeListen",
+await browser.storage.local.get(
+    [
+        "youtubeVolume",
+        "youtubeAutoplay",
+        "youtubeListen",
 
-            "pipedBufferGoal",
-            "pipedComments",
-            "pipedDisableLBRY",
-            "pipedEnabledCodecs",
-            "pipedHomepage",
-            "pipedMinimizeDescription",
-            "pipedProxyLBRY",
-            "pipedQuality",
-            "pipedRegion",
-            "pipedSelectedSkip",
-            "pipedSponsorblock",
-            "pipedDdlTheme",
-            "pipedWatchHistory",
-        ],
-        r => {
-            pipedSponsorblock.checked = r.pipedSponsorblock;
-            pipedDdlTheme.value = r.pipedDdlTheme;
-            selectSkip = r.pipedSelectedSkip;
-            pipedSelectedSkipSponsor.checked = selectSkip.includes('sponsor');
-            pipedSelectedSkipIntro.checked = selectSkip.includes('intro');
-            pipedSelectedSkipOutro.checked = selectSkip.includes('outro');
-            pipedSelectedSkipPreview.checked = selectSkip.includes('preview');
-            autoplay.checked = r.youtubeAutoplay;
-            pipedSelectedSkipInteraction.checked = selectSkip.includes('interaction');
-            pipedSelectedSkipSelfpromo.checked = selectSkip.includes('selfpromo');
-            pipedSelectedSkipMusicOfftopic.checked = selectSkip.includes('music_offtopic');
-            pipedSelectedSkipPoiHighlight.checked = selectSkip.includes('poi_highlight');
-            pipedSelectedSkipFiller.checked = selectSkip.includes('filler');
-            pipedListen.checked = r.youtubeListen;
-            pipedQuality.value = r.pipedQuality;
-            pipedBufferGoal.value = r.pipedBufferGoal;
-            pipedRegion.value = r.pipedRegion;
-            pipedHomepage.value = r.pipedHomepage;
-            pipedComments.checked = r.pipedComments;
-            pipedMinimizeDescription.checked = r.pipedMinimizeDescription;
-            pipedWatchHistory.checked = r.pipedWatchHistory;
-            pipedEnabledCodecs.value = r.pipedEnabledCodecs;
-            pipedDisableLBRY.checked = r.pipedDisableLBRY;
-            pipedProxyLBRY.checked = r.pipedProxyLBRY;
+        "pipedBufferGoal",
+        "pipedComments",
+        "pipedDisableLBRY",
+        "pipedEnabledCodecs",
+        "pipedHomepage",
+        "pipedMinimizeDescription",
+        "pipedProxyLBRY",
+        "pipedQuality",
+        "pipedRegion",
+        "pipedSelectedSkip",
+        "pipedSponsorblock",
+        "pipedDdlTheme",
+        "pipedWatchHistory",
+    ],
+    r => {
+        pipedSponsorblock.checked = r.pipedSponsorblock;
+        pipedDdlTheme.value = r.pipedDdlTheme;
+        selectSkip = r.pipedSelectedSkip;
+        pipedSelectedSkipSponsor.checked = selectSkip.includes('sponsor');
+        pipedSelectedSkipIntro.checked = selectSkip.includes('intro');
+        pipedSelectedSkipOutro.checked = selectSkip.includes('outro');
+        pipedSelectedSkipPreview.checked = selectSkip.includes('preview');
+        autoplay.checked = r.youtubeAutoplay;
+        pipedSelectedSkipInteraction.checked = selectSkip.includes('interaction');
+        pipedSelectedSkipSelfpromo.checked = selectSkip.includes('selfpromo');
+        pipedSelectedSkipMusicOfftopic.checked = selectSkip.includes('music_offtopic');
+        pipedSelectedSkipPoiHighlight.checked = selectSkip.includes('poi_highlight');
+        pipedSelectedSkipFiller.checked = selectSkip.includes('filler');
+        pipedListen.checked = r.youtubeListen;
+        pipedQuality.value = r.pipedQuality;
+        pipedBufferGoal.value = r.pipedBufferGoal;
+        pipedRegion.value = r.pipedRegion;
+        pipedHomepage.value = r.pipedHomepage;
+        pipedComments.checked = r.pipedComments;
+        pipedMinimizeDescription.checked = r.pipedMinimizeDescription;
+        pipedWatchHistory.checked = r.pipedWatchHistory;
+        pipedEnabledCodecs.value = r.pipedEnabledCodecs;
+        pipedDisableLBRY.checked = r.pipedDisableLBRY;
+        pipedProxyLBRY.checked = r.pipedProxyLBRY;
 
-            volume.value = r.youtubeVolume;
-            volumeValue.textContent = `${r.youtubeVolume}%`;
+        volume.value = r.youtubeVolume;
+        volumeValue.textContent = `${r.youtubeVolume}%`;
+    }
+);
 
-            commonHelper.processDefaultCustomInstances('piped', 'normal', youtubeHelper, document);
-            commonHelper.processDefaultCustomInstances('piped', 'tor', youtubeHelper, document);
-        }
-    );
-}
-init();
+commonHelper.processDefaultCustomInstances('youtube', 'piped', 'normal', document);
+commonHelper.processDefaultCustomInstances('youtube', 'piped', 'tor', document);
 
 let latencyPipedElement = document.getElementById("latency-piped");
 let latencyPipedLabel = document.getElementById("latency-piped-label");
@@ -149,7 +145,7 @@ latencyPipedElement.addEventListener("click",
         commonHelper.testLatency(latencyPipedLabel, redirects.piped.normal).then(r => {
             browser.storage.local.set({ pipedLatency: r });
             latencyPipedLabel.innerHTML = oldHtml;
-            commonHelper.processDefaultCustomInstances('piped', 'normal', youtubeHelper, document);
+            commonHelper.processDefaultCustomInstances('youtube', 'piped', 'normal', document);
             latencyPipedElement.removeEventListener("click", reloadWindow);
         });
     }
diff --git a/src/pages/options/youtube/pipedMaterial.js b/src/pages/options/youtube/pipedMaterial.js
index 7c647b18..3dc0e677 100644
--- a/src/pages/options/youtube/pipedMaterial.js
+++ b/src/pages/options/youtube/pipedMaterial.js
@@ -67,46 +67,43 @@ pipedMaterialElement.addEventListener("change", async () => {
     init();
 });
 
-function init() {
-    browser.storage.local.get(
-        [
-            "youtubeAutoplay",
-            "youtubeVolume",
-            "youtubeListen",
+browser.storage.local.get(
+    [
+        "youtubeAutoplay",
+        "youtubeVolume",
+        "youtubeListen",
 
-            "pipedDisableLBRY",
-            "pipedProxyLBRY",
-            "pipedSelectedSkip",
-            "pipedSponsorblock",
+        "pipedDisableLBRY",
+        "pipedProxyLBRY",
+        "pipedSelectedSkip",
+        "pipedSponsorblock",
 
-            "pipedMaterialSkipToLastPoint",
-        ],
-        r => {
-            autoplayElement.checked = r.youtubeAutoplay;
+        "pipedMaterialSkipToLastPoint",
+    ],
+    r => {
+        autoplayElement.checked = r.youtubeAutoplay;
 
-            listenElement.checked = r.youtubeListen;
-            disableLBRYElement.checked = r.pipedDisableLBRY;
-            proxyLBRYElement.checked = r.pipedProxyLBRY;
-            sponsorblockElement.checked = r.pipedSponsorblock;
-            skipToLastPointElement.checked = r.pipedMaterialSkipToLastPoint;
+        listenElement.checked = r.youtubeListen;
+        disableLBRYElement.checked = r.pipedDisableLBRY;
+        proxyLBRYElement.checked = r.pipedProxyLBRY;
+        sponsorblockElement.checked = r.pipedSponsorblock;
+        skipToLastPointElement.checked = r.pipedMaterialSkipToLastPoint;
 
-            selectSkip = r.pipedSelectedSkip;
-            selectedSkipSponsorElement.checked = selectSkip.includes('sponsors');
-            selectedSkipIntroElement.checked = selectSkip.includes('intro');
-            selectedSkipOutroElement.checked = selectSkip.includes('outro');
-            selectedSkipPreviewElement.checked = selectSkip.includes('preview');
-            selectedSkipInteractionElement.checked = selectSkip.includes('interaction');
-            selectedSkipSelfpromoElement.checked = selectSkip.includes('selfpromo');
-            selectedSkipMusicOfftopicElement.checked = selectSkip.includes('music_offtopic');
+        selectSkip = r.pipedSelectedSkip;
+        selectedSkipSponsorElement.checked = selectSkip.includes('sponsors');
+        selectedSkipIntroElement.checked = selectSkip.includes('intro');
+        selectedSkipOutroElement.checked = selectSkip.includes('outro');
+        selectedSkipPreviewElement.checked = selectSkip.includes('preview');
+        selectedSkipInteractionElement.checked = selectSkip.includes('interaction');
+        selectedSkipSelfpromoElement.checked = selectSkip.includes('selfpromo');
+        selectedSkipMusicOfftopicElement.checked = selectSkip.includes('music_offtopic');
 
-            volumeElement.value = r.youtubeVolume;
-            volumeValueElement.textContent = `${r.youtubeVolume}%`;
+        volumeElement.value = r.youtubeVolume;
+        volumeValueElement.textContent = `${r.youtubeVolume}%`;
+    });
 
-            commonHelper.processDefaultCustomInstances('pipedMaterial', 'normal', youtubeHelper, document);
-            commonHelper.processDefaultCustomInstances('pipedMaterial', 'tor', youtubeHelper, document);
-        });
-}
-init();
+commonHelper.processDefaultCustomInstances('youtube' ,'pipedMaterial', 'normal',  document);
+commonHelper.processDefaultCustomInstances('youtube' ,'pipedMaterial', 'tor',  document);
 
 let latencyPipedMaterialElement = document.getElementById("latency-pipedMaterial");
 let latencyPipedMaterialLabel = document.getElementById("latency-pipedMaterial-label");
@@ -121,7 +118,7 @@ latencyPipedMaterialElement.addEventListener("click",
         commonHelper.testLatency(latencyPipedMaterialLabel, redirects.pipedMaterial.normal).then(r => {
             browser.storage.local.set({ pipedMaterialLatency: r });
             latencyPipedMaterialLabel.innerHTML = oldHtml;
-            commonHelper.processDefaultCustomInstances('pipedMaterial', 'normal', youtubeHelper, document);
+            commonHelper.processDefaultCustomInstances('youtube' ,'pipedMaterial', 'normal',  document);
             latencyPipedMaterialElement.removeEventListener("click", reloadWindow);
         });
     }