From 439c9e49c46743d900329df71569b074db743709 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Thu, 17 Mar 2022 10:58:05 +0300 Subject: Disabled soju in code as you can access songs through embeds #109 --- src/assets/javascripts/helpers/.spotify.js | 204 +++++++++++++++++++++++ src/assets/javascripts/helpers/general.js | 2 +- src/assets/javascripts/helpers/spotify.js | 204 ----------------------- src/pages/background/background.js | 8 +- src/pages/options/.spotify/.spotify.html | 198 ++++++++++++++++++++++ src/pages/options/.spotify/.spotify.js | 59 +++++++ 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/spotify/spotify.html | 198 ---------------------- src/pages/options/spotify/spotify.js | 59 ------- 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 +- 27 files changed, 510 insertions(+), 510 deletions(-) create mode 100644 src/assets/javascripts/helpers/.spotify.js delete mode 100644 src/assets/javascripts/helpers/spotify.js create mode 100644 src/pages/options/.spotify/.spotify.html create mode 100644 src/pages/options/.spotify/.spotify.js delete mode 100644 src/pages/options/spotify/spotify.html delete mode 100644 src/pages/options/spotify/spotify.js (limited to 'src') diff --git a/src/assets/javascripts/helpers/.spotify.js b/src/assets/javascripts/helpers/.spotify.js new file mode 100644 index 00000000..10fbdcb6 --- /dev/null +++ b/src/assets/javascripts/helpers/.spotify.js @@ -0,0 +1,204 @@ +window.browser = window.browser || window.chrome; + +import commonHelper from './common.js' + +let targets = [ + /^https?:\/{2}(open\.|)spotify\.com/, +]; + +let redirects = { + "soju": { + "normal": [ + "https://playsoju.netlify.app", + ], + "tor": [] + } +} + +const getRedirects = () => redirects; +const getCustomRedirects = function () { + return { + "soju": { + "normal": [...sojuNormalRedirectsChecks, ...sojuNormalCustomRedirects] + }, + }; +}; + +function setRedirects(val) { + redirects.soju = val; + browser.storage.local.set({ spotifyTargetsRedirects: redirects }) + console.log("spotifyTargetsRedirects: ", val) + for (const item of sojuNormalRedirectsChecks) + if (!redirects.soju.normal.includes(item)) { + var index = sojuNormalRedirectsChecks.indexOf(item); + if (index !== -1) sojuNormalRedirectsChecks.splice(index, 1); + } + setSojuNormalRedirectsChecks(sojuNormalRedirectsChecks); + + for (const item of sojuTorRedirectsChecks) + if (!redirects.soju.normal.includes(item)) { + var index = sojuTorRedirectsChecks.indexOf(item); + if (index !== -1) sojuTorRedirectsChecks.splice(index, 1); + } + setSojuTorRedirectsChecks(sojuTorRedirectsChecks); +} + +let sojuNormalRedirectsChecks; +const getSojuNormalRedirectsChecks = () => sojuNormalRedirectsChecks; +function setSojuNormalRedirectsChecks(val) { + sojuNormalRedirectsChecks = val; + browser.storage.local.set({ sojuNormalRedirectsChecks }) + console.log("sojuNormalRedirectsChecks: ", val) +} + +let sojuTorRedirectsChecks; +const getSojuTorRedirectsChecks = () => sojuTorRedirectsChecks; +function setSojuTorRedirectsChecks(val) { + sojuTorRedirectsChecks = val; + browser.storage.local.set({ sojuTorRedirectsChecks }) + console.log("sojuTorRedirectsChecks: ", val) +} + +let sojuNormalCustomRedirects = []; +const getSojuNormalCustomRedirects = () => sojuNormalCustomRedirects; +function setSojuNormalCustomRedirects(val) { + sojuNormalCustomRedirects = val; + browser.storage.local.set({ sojuNormalCustomRedirects }) + console.log("sojuNormalCustomRedirects: ", val) +} + +let sojuTorCustomRedirects = []; +const getSojuTorCustomRedirects = () => sojuTorCustomRedirects; +function setSojuTorCustomRedirects(val) { + sojuTorCustomRedirects = val; + browser.storage.local.set({ sojuTorCustomRedirects }) + console.log("sojuTorCustomRedirects: ", val) +} + +let disable; +const getDisable = () => disable; +function setDisable(val) { + disable = val; + browser.storage.local.set({ disableSpotifyTargets: disable }) +} + +let protocol; +const getProtocol = () => protocol; +function setProtocol(val) { + protocol = val; + browser.storage.local.set({ spotifyTargetsProtocol: val }) + console.log("spotifyTargetsProtocol: ", val) +} + +function changeInstance(url) { + let protocolHost = `${url.protocol}//${url.host}`; + + let sojuList = [ + ...redirects.soju.normal, + ...redirects.soju.tor, + ...sojuNormalCustomRedirects, + ...sojuTorCustomRedirects, + ]; + + if (!sojuList.includes(protocolHost)) return; + + let instancesList; + if (protocol == 'normal') instancesList = [...sojuNormalRedirectsChecks, ...sojuNormalCustomRedirects]; + else if (protocol == 'tor') instancesList = [...sojuTorRedirectsChecks, ...sojuTorCustomRedirects]; + + console.log("instancesList", instancesList); + let index = instancesList.indexOf(protocolHost); + if (index > -1) instancesList.splice(index, 1); + + if (instancesList.length === 0) return null; + + let randomInstance = commonHelper.getRandomInstance(instancesList); + return `${randomInstance}${url.pathname}${url.search}`; +} + +function redirect(url, type, initiator) { + if (disable) return null; + if (initiator && ([...redirects.soju.normal, ...sojuNormalCustomRedirects].includes(initiator.origin) || targets.includes(initiator.host))) return null; + if (!targets.some((rx) => rx.test(url.href))) return null; + + if (type != "main_frame") return null; + + let instancesList; + if (protocol == 'normal') instancesList = [...sojuNormalRedirectsChecks, ...sojuNormalCustomRedirects]; + if (protocol == 'tor') instancesList = [...sojuTorRedirectsChecks, ...sojuTorCustomRedirects]; + if (instancesList.length === 0) return null; + let randomInstance = commonHelper.getRandomInstance(instancesList); + + let query = ''; + if (url.pathname != '/') query = `/?s=${url.href}`; + + return `${randomInstance}${query}`; +} + +async function init() { + return new Promise( + resolve => { + fetch('/instances/data.json').then(response => response.text()).then(data => { + let dataJson = JSON.parse(data); + browser.storage.local.get( + [ + "disableSpotifyTargets", + "spotifyTargetsRedirects", + + "sojuNormalRedirectsChecks", + "sojuNormalCustomRedirects", + + "sojuTorRedirectsChecks", + "sojuTorCustomRedirects", + + "spotifyTargetsProtocol" + ], + r => { + + disable = r.disableSpotifyTargets ?? true; + + protocol = r.spotifyTargetsProtocol ?? "normal"; + + if (r.spotifyTargetsRedirects) redirects = r.spotifyTargetsRedirects; + + sojuNormalRedirectsChecks = r.sojuNormalRedirectsChecks ?? [...redirects.soju.normal]; + sojuNormalCustomRedirects = r.sojuNormalCustomRedirects ?? []; + + sojuTorRedirectsChecks = r.sojuTorRedirectsChecks ?? [...redirects.soju.tor]; + sojuTorCustomRedirects = r.sojuTorCustomRedirects ?? []; + + resolve(); + } + ) + }); + } + ); +} + +export default { + + getRedirects, + getCustomRedirects, + setRedirects, + + getDisable, + setDisable, + + getProtocol, + setProtocol, + + getSojuNormalRedirectsChecks, + setSojuNormalRedirectsChecks, + getSojuTorRedirectsChecks, + setSojuTorRedirectsChecks, + + getSojuTorCustomRedirects, + setSojuTorCustomRedirects, + getSojuNormalCustomRedirects, + setSojuNormalCustomRedirects, + + changeInstance, + + redirect, + init, +}; diff --git a/src/assets/javascripts/helpers/general.js b/src/assets/javascripts/helpers/general.js index 67c8b57b..496b183a 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/assets/javascripts/helpers/spotify.js b/src/assets/javascripts/helpers/spotify.js deleted file mode 100644 index 10fbdcb6..00000000 --- a/src/assets/javascripts/helpers/spotify.js +++ /dev/null @@ -1,204 +0,0 @@ -window.browser = window.browser || window.chrome; - -import commonHelper from './common.js' - -let targets = [ - /^https?:\/{2}(open\.|)spotify\.com/, -]; - -let redirects = { - "soju": { - "normal": [ - "https://playsoju.netlify.app", - ], - "tor": [] - } -} - -const getRedirects = () => redirects; -const getCustomRedirects = function () { - return { - "soju": { - "normal": [...sojuNormalRedirectsChecks, ...sojuNormalCustomRedirects] - }, - }; -}; - -function setRedirects(val) { - redirects.soju = val; - browser.storage.local.set({ spotifyTargetsRedirects: redirects }) - console.log("spotifyTargetsRedirects: ", val) - for (const item of sojuNormalRedirectsChecks) - if (!redirects.soju.normal.includes(item)) { - var index = sojuNormalRedirectsChecks.indexOf(item); - if (index !== -1) sojuNormalRedirectsChecks.splice(index, 1); - } - setSojuNormalRedirectsChecks(sojuNormalRedirectsChecks); - - for (const item of sojuTorRedirectsChecks) - if (!redirects.soju.normal.includes(item)) { - var index = sojuTorRedirectsChecks.indexOf(item); - if (index !== -1) sojuTorRedirectsChecks.splice(index, 1); - } - setSojuTorRedirectsChecks(sojuTorRedirectsChecks); -} - -let sojuNormalRedirectsChecks; -const getSojuNormalRedirectsChecks = () => sojuNormalRedirectsChecks; -function setSojuNormalRedirectsChecks(val) { - sojuNormalRedirectsChecks = val; - browser.storage.local.set({ sojuNormalRedirectsChecks }) - console.log("sojuNormalRedirectsChecks: ", val) -} - -let sojuTorRedirectsChecks; -const getSojuTorRedirectsChecks = () => sojuTorRedirectsChecks; -function setSojuTorRedirectsChecks(val) { - sojuTorRedirectsChecks = val; - browser.storage.local.set({ sojuTorRedirectsChecks }) - console.log("sojuTorRedirectsChecks: ", val) -} - -let sojuNormalCustomRedirects = []; -const getSojuNormalCustomRedirects = () => sojuNormalCustomRedirects; -function setSojuNormalCustomRedirects(val) { - sojuNormalCustomRedirects = val; - browser.storage.local.set({ sojuNormalCustomRedirects }) - console.log("sojuNormalCustomRedirects: ", val) -} - -let sojuTorCustomRedirects = []; -const getSojuTorCustomRedirects = () => sojuTorCustomRedirects; -function setSojuTorCustomRedirects(val) { - sojuTorCustomRedirects = val; - browser.storage.local.set({ sojuTorCustomRedirects }) - console.log("sojuTorCustomRedirects: ", val) -} - -let disable; -const getDisable = () => disable; -function setDisable(val) { - disable = val; - browser.storage.local.set({ disableSpotifyTargets: disable }) -} - -let protocol; -const getProtocol = () => protocol; -function setProtocol(val) { - protocol = val; - browser.storage.local.set({ spotifyTargetsProtocol: val }) - console.log("spotifyTargetsProtocol: ", val) -} - -function changeInstance(url) { - let protocolHost = `${url.protocol}//${url.host}`; - - let sojuList = [ - ...redirects.soju.normal, - ...redirects.soju.tor, - ...sojuNormalCustomRedirects, - ...sojuTorCustomRedirects, - ]; - - if (!sojuList.includes(protocolHost)) return; - - let instancesList; - if (protocol == 'normal') instancesList = [...sojuNormalRedirectsChecks, ...sojuNormalCustomRedirects]; - else if (protocol == 'tor') instancesList = [...sojuTorRedirectsChecks, ...sojuTorCustomRedirects]; - - console.log("instancesList", instancesList); - let index = instancesList.indexOf(protocolHost); - if (index > -1) instancesList.splice(index, 1); - - if (instancesList.length === 0) return null; - - let randomInstance = commonHelper.getRandomInstance(instancesList); - return `${randomInstance}${url.pathname}${url.search}`; -} - -function redirect(url, type, initiator) { - if (disable) return null; - if (initiator && ([...redirects.soju.normal, ...sojuNormalCustomRedirects].includes(initiator.origin) || targets.includes(initiator.host))) return null; - if (!targets.some((rx) => rx.test(url.href))) return null; - - if (type != "main_frame") return null; - - let instancesList; - if (protocol == 'normal') instancesList = [...sojuNormalRedirectsChecks, ...sojuNormalCustomRedirects]; - if (protocol == 'tor') instancesList = [...sojuTorRedirectsChecks, ...sojuTorCustomRedirects]; - if (instancesList.length === 0) return null; - let randomInstance = commonHelper.getRandomInstance(instancesList); - - let query = ''; - if (url.pathname != '/') query = `/?s=${url.href}`; - - return `${randomInstance}${query}`; -} - -async function init() { - return new Promise( - resolve => { - fetch('/instances/data.json').then(response => response.text()).then(data => { - let dataJson = JSON.parse(data); - browser.storage.local.get( - [ - "disableSpotifyTargets", - "spotifyTargetsRedirects", - - "sojuNormalRedirectsChecks", - "sojuNormalCustomRedirects", - - "sojuTorRedirectsChecks", - "sojuTorCustomRedirects", - - "spotifyTargetsProtocol" - ], - r => { - - disable = r.disableSpotifyTargets ?? true; - - protocol = r.spotifyTargetsProtocol ?? "normal"; - - if (r.spotifyTargetsRedirects) redirects = r.spotifyTargetsRedirects; - - sojuNormalRedirectsChecks = r.sojuNormalRedirectsChecks ?? [...redirects.soju.normal]; - sojuNormalCustomRedirects = r.sojuNormalCustomRedirects ?? []; - - sojuTorRedirectsChecks = r.sojuTorRedirectsChecks ?? [...redirects.soju.tor]; - sojuTorCustomRedirects = r.sojuTorCustomRedirects ?? []; - - resolve(); - } - ) - }); - } - ); -} - -export default { - - getRedirects, - getCustomRedirects, - setRedirects, - - getDisable, - setDisable, - - getProtocol, - setProtocol, - - getSojuNormalRedirectsChecks, - setSojuNormalRedirectsChecks, - getSojuTorRedirectsChecks, - setSojuTorRedirectsChecks, - - getSojuTorCustomRedirects, - setSojuTorCustomRedirects, - getSojuNormalCustomRedirects, - setSojuNormalCustomRedirects, - - changeInstance, - - redirect, - init, -}; diff --git a/src/pages/background/background.js b/src/pages/background/background.js index c6d8cf0e..d1488870 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 new file mode 100644 index 00000000..e0553743 --- /dev/null +++ b/src/pages/options/.spotify/.spotify.html @@ -0,0 +1,198 @@ + + + + + + + + + + LibRedirect: Spotify + + + +
+ +
+ + + + General +
+ +
+ + YouTube +
+ +
+ + YT Music +
+ +
+ + Twitter +
+
+ + Instagram +
+ +
+ + TikTok +
+ +
+ + Reddit +
+ +
+ + Imgur +
+ +
+ + Pixiv +
+ +
+ + Spotify +
+ +
+ + Wikipedia +
+ +
+ + + + + + + Medium +
+ +
+ + Peertube +
+ +
+ + LBRY/Odysee +
+ +
+ + + + + Search +
+ +
+ + + + + Translate +
+ +
+ + + + Maps +
+ +
+ + + + Send Files +
+ +
+ +
+
+

Enable

+ +
+ +
+

Protocol

+ +
+ +
+ +
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/src/pages/options/.spotify/.spotify.js b/src/pages/options/.spotify/.spotify.js new file mode 100644 index 00000000..1bd078cb --- /dev/null +++ b/src/pages/options/.spotify/.spotify.js @@ -0,0 +1,59 @@ +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); + } +); + +function changeProtocolSettings(protocol) { + let normalDiv = document.getElementById("normal"); + let torDiv = document.getElementById("tor"); + 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); + + commonHelper.processDefaultCustomInstances( + 'soju', + 'normal', + spotifyHelper, + document, + spotifyHelper.getSojuNormalRedirectsChecks, + spotifyHelper.setSojuNormalRedirectsChecks, + spotifyHelper.getSojuNormalCustomRedirects, + spotifyHelper.setSojuNormalCustomRedirects + ); + + commonHelper.processDefaultCustomInstances( + 'soju', + 'tor', + spotifyHelper, + document, + spotifyHelper.getSojuTorRedirectsChecks, + spotifyHelper.setSojuTorRedirectsChecks, + spotifyHelper.getSojuTorCustomRedirects, + spotifyHelper.setSojuTorCustomRedirects + ) +}) \ No newline at end of file diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html index 98e9fca6..b602036a 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 37b7bda1..b74cfb4f 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 51b6c58d..0f4c352a 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 16ea3875..a7e826b3 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 6f10c270..bbb0009e 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 ee922d17..dd354c03 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 23009d1d..99738685 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 8f6630da..56724a93 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 57f29b15..c3c49b3e 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 613e4d0f..b0f34af5 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 3431c9a2..235205f0 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/spotify/spotify.html b/src/pages/options/spotify/spotify.html deleted file mode 100644 index e0553743..00000000 --- a/src/pages/options/spotify/spotify.html +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - LibRedirect: Spotify - - - -
- -
- - - - General -
- -
- - YouTube -
- -
- - YT Music -
- -
- - Twitter -
-
- - Instagram -
- -
- - TikTok -
- -
- - Reddit -
- -
- - Imgur -
- -
- - Pixiv -
- -
- - Spotify -
- -
- - Wikipedia -
- -
- - - - - - - Medium -
- -
- - Peertube -
- -
- - LBRY/Odysee -
- -
- - - - - Search -
- -
- - - - - Translate -
- -
- - - - Maps -
- -
- - - - Send Files -
- -
- -
-
-

Enable

- -
- -
-

Protocol

- -
- -
- -
-
-

Default Instances

-
-
-
-
-

Custom Instances

-
-
-
- - -
-
-
-
-
-
-

Default Instances

-
-
-
-
-

Custom Instances

-
-
-
- - -
-
-
-
-
- - - - - - - - \ No newline at end of file diff --git a/src/pages/options/spotify/spotify.js b/src/pages/options/spotify/spotify.js deleted file mode 100644 index 1bd078cb..00000000 --- a/src/pages/options/spotify/spotify.js +++ /dev/null @@ -1,59 +0,0 @@ -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); - } -); - -function changeProtocolSettings(protocol) { - let normalDiv = document.getElementById("normal"); - let torDiv = document.getElementById("tor"); - 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); - - commonHelper.processDefaultCustomInstances( - 'soju', - 'normal', - spotifyHelper, - document, - spotifyHelper.getSojuNormalRedirectsChecks, - spotifyHelper.setSojuNormalRedirectsChecks, - spotifyHelper.getSojuNormalCustomRedirects, - spotifyHelper.setSojuNormalCustomRedirects - ); - - commonHelper.processDefaultCustomInstances( - 'soju', - 'tor', - spotifyHelper, - document, - spotifyHelper.getSojuTorRedirectsChecks, - spotifyHelper.setSojuTorRedirectsChecks, - spotifyHelper.getSojuTorCustomRedirects, - spotifyHelper.setSojuTorCustomRedirects - ) -}) \ No newline at end of file diff --git a/src/pages/options/tiktok/tiktok.html b/src/pages/options/tiktok/tiktok.html index 05b3417e..63935721 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 931ba760..7e4f3bd5 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 2e8d0122..a21b26fb 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 21fa9ced..2cea3cd0 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 d6d9b5e5..af7e8d3d 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 1993d449..5051b9f0 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 365de1d1..e1364910 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 01dc7265..75f3a3dd 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) -- cgit 1.4.1