From 439c9e49c46743d900329df71569b074db743709 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Thu, 17 Mar 2022 10:58:05 +0300 Subject: [PATCH] Disabled soju in code as you can access songs through embeds #109 --- .../javascripts/helpers/{spotify.js => .spotify.js} | 0 src/assets/javascripts/helpers/general.js | 2 +- src/pages/background/background.js | 8 ++++---- .../{spotify/spotify.html => .spotify/.spotify.html} | 0 .../{spotify/spotify.js => .spotify/.spotify.js} | 0 src/pages/options/general/general.html | 8 ++++---- src/pages/options/imgur/imgur.html | 4 ++-- src/pages/options/instagram/instagram.html | 4 ++-- src/pages/options/lbry/lbry.html | 4 ++-- src/pages/options/maps/maps.html | 4 ++-- src/pages/options/medium/medium.html | 4 ++-- src/pages/options/peertube/peertube.html | 4 ++-- src/pages/options/pixiv/pixiv.html | 4 ++-- src/pages/options/reddit/reddit.html | 4 ++-- src/pages/options/search/search.html | 4 ++-- src/pages/options/sendTargets/sendTargets.html | 4 ++-- src/pages/options/tiktok/tiktok.html | 4 ++-- src/pages/options/translate/translate.html | 4 ++-- src/pages/options/twitter/twitter.html | 4 ++-- src/pages/options/wikipedia/wikipedia.html | 4 ++-- src/pages/options/youtube/youtube.html | 4 ++-- src/pages/options/youtubeMusic/youtubeMusic.html | 4 ++-- src/pages/popup/popup.html | 4 ++-- src/pages/popup/popup.js | 12 ++++++------ 24 files changed, 49 insertions(+), 49 deletions(-) rename src/assets/javascripts/helpers/{spotify.js => .spotify.js} (100%) rename src/pages/options/{spotify/spotify.html => .spotify/.spotify.html} (100%) rename src/pages/options/{spotify/spotify.js => .spotify/.spotify.js} (100%) diff --git a/src/assets/javascripts/helpers/spotify.js b/src/assets/javascripts/helpers/.spotify.js similarity index 100% rename from src/assets/javascripts/helpers/spotify.js rename to src/assets/javascripts/helpers/.spotify.js diff --git a/src/assets/javascripts/helpers/general.js b/src/assets/javascripts/helpers/general.js index 67c8b57..496b183 100644 --- a/src/assets/javascripts/helpers/general.js +++ b/src/assets/javascripts/helpers/general.js @@ -112,7 +112,7 @@ let allPopupFrontends = [ "imgur", "reddit", "pixiv", - "spotify", + // "spotify", "search", "translate", "maps", diff --git a/src/pages/background/background.js b/src/pages/background/background.js index c6d8cf0..d148887 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); @@ -157,7 +157,7 @@ browser.webRequest.onResponseStarted.addListener( if (!newUrl) newUrl = lbryHelper.changeInstance(url); - if (!newUrl) newUrl = spotifyHelper.changeInstance(url); + // if (!newUrl) newUrl = spotifyHelper.changeInstance(url); if (newUrl) { browser.tabs.update({ url: '/pages/errors/instance_offline.html' }); diff --git a/src/pages/options/spotify/spotify.html b/src/pages/options/.spotify/.spotify.html similarity index 100% rename from src/pages/options/spotify/spotify.html rename to src/pages/options/.spotify/.spotify.html diff --git a/src/pages/options/spotify/spotify.js b/src/pages/options/.spotify/.spotify.js similarity index 100% rename from src/pages/options/spotify/spotify.js rename to src/pages/options/.spotify/.spotify.js diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html index 98e9fca..b602036 100644 --- a/src/pages/options/general/general.html +++ b/src/pages/options/general/general.html @@ -51,10 +51,10 @@ Pixiv -
+
Wikipedia @@ -262,13 +262,13 @@
-
+
diff --git a/src/pages/options/imgur/imgur.html b/src/pages/options/imgur/imgur.html index 37b7bda..b74cfb4 100644 --- a/src/pages/options/imgur/imgur.html +++ b/src/pages/options/imgur/imgur.html @@ -62,10 +62,10 @@ Pixiv
-
+
diff --git a/src/pages/options/instagram/instagram.html b/src/pages/options/instagram/instagram.html index 51b6c58..0f4c352 100644 --- a/src/pages/options/instagram/instagram.html +++ b/src/pages/options/instagram/instagram.html @@ -53,10 +53,10 @@ Pixiv
-
+
Wikipedia diff --git a/src/pages/options/lbry/lbry.html b/src/pages/options/lbry/lbry.html index 16ea387..a7e826b 100644 --- a/src/pages/options/lbry/lbry.html +++ b/src/pages/options/lbry/lbry.html @@ -52,10 +52,10 @@ Pixiv
-
+
Wikipedia diff --git a/src/pages/options/maps/maps.html b/src/pages/options/maps/maps.html index 6f10c27..bbb0009 100644 --- a/src/pages/options/maps/maps.html +++ b/src/pages/options/maps/maps.html @@ -63,10 +63,10 @@ Pixiv
-
+
diff --git a/src/pages/options/medium/medium.html b/src/pages/options/medium/medium.html index ee922d1..dd354c0 100644 --- a/src/pages/options/medium/medium.html +++ b/src/pages/options/medium/medium.html @@ -62,10 +62,10 @@ Pixiv
-
+
diff --git a/src/pages/options/peertube/peertube.html b/src/pages/options/peertube/peertube.html index 23009d1..9973868 100644 --- a/src/pages/options/peertube/peertube.html +++ b/src/pages/options/peertube/peertube.html @@ -62,10 +62,10 @@ Pixiv
-
+
diff --git a/src/pages/options/pixiv/pixiv.html b/src/pages/options/pixiv/pixiv.html index 8f6630d..56724a9 100644 --- a/src/pages/options/pixiv/pixiv.html +++ b/src/pages/options/pixiv/pixiv.html @@ -62,10 +62,10 @@ Pixiv
-
+
diff --git a/src/pages/options/reddit/reddit.html b/src/pages/options/reddit/reddit.html index 57f29b1..c3c49b3 100644 --- a/src/pages/options/reddit/reddit.html +++ b/src/pages/options/reddit/reddit.html @@ -62,10 +62,10 @@ Pixiv
-
+
diff --git a/src/pages/options/search/search.html b/src/pages/options/search/search.html index 613e4d0..b0f34af 100644 --- a/src/pages/options/search/search.html +++ b/src/pages/options/search/search.html @@ -62,10 +62,10 @@ Pixiv
-
+
diff --git a/src/pages/options/sendTargets/sendTargets.html b/src/pages/options/sendTargets/sendTargets.html index 3431c9a..235205f 100644 --- a/src/pages/options/sendTargets/sendTargets.html +++ b/src/pages/options/sendTargets/sendTargets.html @@ -52,10 +52,10 @@ Pixiv
-
+
Wikipedia diff --git a/src/pages/options/tiktok/tiktok.html b/src/pages/options/tiktok/tiktok.html index 05b3417..6393572 100644 --- a/src/pages/options/tiktok/tiktok.html +++ b/src/pages/options/tiktok/tiktok.html @@ -61,10 +61,10 @@ Pixiv
-
+
diff --git a/src/pages/options/translate/translate.html b/src/pages/options/translate/translate.html index 931ba76..7e4f3bd 100644 --- a/src/pages/options/translate/translate.html +++ b/src/pages/options/translate/translate.html @@ -62,10 +62,10 @@ Pixiv
-
+
diff --git a/src/pages/options/twitter/twitter.html b/src/pages/options/twitter/twitter.html index 2e8d012..a21b26f 100644 --- a/src/pages/options/twitter/twitter.html +++ b/src/pages/options/twitter/twitter.html @@ -63,10 +63,10 @@ Pixiv
-
+
diff --git a/src/pages/options/wikipedia/wikipedia.html b/src/pages/options/wikipedia/wikipedia.html index 21fa9ce..2cea3cd 100644 --- a/src/pages/options/wikipedia/wikipedia.html +++ b/src/pages/options/wikipedia/wikipedia.html @@ -52,10 +52,10 @@ Pixiv
-
+
Wikipedia diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html index d6d9b5e..af7e8d3 100644 --- a/src/pages/options/youtube/youtube.html +++ b/src/pages/options/youtube/youtube.html @@ -53,10 +53,10 @@ Pixiv
-
+
Wikipedia diff --git a/src/pages/options/youtubeMusic/youtubeMusic.html b/src/pages/options/youtubeMusic/youtubeMusic.html index 1993d44..5051b9f 100644 --- a/src/pages/options/youtubeMusic/youtubeMusic.html +++ b/src/pages/options/youtubeMusic/youtubeMusic.html @@ -53,10 +53,10 @@ Pixiv
-
+
Wikipedia diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html index 365de1d..e136491 100644 --- a/src/pages/popup/popup.html +++ b/src/pages/popup/popup.html @@ -77,13 +77,13 @@
-
+
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js index 01dc726..75f3a3d 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(); @@ -130,9 +130,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)