diff --git a/src/assets/images/spotify-icon.png b/src/assets/images/spotify-icon.png new file mode 100644 index 0000000..264762a Binary files /dev/null and b/src/assets/images/spotify-icon.png differ diff --git a/src/assets/javascripts/helpers/general.js b/src/assets/javascripts/helpers/general.js index a655fa7..67c8b57 100644 --- a/src/assets/javascripts/helpers/general.js +++ b/src/assets/javascripts/helpers/general.js @@ -81,9 +81,9 @@ async function init() { "imgur", "reddit", "search", + "medium", "translate", "maps", - "wikipedia", ]; autoRedirect = r.autoRedirect ?? false; @@ -112,6 +112,7 @@ let allPopupFrontends = [ "imgur", "reddit", "pixiv", + "spotify", "search", "translate", "maps", diff --git a/src/assets/javascripts/helpers/medium.js b/src/assets/javascripts/helpers/medium.js index 10d5664..4bd323c 100644 --- a/src/assets/javascripts/helpers/medium.js +++ b/src/assets/javascripts/helpers/medium.js @@ -176,7 +176,7 @@ async function init() { "mediumProtocol" ], r => { - disable = r.disableMedium ?? true; + disable = r.disableMedium ?? false; protocol = r.mediumProtocol ?? "normal"; diff --git a/src/assets/javascripts/helpers/spotify.js b/src/assets/javascripts/helpers/spotify.js new file mode 100644 index 0000000..249bb44 --- /dev/null +++ b/src/assets/javascripts/helpers/spotify.js @@ -0,0 +1,205 @@ +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) { + console.log("spotify redirect"); + 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/wikipedia.js b/src/assets/javascripts/helpers/wikipedia.js index da713a0..4294683 100644 --- a/src/assets/javascripts/helpers/wikipedia.js +++ b/src/assets/javascripts/helpers/wikipedia.js @@ -200,7 +200,7 @@ async function init() { "applyThemeToSites", ], r => { // r = result - disable = r.disableWikipedia ?? false; + disable = r.disableWikipedia ?? true; protocol = r.wikipediaProtocol ?? "normal"; diff --git a/src/pages/background/background.js b/src/pages/background/background.js index b9a4407..c6d8cf0 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -15,6 +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 generalHelper from "../../assets/javascripts/helpers/general.js"; import youtubeMusicHelper from "../../assets/javascripts/helpers/youtubeMusic.js"; @@ -37,6 +38,7 @@ async function wholeInit() { await sendTargetsHelper.init(); await peertubeHelper.init(); await lbryHelper.init(); + await spotifyHelper.init(); await generalHelper.init(); } await wholeInit(); @@ -81,6 +83,8 @@ 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 = translateHelper.redirect(url); if (!newUrl) newUrl = searchHelper.redirect(url) @@ -153,6 +157,8 @@ browser.webRequest.onResponseStarted.addListener( if (!newUrl) newUrl = lbryHelper.changeInstance(url); + if (!newUrl) newUrl = spotifyHelper.changeInstance(url); + if (newUrl) { browser.tabs.update({ url: '/pages/errors/instance_offline.html' }); setTimeout(() => browser.tabs.update({ url: newUrl }), 2000); diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html index 7fa004e..98e9fca 100644 --- a/src/pages/options/general/general.html +++ b/src/pages/options/general/general.html @@ -51,6 +51,10 @@ Pixiv +
+ + Spotify +
Wikipedia @@ -258,6 +262,13 @@
+
+
+ + Spotify +
+ +
diff --git a/src/pages/options/imgur/imgur.html b/src/pages/options/imgur/imgur.html index 2519622..0eb50b9 100644 --- a/src/pages/options/imgur/imgur.html +++ b/src/pages/options/imgur/imgur.html @@ -12,6 +12,7 @@
+
@@ -20,42 +21,57 @@ General
+
YouTube
+
YT Music
+
Twitter
+
Instagram
+
TikTok
+
Reddit
+
Imgur
+
Pixiv
+ +
+ + Spotify +
+
Wikipedia
+
@@ -65,14 +81,17 @@ Medium
+
Peertube
+
LBRY/Odysee
+
@@ -81,6 +100,7 @@ Search
+
@@ -89,6 +109,7 @@ Translate
+
Maps
+
Send Files
+
diff --git a/src/pages/options/instagram/instagram.html b/src/pages/options/instagram/instagram.html index 9ff3b3d..fe01b38 100644 --- a/src/pages/options/instagram/instagram.html +++ b/src/pages/options/instagram/instagram.html @@ -53,6 +53,10 @@ Pixiv
+
+ + Spotify +
Wikipedia diff --git a/src/pages/options/lbry/lbry.html b/src/pages/options/lbry/lbry.html index c1fddf3..c17a64b 100644 --- a/src/pages/options/lbry/lbry.html +++ b/src/pages/options/lbry/lbry.html @@ -52,6 +52,10 @@ Pixiv
+
+ + Spotify +
Wikipedia diff --git a/src/pages/options/maps/maps.html b/src/pages/options/maps/maps.html index 0427214..d175e3b 100644 --- a/src/pages/options/maps/maps.html +++ b/src/pages/options/maps/maps.html @@ -13,6 +13,7 @@
+
@@ -21,42 +22,57 @@ General
+
YouTube
+
YT Music
+
Twitter
+
Instagram
+
TikTok
+
Reddit
+
Imgur
+
Pixiv
+ +
+ + Spotify +
+
Wikipedia
+
@@ -66,10 +82,12 @@ Medium
+
Peertube
+
LBRY/Odysee @@ -82,6 +100,7 @@ Search
+
@@ -90,6 +109,7 @@ Translate
+
Maps
+
Send Files
+
diff --git a/src/pages/options/medium/medium.html b/src/pages/options/medium/medium.html index 6b69bdc..6332f73 100644 --- a/src/pages/options/medium/medium.html +++ b/src/pages/options/medium/medium.html @@ -12,6 +12,7 @@
+
@@ -20,42 +21,57 @@ General
+
YouTube
+
YT Music
+
Twitter
+
Instagram
+
TikTok
+
Reddit
+
Imgur
+
Pixiv
+ +
+ + Spotify +
+
Wikipedia
+
@@ -65,14 +81,17 @@ Medium
+
Peertube
+
LBRY/Odysee
+
@@ -81,6 +100,7 @@ Search
+
@@ -89,6 +109,7 @@ Translate
+
Maps
+
Send Files
+
diff --git a/src/pages/options/peertube/peertube.html b/src/pages/options/peertube/peertube.html index 1ef835f..2e61a1a 100644 --- a/src/pages/options/peertube/peertube.html +++ b/src/pages/options/peertube/peertube.html @@ -11,6 +11,7 @@ +
General
+
YouTube
+
YT Music
+
Twitter
+
Instagram
+
TikTok
+
Reddit
+
Imgur
+
Pixiv
+ +
+ + Spotify +
+
Wikipedia
+
@@ -65,14 +81,17 @@ Medium
+
Peertube
+
LBRY/Odysee
+
@@ -81,6 +100,7 @@ Search
+
@@ -89,6 +109,7 @@ Translate
+
Maps
+
Send Files
+
diff --git a/src/pages/options/pixiv/pixiv.html b/src/pages/options/pixiv/pixiv.html index a66c5d2..241c327 100644 --- a/src/pages/options/pixiv/pixiv.html +++ b/src/pages/options/pixiv/pixiv.html @@ -12,6 +12,7 @@
+
@@ -20,42 +21,57 @@ General
+
YouTube
+
YT Music
+
Twitter
+
Instagram
+
TikTok
+
Reddit
+
Imgur
+
Pixiv
+ +
+ + Spotify +
+
Wikipedia
+
@@ -65,14 +81,17 @@ Medium
+
Peertube
+
LBRY/Odysee
+
@@ -81,6 +100,7 @@ Search
+
@@ -89,6 +109,7 @@ Translate
+
Maps
+
Send Files
+
diff --git a/src/pages/options/reddit/reddit.html b/src/pages/options/reddit/reddit.html index 97f5093..a9c0b9b 100644 --- a/src/pages/options/reddit/reddit.html +++ b/src/pages/options/reddit/reddit.html @@ -12,6 +12,7 @@
+
@@ -20,42 +21,57 @@ General
+
YouTube
+
YT Music
+
Twitter
+
Instagram
+
TikTok
+
Reddit
+
Imgur
+
Pixiv
+ +
+ + Spotify +
+
Wikipedia
+
@@ -65,14 +81,17 @@ Medium
+
Peertube
+
LBRY/Odysee
+
@@ -81,6 +100,7 @@ Search
+
@@ -89,6 +109,7 @@ Translate
+
Maps
+
Send Files
+
diff --git a/src/pages/options/search/search.html b/src/pages/options/search/search.html index 6683c29..3539dbe 100644 --- a/src/pages/options/search/search.html +++ b/src/pages/options/search/search.html @@ -12,6 +12,7 @@
+
@@ -20,42 +21,57 @@ General
+
YouTube
+
YT Music
+
Twitter
+
Instagram
+
TikTok
+
Reddit
+
Imgur
+
Pixiv
+ +
+ + Spotify +
+
Wikipedia
+
@@ -65,14 +81,17 @@ Medium
+
Peertube
+
LBRY/Odysee
+
@@ -81,6 +100,7 @@ Search
+
@@ -89,6 +109,7 @@ Translate
+
Maps
+
Send Files
+
diff --git a/src/pages/options/sendTargets/sendTargets.html b/src/pages/options/sendTargets/sendTargets.html index 983db90..76a794a 100644 --- a/src/pages/options/sendTargets/sendTargets.html +++ b/src/pages/options/sendTargets/sendTargets.html @@ -52,6 +52,10 @@ Pixiv
+
+ + Spotify +
Wikipedia diff --git a/src/pages/options/spotify/spotify.html b/src/pages/options/spotify/spotify.html new file mode 100644 index 0000000..9bf08ef --- /dev/null +++ b/src/pages/options/spotify/spotify.html @@ -0,0 +1,198 @@ + + + + + + + + + + LibRedirect Options: TikTok + + + +
+ +
+ + + + 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 0000000..1bd078c --- /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/tiktok/tiktok.html b/src/pages/options/tiktok/tiktok.html index 4f82cec..16e62a3 100644 --- a/src/pages/options/tiktok/tiktok.html +++ b/src/pages/options/tiktok/tiktok.html @@ -12,6 +12,7 @@
+
@@ -20,14 +21,17 @@ General
+
YouTube
+
YT Music
+
Twitter @@ -36,26 +40,37 @@ Instagram
+
TikTok
+
Reddit
+
Imgur
+
Pixiv
+ +
+ + Spotify +
+
Wikipedia
+
@@ -65,14 +80,17 @@ Medium
+
Peertube
+
LBRY/Odysee
+
@@ -81,6 +99,7 @@ Search
+
@@ -89,6 +108,7 @@ Translate
+
Maps
+
Send Files
+
diff --git a/src/pages/options/translate/translate.html b/src/pages/options/translate/translate.html index 34b2ebe..37a2f2f 100644 --- a/src/pages/options/translate/translate.html +++ b/src/pages/options/translate/translate.html @@ -12,6 +12,7 @@
+
@@ -20,42 +21,57 @@ General
+
YouTube
+
YT Music
+
Twitter
+
Instagram
+
TikTok
+
Reddit
+
Imgur
+
Pixiv
+ +
+ + Spotify +
+
Wikipedia
+
@@ -65,14 +81,17 @@ Medium
+
Peertube
+
LBRY/Odysee -
+
+
@@ -81,6 +100,7 @@ Search
+
@@ -89,6 +109,7 @@ Translate
+
Maps
+
Send Files
+
diff --git a/src/pages/options/twitter/twitter.html b/src/pages/options/twitter/twitter.html index 9e4a5d4..33e1d5c 100644 --- a/src/pages/options/twitter/twitter.html +++ b/src/pages/options/twitter/twitter.html @@ -13,6 +13,7 @@
+
@@ -21,42 +22,57 @@ General
+
YouTube
+
YT Music
+
Twitter
+
Instagram
+
TikTok
+
Reddit
+
Imgur
+
Pixiv
+ +
+ + Spotify +
+
Wikipedia
+
@@ -66,14 +82,17 @@ Medium
+
Peertube
+
LBRY/Odysee -
+
+
@@ -82,6 +101,7 @@ Search
+
@@ -90,6 +110,7 @@ Translate
+
Maps
+
Send Files
+
diff --git a/src/pages/options/wikipedia/wikipedia.html b/src/pages/options/wikipedia/wikipedia.html index 1c12ea1..be8bd5a 100644 --- a/src/pages/options/wikipedia/wikipedia.html +++ b/src/pages/options/wikipedia/wikipedia.html @@ -52,6 +52,10 @@ Pixiv
+
+ + Spotify +
Wikipedia @@ -72,7 +76,7 @@
LBRY/Odysee -
+
diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html index 6146171..ce19aa6 100644 --- a/src/pages/options/youtube/youtube.html +++ b/src/pages/options/youtube/youtube.html @@ -53,6 +53,10 @@ Pixiv
+
+ + Spotify +
Wikipedia diff --git a/src/pages/options/youtubeMusic/youtubeMusic.html b/src/pages/options/youtubeMusic/youtubeMusic.html index ca90dcc..ffa3cca 100644 --- a/src/pages/options/youtubeMusic/youtubeMusic.html +++ b/src/pages/options/youtubeMusic/youtubeMusic.html @@ -53,6 +53,10 @@ Pixiv
+
+ + Spotify +
Wikipedia @@ -73,7 +77,7 @@
LBRY/Odysee -
+
diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html index 419c959..365de1d 100644 --- a/src/pages/popup/popup.html +++ b/src/pages/popup/popup.html @@ -77,6 +77,14 @@
+
+ + +

Spotify

+ + +
+
@@ -113,7 +121,6 @@
-