Readded Soju #109. Readded strict_min_version #119. Improved install_chromium README

23 files changed, 48 insertions, 50 deletions

diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index 867f3271..dda0e9a9 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -15,7 +15,7 @@ import pixivHelper from "../../assets/javascripts/helpers/pixiv.js";
 import sendTargetsHelper from "../../assets/javascripts/helpers/sendTargets.js";
 import peertubeHelper from "../../assets/javascripts/helpers/peertube.js";
 import lbryHelper from "../../assets/javascripts/helpers/lbry.js";
-// import spotifyHelper from "../../assets/javascripts/helpers/spotify.js";
+import spotifyHelper from "../../assets/javascripts/helpers/spotify.js";
 import generalHelper from "../../assets/javascripts/helpers/general.js";
 import youtubeMusicHelper from "../../assets/javascripts/helpers/youtubeMusic.js";
 
@@ -38,7 +38,7 @@ async function wholeInit() {
   await sendTargetsHelper.init();
   await peertubeHelper.init();
   await lbryHelper.init();
-  // await spotifyHelper.init();
+  await spotifyHelper.init();
   await generalHelper.init();
 }
 await wholeInit();
@@ -83,7 +83,7 @@ browser.webRequest.onBeforeRequest.addListener(
 
     if (!newUrl) newUrl = lbryHelper.redirect(url, details.type, initiator);
 
-    // if (!newUrl) newUrl = spotifyHelper.redirect(url, details.type, initiator);
+    if (!newUrl) newUrl = spotifyHelper.redirect(url, details.type, initiator);
 
     if (!newUrl) newUrl = translateHelper.redirect(url);
 
@@ -158,7 +158,7 @@ browser.webRequest.onResponseStarted.addListener(
 
       if (!newUrl) newUrl = lbryHelper.switchInstance(url);
 
-      // if (!newUrl) newUrl = spotifyHelper.switchInstance(url);
+      if (!newUrl) newUrl = spotifyHelper.switchInstance(url);
 
       if (newUrl) browser.tabs.update(details.tabId, { url: `/pages/errors/instance_offline.html?url=${encodeURIComponent(newUrl)}` });
 
diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html
index b602036a..98e9fca6 100644
--- a/src/pages/options/general/general.html
+++ b/src/pages/options/general/general.html
@@ -51,10 +51,10 @@
       <img src="../../../assets/images/pixiv-icon.svg" />
       <a href="../pixiv/pixiv.html">Pixiv</a>
     </div>
-    <!-- <div class="title">
+    <div class="title">
       <img src="../../../assets/images/spotify-icon.png" />
       <a href="../spotify/spotify.html">Spotify</a>
-    </div> -->
+    </div>
     <div class="title">
       <img src="../../../assets/images/wikipedia-icon.svg" />
       <a href="../wikipedia/wikipedia.html">Wikipedia</a>
@@ -262,13 +262,13 @@
         </div>
         <input type="checkbox" id="pixiv" />
       </div>
-      <!-- <div>
+      <div>
         <div>
           <img src="../../../assets/images/spotify-icon.png">
           Spotify
         </div>
         <input type="checkbox" id="spotify" />
-      </div> -->
+      </div>
       <div>
         <div>
           <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
diff --git a/src/pages/options/imgur/imgur.html b/src/pages/options/imgur/imgur.html
index b74cfb4f..37b7bda1 100644
--- a/src/pages/options/imgur/imgur.html
+++ b/src/pages/options/imgur/imgur.html
@@ -62,10 +62,10 @@
       <a href="../pixiv/pixiv.html">Pixiv</a>
     </div>
 
-    <!-- <div class="title">
+    <div class="title">
       <img src="../../../assets/images/spotify-icon.png" />
       <a href="../spotify/spotify.html">Spotify</a>
-    </div> -->
+    </div>
 
     <div class="title">
       <img src="../../../assets/images/wikipedia-icon.svg" />
diff --git a/src/pages/options/instagram/instagram.html b/src/pages/options/instagram/instagram.html
index 0f4c352a..51b6c58d 100644
--- a/src/pages/options/instagram/instagram.html
+++ b/src/pages/options/instagram/instagram.html
@@ -53,10 +53,10 @@
       <img src="../../../assets/images/pixiv-icon.svg" />
       <a href="../pixiv/pixiv.html">Pixiv</a>
     </div>
-    <!-- <div class="title">
+    <div class="title">
       <img src="../../../assets/images/spotify-icon.png" />
       <a href="../spotify/spotify.html">Spotify</a>
-    </div> -->
+    </div>
     <div class="title">
       <img src="../../../assets/images/wikipedia-icon.svg" />
       <a href="../wikipedia/wikipedia.html">Wikipedia</a>
diff --git a/src/pages/options/lbry/lbry.html b/src/pages/options/lbry/lbry.html
index a7e826b3..16ea3875 100644
--- a/src/pages/options/lbry/lbry.html
+++ b/src/pages/options/lbry/lbry.html
@@ -52,10 +52,10 @@
       <img src="../../../assets/images/pixiv-icon.svg" />
       <a href="../pixiv/pixiv.html">Pixiv</a>
     </div>
-    <!-- <div class="title">
+    <div class="title">
       <img src="../../../assets/images/spotify-icon.png" />
       <a href="../spotify/spotify.html">Spotify</a>
-    </div> -->
+    </div>
     <div class="title">
       <img src="../../../assets/images/wikipedia-icon.svg" />
       <a href="../wikipedia/wikipedia.html">Wikipedia</a>
diff --git a/src/pages/options/maps/maps.html b/src/pages/options/maps/maps.html
index bbb0009e..6f10c270 100644
--- a/src/pages/options/maps/maps.html
+++ b/src/pages/options/maps/maps.html
@@ -63,10 +63,10 @@
       <a href="../pixiv/pixiv.html">Pixiv</a>
     </div>
 
-    <!-- <div class="title">
+    <div class="title">
       <img src="../../../assets/images/spotify-icon.png" />
       <a href="../spotify/spotify.html">Spotify</a>
-    </div> -->
+    </div>
 
     <div class="title">
       <img src="../../../assets/images/wikipedia-icon.svg" />
diff --git a/src/pages/options/medium/medium.html b/src/pages/options/medium/medium.html
index dd354c03..ee922d17 100644
--- a/src/pages/options/medium/medium.html
+++ b/src/pages/options/medium/medium.html
@@ -62,10 +62,10 @@
       <a href="../pixiv/pixiv.html">Pixiv</a>
     </div>
 
-    <!-- <div class="title">
+    <div class="title">
       <img src="../../../assets/images/spotify-icon.png" />
       <a href="../spotify/spotify.html">Spotify</a>
-    </div> -->
+    </div>
 
     <div class="title">
       <img src="../../../assets/images/wikipedia-icon.svg" />
diff --git a/src/pages/options/peertube/peertube.html b/src/pages/options/peertube/peertube.html
index 99738685..23009d1d 100644
--- a/src/pages/options/peertube/peertube.html
+++ b/src/pages/options/peertube/peertube.html
@@ -62,10 +62,10 @@
       <a href="../pixiv/pixiv.html">Pixiv</a>
     </div>
 
-    <!-- <div class="title">
+    <div class="title">
       <img src="../../../assets/images/spotify-icon.png" />
       <a href="../spotify/spotify.html">Spotify</a>
-    </div> -->
+    </div>
 
     <div class="title">
       <img src="../../../assets/images/wikipedia-icon.svg" />
diff --git a/src/pages/options/pixiv/pixiv.html b/src/pages/options/pixiv/pixiv.html
index 56724a93..8f6630da 100644
--- a/src/pages/options/pixiv/pixiv.html
+++ b/src/pages/options/pixiv/pixiv.html
@@ -62,10 +62,10 @@
       <a href="../pixiv/pixiv.html" class="selected">Pixiv</a>
     </div>
 
-    <!-- <div class="title">
+    <div class="title">
       <img src="../../../assets/images/spotify-icon.png" />
       <a href="../spotify/spotify.html">Spotify</a>
-    </div> -->
+    </div>
 
     <div class="title">
       <img src="../../../assets/images/wikipedia-icon.svg" />
diff --git a/src/pages/options/reddit/reddit.html b/src/pages/options/reddit/reddit.html
index c3c49b3e..57f29b15 100644
--- a/src/pages/options/reddit/reddit.html
+++ b/src/pages/options/reddit/reddit.html
@@ -62,10 +62,10 @@
       <a href="../pixiv/pixiv.html">Pixiv</a>
     </div>
 
-    <!-- <div class="title">
+    <div class="title">
       <img src="../../../assets/images/spotify-icon.png" />
       <a href="../spotify/spotify.html">Spotify</a>
-    </div> -->
+    </div>
 
     <div class="title">
       <img src="../../../assets/images/wikipedia-icon.svg" />
diff --git a/src/pages/options/search/search.html b/src/pages/options/search/search.html
index b0f34af5..613e4d0f 100644
--- a/src/pages/options/search/search.html
+++ b/src/pages/options/search/search.html
@@ -62,10 +62,10 @@
       <a href="../pixiv/pixiv.html">Pixiv</a>
     </div>
 
-    <!-- <div class="title">
+    <div class="title">
       <img src="../../../assets/images/spotify-icon.png" />
       <a href="../spotify/spotify.html">Spotify</a>
-    </div> -->
+    </div>
 
     <div class="title">
       <img src="../../../assets/images/wikipedia-icon.svg" />
diff --git a/src/pages/options/sendTargets/sendTargets.html b/src/pages/options/sendTargets/sendTargets.html
index 235205f0..3431c9a2 100644
--- a/src/pages/options/sendTargets/sendTargets.html
+++ b/src/pages/options/sendTargets/sendTargets.html
@@ -52,10 +52,10 @@
       <img src="../../../assets/images/pixiv-icon.svg" />
       <a href="../pixiv/pixiv.html">Pixiv</a>
     </div>
-    <!-- <div class="title">
+    <div class="title">
       <img src="../../../assets/images/spotify-icon.png" />
       <a href="../spotify/spotify.html">Spotify</a>
-    </div> -->
+    </div>
     <div class="title">
       <img src="../../../assets/images/wikipedia-icon.svg" />
       <a href="../wikipedia/wikipedia.html">Wikipedia</a>
diff --git a/src/pages/options/.spotify/.spotify.html b/src/pages/options/spotify/spotify.html
index e0553743..e0553743 100644
--- a/src/pages/options/.spotify/.spotify.html
+++ b/src/pages/options/spotify/spotify.html
diff --git a/src/pages/options/.spotify/.spotify.js b/src/pages/options/spotify/spotify.js
index 1bd078cb..1bd078cb 100644
--- a/src/pages/options/.spotify/.spotify.js
+++ b/src/pages/options/spotify/spotify.js
diff --git a/src/pages/options/tiktok/tiktok.html b/src/pages/options/tiktok/tiktok.html
index 63935721..05b3417e 100644
--- a/src/pages/options/tiktok/tiktok.html
+++ b/src/pages/options/tiktok/tiktok.html
@@ -61,10 +61,10 @@
       <a href="../pixiv/pixiv.html">Pixiv</a>
     </div>
 
-    <!-- <div class="title">
+    <div class="title">
       <img src="../../../assets/images/spotify-icon.png" />
       <a href="../spotify/spotify.html">Spotify</a>
-    </div> -->
+    </div>
 
     <div class="title">
       <img src="../../../assets/images/wikipedia-icon.svg" />
diff --git a/src/pages/options/translate/translate.html b/src/pages/options/translate/translate.html
index 7e4f3bd5..931ba760 100644
--- a/src/pages/options/translate/translate.html
+++ b/src/pages/options/translate/translate.html
@@ -62,10 +62,10 @@
             <a href="../pixiv/pixiv.html">Pixiv</a>
         </div>
 
-        <!-- <div class="title">
+        <div class="title">
             <img src="../../../assets/images/spotify-icon.png" />
             <a href="../spotify/spotify.html">Spotify</a>
-        </div> -->
+        </div>
 
         <div class="title">
             <img src="../../../assets/images/wikipedia-icon.svg" />
diff --git a/src/pages/options/twitter/twitter.html b/src/pages/options/twitter/twitter.html
index a21b26fb..2e8d0122 100644
--- a/src/pages/options/twitter/twitter.html
+++ b/src/pages/options/twitter/twitter.html
@@ -63,10 +63,10 @@
             <a href="../pixiv/pixiv.html">Pixiv</a>
         </div>
 
-        <!-- <div class="title">
+        <div class="title">
             <img src="../../../assets/images/spotify-icon.png" />
             <a href="../spotify/spotify.html">Spotify</a>
-        </div> -->
+        </div>
 
         <div class="title">
             <img src="../../../assets/images/wikipedia-icon.svg" />
diff --git a/src/pages/options/wikipedia/wikipedia.html b/src/pages/options/wikipedia/wikipedia.html
index 2cea3cd0..21fa9ced 100644
--- a/src/pages/options/wikipedia/wikipedia.html
+++ b/src/pages/options/wikipedia/wikipedia.html
@@ -52,10 +52,10 @@
             <img src="../../../assets/images/pixiv-icon.svg" />
             <a href="../pixiv/pixiv.html">Pixiv</a>
         </div>
-        <!-- <div class="title">
+        <div class="title">
             <img src="../../../assets/images/spotify-icon.png" />
             <a href="../spotify/spotify.html">Spotify</a>
-        </div> -->
+        </div>
         <div class="title">
             <img src="../../../assets/images/wikipedia-icon.svg" />
             <a href="../wikipedia/wikipedia.html" class="selected">Wikipedia</a>
diff --git a/src/pages/options/youtube/piped.js b/src/pages/options/youtube/piped.js
index 876106e2..5f388d6f 100644
--- a/src/pages/options/youtube/piped.js
+++ b/src/pages/options/youtube/piped.js
@@ -198,9 +198,7 @@ youtubeHelper.init().then(() => {
 
     pipedSponsorblockElement.checked = youtubeHelper.getPipedSponsorblock();
     selectSkip = youtubeHelper.getPipedSelectedSkip();
-    console.log("selectSkip", selectSkip)
     pipedSelectedSkipSponsorElement.checked = selectSkip.includes('sponsor');
-    console.log("selectSkip.includes('sponsor')", selectSkip.includes('sponsor'))
     pipedSelectedSkipIntroElement.checked = selectSkip.includes('intro');
     pipedSelectedSkipOutroElement.checked = selectSkip.includes('outro');
     pipedSelectedSkipPreviewElement.checked = selectSkip.includes('preview');
diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html
index d36e8ba1..e2d627c7 100644
--- a/src/pages/options/youtube/youtube.html
+++ b/src/pages/options/youtube/youtube.html
@@ -53,10 +53,10 @@
       <img src="../../../assets/images/pixiv-icon.svg" />
       <a href="../pixiv/pixiv.html">Pixiv</a>
     </div>
-    <!-- <div class="title">
+    <div class="title">
       <img src="../../../assets/images/spotify-icon.png" />
       <a href="../spotify/spotify.html">Spotify</a>
-    </div> -->
+    </div>
     <div class="title">
       <img src="../../../assets/images/wikipedia-icon.svg" />
       <a href="../wikipedia/wikipedia.html">Wikipedia</a>
diff --git a/src/pages/options/youtubeMusic/youtubeMusic.html b/src/pages/options/youtubeMusic/youtubeMusic.html
index 5051b9f0..1993d449 100644
--- a/src/pages/options/youtubeMusic/youtubeMusic.html
+++ b/src/pages/options/youtubeMusic/youtubeMusic.html
@@ -53,10 +53,10 @@
             <img src="../../../assets/images/pixiv-icon.svg" />
             <a href="../pixiv/pixiv.html">Pixiv</a>
         </div>
-        <!-- <div class="title">
+        <div class="title">
             <img src="../../../assets/images/spotify-icon.png" />
             <a href="../spotify/spotify.html">Spotify</a>
-        </div> -->
+        </div>
         <div class="title">
             <img src="../../../assets/images/wikipedia-icon.svg" />
             <a href="../wikipedia/wikipedia.html">Wikipedia</a>
diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html
index bb1195f3..e4d14067 100644
--- a/src/pages/popup/popup.html
+++ b/src/pages/popup/popup.html
@@ -77,13 +77,13 @@
     <input id="disable-pixiv" type="checkbox" checked />
   </div>
 
-  <!-- <div id="spotify" class="some-block">
+  <div id="spotify" class="some-block">
     <a class="title" href="https://spotify.com">
       <img src="../../../assets/images/spotify-icon.png" />
       <h4>Spotify</h4>
     </a>
     <input id="disable-spotify" type="checkbox" checked />
-  </div> -->
+  </div>
 
   <div id="wikipedia" class="some-block">
     <a class="title" href="https://wikipedia.org">
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index 6c9b942c..14f59dfc 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -15,7 +15,7 @@ import mediumHelper from "../../assets/javascripts/helpers/medium.js";
 import imgurHelper from "../../assets/javascripts/helpers/imgur.js";
 import tiktokHelper from "../../assets/javascripts/helpers/tiktok.js";
 import pixivHelper from "../../assets/javascripts/helpers/pixiv.js";
-// import spotifyHelper from "../../assets/javascripts/helpers/spotify.js";
+import spotifyHelper from "../../assets/javascripts/helpers/spotify.js";
 import sendTargetsHelper from "../../assets/javascripts/helpers/sendTargets.js";
 import peertubeHelper from "../../assets/javascripts/helpers/peertube.js";
 import lbryHelper from "../../assets/javascripts/helpers/lbry.js";
@@ -52,7 +52,7 @@ async function wholeInit() {
   await imgurHelper.init();
   await tiktokHelper.init();
   await pixivHelper.init();
-  // await spotifyHelper.init();
+  await spotifyHelper.init();
   await sendTargetsHelper.init();
   await peertubeHelper.init();
   await lbryHelper.init();
@@ -72,7 +72,7 @@ wholeInit().then(() => {
   disableImgurElement.checked = !imgurHelper.getDisable();
   disableTiktokElement.checked = !tiktokHelper.getDisable();
   disablePixivElement.checked = !pixivHelper.getDisable();
-  // disableSpotifyElement.checked = !spotifyHelper.getDisable();
+  disableSpotifyElement.checked = !spotifyHelper.getDisable();
   disableMediumElement.checked = !mediumHelper.getDisable();
   disablePeertubeElement.checked = !peertubeHelper.getDisable();
   disableLbryElement.checked = !lbryHelper.getDisable();
@@ -129,9 +129,9 @@ disablePixivElement.addEventListener("change",
   event => pixivHelper.setDisable(!event.target.checked)
 );
 
-// disableSpotifyElement.addEventListener("change",
-//   event => spotifyHelper.setDisable(!event.target.checked)
-// );
+disableSpotifyElement.addEventListener("change",
+  event => spotifyHelper.setDisable(!event.target.checked)
+);
 
 disableMediumElement.addEventListener("change",
   event => mediumHelper.setDisable(!event.target.checked)