diff options
| author | ManeraKai <manerakai@protonmail.com> | 2022-03-16 19:58:55 +0300 |
|---|---|---|
| committer | ManeraKai <manerakai@protonmail.com> | 2022-03-16 19:58:55 +0300 |
| commit | 3aad419dc264107368f7ee94625babedf3f67494 (patch) | |
| tree | 0420ee956083d9a76430b615d4cba9a1be0a9f93 /src | |
| parent | Added librarian #78 (diff) | |
| download | libredirect-3aad419dc264107368f7ee94625babedf3f67494.zip | |
Added Soju #109
Diffstat (limited to 'src')
27 files changed, 755 insertions, 8 deletions
diff --git a/src/assets/images/spotify-icon.png b/src/assets/images/spotify-icon.png new file mode 100644 index 00000000..264762a4 --- /dev/null +++ b/src/assets/images/spotify-icon.png Binary files differdiff --git a/src/assets/javascripts/helpers/general.js b/src/assets/javascripts/helpers/general.js index a655fa74..67c8b57b 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 10d56646..4bd323c9 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 00000000..249bb448 --- /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 da713a03..4294683b 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 b9a44075..c6d8cf0e 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 7fa004e6..98e9fca6 100644 --- a/src/pages/options/general/general.html +++ b/src/pages/options/general/general.html @@ -52,6 +52,10 @@ <a href="../pixiv/pixiv.html">Pixiv</a> </div> <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html">Spotify</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> @@ -260,6 +264,13 @@ </div> <div> <div> + <img src="../../../assets/images/spotify-icon.png"> + Spotify + </div> + <input type="checkbox" id="spotify" /> + </div> + <div> + <div> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> <path diff --git a/src/pages/options/imgur/imgur.html b/src/pages/options/imgur/imgur.html index 2519622a..0eb50b9f 100644 --- a/src/pages/options/imgur/imgur.html +++ b/src/pages/options/imgur/imgur.html @@ -12,6 +12,7 @@ <body class="option"> <section class="links"> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor"> @@ -20,42 +21,57 @@ </svg> <a href="../general/general.html">General</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-icon.png" /> <a href="../youtube/youtube.html">YouTube</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-music-icon.png" /> <a href="../youtubeMusic/youtubeMusic.html">YT Music</a> </div> + <div class="title"> <img src="../../../assets/images/twitter-icon.png" /> <a href="../twitter/twitter.html">Twitter</a> </div> + <div class="title"> <img src="../../../assets/images/instagram-icon.png" /> <a href="../instagram/instagram.html">Instagram</a> </div> + <div class="title"> <img src="../../../assets/images/tiktok-icon.png" /> <a href="../tiktok/tiktok.html">TikTok</a> </div> + <div class="title"> <img src="../../../assets/images/reddit-icon.png" /> <a href="../reddit/reddit.html">Reddit</a> </div> + <div class="title"> <img src="../../../assets/images/imgur-icon.png" /> <a href="../imgur/imgur.html" class="selected">Imgur</a> </div> + <div class="title"> <img src="../../../assets/images/pixiv-icon.svg" /> <a href="../pixiv/pixiv.html">Pixiv</a> </div> + + <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html">Spotify</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> + <div class="title"> <!-- https://markentier.tech/posts/2020/10/medium-icon-svg/ --> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor"> @@ -65,14 +81,17 @@ </svg> <a href="../medium/medium.html">Medium</a> </div> + <div class="title"> <img src="../../../assets/images/peertube-icon.svg" /> <a href="../peertube/peertube.html">Peertube</a> </div> + <div class="title"> <img src="../../../assets/images/lbry-icon.png" /> <a href="../lbry/lbry.html">LBRY/Odysee</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -81,6 +100,7 @@ </svg> <a href="../search/search.html">Search</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -89,6 +109,7 @@ </svg> <a href="../translate/translate.html">Translate</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -96,6 +117,7 @@ </svg> <a href="../maps/maps.html">Maps</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -103,6 +125,7 @@ </svg> <a href="../sendTargets/sendTargets.html">Send Files</a> </div> + </section> <section class="option-block"> diff --git a/src/pages/options/instagram/instagram.html b/src/pages/options/instagram/instagram.html index 9ff3b3d2..fe01b384 100644 --- a/src/pages/options/instagram/instagram.html +++ b/src/pages/options/instagram/instagram.html @@ -54,6 +54,10 @@ <a href="../pixiv/pixiv.html">Pixiv</a> </div> <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html">Spotify</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> diff --git a/src/pages/options/lbry/lbry.html b/src/pages/options/lbry/lbry.html index c1fddf35..c17a64b5 100644 --- a/src/pages/options/lbry/lbry.html +++ b/src/pages/options/lbry/lbry.html @@ -53,6 +53,10 @@ <a href="../pixiv/pixiv.html">Pixiv</a> </div> <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html">Spotify</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> diff --git a/src/pages/options/maps/maps.html b/src/pages/options/maps/maps.html index 04272146..d175e3b1 100644 --- a/src/pages/options/maps/maps.html +++ b/src/pages/options/maps/maps.html @@ -13,6 +13,7 @@ <body class="option"> <section class="links"> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor"> @@ -21,42 +22,57 @@ </svg> <a href="../general/general.html">General</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-icon.png" /> <a href="../youtube/youtube.html">YouTube</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-music-icon.png" /> <a href="../youtubeMusic/youtubeMusic.html">YT Music</a> </div> + <div class="title"> <img src="../../../assets/images/twitter-icon.png" /> <a href="../twitter/twitter.html">Twitter</a> </div> + <div class="title"> <img src="../../../assets/images/instagram-icon.png" /> <a href="../instagram/instagram.html">Instagram</a> </div> + <div class="title"> <img src="../../../assets/images/tiktok-icon.png" /> <a href="../tiktok/tiktok.html">TikTok</a> </div> + <div class="title"> <img src="../../../assets/images/reddit-icon.png" /> <a href="../reddit/reddit.html">Reddit</a> </div> + <div class="title"> <img src="../../../assets/images/imgur-icon.png" /> <a href="../imgur/imgur.html">Imgur</a> </div> + <div class="title"> <img src="../../../assets/images/pixiv-icon.svg" /> <a href="../pixiv/pixiv.html">Pixiv</a> </div> + + <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html">Spotify</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> + <div class="title"> <!-- https://markentier.tech/posts/2020/10/medium-icon-svg/ --> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor"> @@ -66,10 +82,12 @@ </svg> <a href="../medium/medium.html">Medium</a> </div> + <div class="title"> <img src="../../../assets/images/peertube-icon.svg" /> <a href="../peertube/peertube.html">Peertube</a> </div> + <div class="title"> <img src="../../../assets/images/lbry-icon.png" /> <a href="../lbry/lbry.html">LBRY/Odysee</a> @@ -82,6 +100,7 @@ </svg> <a href="../search/search.html">Search</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -90,6 +109,7 @@ </svg> <a href="../translate/translate.html">Translate</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -97,6 +117,7 @@ </svg> <a href="../maps/maps.html" class="selected">Maps</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -104,6 +125,7 @@ </svg> <a href="../sendTargets/sendTargets.html">Send Files</a> </div> + </section> <section class="option-block"> diff --git a/src/pages/options/medium/medium.html b/src/pages/options/medium/medium.html index 6b69bdc8..6332f738 100644 --- a/src/pages/options/medium/medium.html +++ b/src/pages/options/medium/medium.html @@ -12,6 +12,7 @@ <body class="option"> <section class="links"> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor"> @@ -20,42 +21,57 @@ </svg> <a href="../general/general.html">General</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-icon.png" /> <a href="../youtube/youtube.html">YouTube</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-music-icon.png" /> <a href="../youtubeMusic/youtubeMusic.html">YT Music</a> </div> + <div class="title"> <img src="../../../assets/images/twitter-icon.png" /> <a href="../twitter/twitter.html">Twitter</a> </div> + <div class="title"> <img src="../../../assets/images/instagram-icon.png" /> <a href="../instagram/instagram.html">Instagram</a> </div> + <div class="title"> <img src="../../../assets/images/tiktok-icon.png" /> <a href="../tiktok/tiktok.html">TikTok</a> </div> + <div class="title"> <img src="../../../assets/images/reddit-icon.png" /> <a href="../reddit/reddit.html">Reddit</a> </div> + <div class="title"> <img src="../../../assets/images/imgur-icon.png" /> <a href="../imgur/imgur.html">Imgur</a> </div> + <div class="title"> <img src="../../../assets/images/pixiv-icon.svg" /> <a href="../pixiv/pixiv.html">Pixiv</a> </div> + + <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html">Spotify</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> + <div class="title"> <!-- https://markentier.tech/posts/2020/10/medium-icon-svg/ --> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor"> @@ -65,14 +81,17 @@ </svg> <a href="../medium/medium.html" class="selected">Medium</a> </div> + <div class="title"> <img src="../../../assets/images/peertube-icon.svg" /> <a href="../peertube/peertube.html">Peertube</a> </div> + <div class="title"> <img src="../../../assets/images/lbry-icon.png" /> <a href="../lbry/lbry.html">LBRY/Odysee</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -81,6 +100,7 @@ </svg> <a href="../search/search.html">Search</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -89,6 +109,7 @@ </svg> <a href="../translate/translate.html">Translate</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -96,6 +117,7 @@ </svg> <a href="../maps/maps.html">Maps</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -103,6 +125,7 @@ </svg> <a href="../sendTargets/sendTargets.html">Send Files</a> </div> + </section> <section class="option-block"> diff --git a/src/pages/options/peertube/peertube.html b/src/pages/options/peertube/peertube.html index 1ef835f1..2e61a1a3 100644 --- a/src/pages/options/peertube/peertube.html +++ b/src/pages/options/peertube/peertube.html @@ -11,6 +11,7 @@ </head> <body class="option"> + <section class="links"> <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" @@ -20,42 +21,57 @@ </svg> <a href="../general/general.html">General</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-icon.png" /> <a href="../youtube/youtube.html">YouTube</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-music-icon.png" /> <a href="../youtubeMusic/youtubeMusic.html">YT Music</a> </div> + <div class="title"> <img src="../../../assets/images/twitter-icon.png" /> <a href="../twitter/twitter.html">Twitter</a> </div> + <div class="title"> <img src="../../../assets/images/instagram-icon.png" /> <a href="../instagram/instagram.html">Instagram</a> </div> + <div class="title"> <img src="../../../assets/images/tiktok-icon.png" /> <a href="../tiktok/tiktok.html">TikTok</a> </div> + <div class="title"> <img src="../../../assets/images/reddit-icon.png" /> <a href="../reddit/reddit.html">Reddit</a> </div> + <div class="title"> <img src="../../../assets/images/imgur-icon.png" /> <a href="../imgur/imgur.html">Imgur</a> </div> + <div class="title"> <img src="../../../assets/images/pixiv-icon.svg" /> <a href="../pixiv/pixiv.html">Pixiv</a> </div> + + <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html">Spotify</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> + <div class="title"> <!-- https://markentier.tech/posts/2020/10/medium-icon-svg/ --> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor"> @@ -65,14 +81,17 @@ </svg> <a href="../medium/medium.html">Medium</a> </div> + <div class="title"> <img src="../../../assets/images/peertube-icon.svg" /> <a href="../peertube/peertube.html" class="selected">Peertube</a> </div> + <div class="title"> <img src="../../../assets/images/lbry-icon.png" /> <a href="../lbry/lbry.html">LBRY/Odysee</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -81,6 +100,7 @@ </svg> <a href="../search/search.html">Search</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -89,6 +109,7 @@ </svg> <a href="../translate/translate.html">Translate</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -96,6 +117,7 @@ </svg> <a href="../maps/maps.html">Maps</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -103,6 +125,7 @@ </svg> <a href="../sendTargets/sendTargets.html">Send Files</a> </div> + </section> <section class="option-block"> diff --git a/src/pages/options/pixiv/pixiv.html b/src/pages/options/pixiv/pixiv.html index a66c5d29..241c327e 100644 --- a/src/pages/options/pixiv/pixiv.html +++ b/src/pages/options/pixiv/pixiv.html @@ -12,6 +12,7 @@ <body class="option"> <section class="links"> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor"> @@ -20,42 +21,57 @@ </svg> <a href="../general/general.html">General</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-icon.png" /> <a href="../youtube/youtube.html">YouTube</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-music-icon.png" /> <a href="../youtubeMusic/youtubeMusic.html">YT Music</a> </div> + <div class="title"> <img src="../../../assets/images/twitter-icon.png" /> <a href="../twitter/twitter.html">Twitter</a> </div> + <div class="title"> <img src="../../../assets/images/instagram-icon.png" /> <a href="../instagram/instagram.html">Instagram</a> </div> + <div class="title"> <img src="../../../assets/images/tiktok-icon.png" /> <a href="../tiktok/tiktok.html">TikTok</a> </div> + <div class="title"> <img src="../../../assets/images/reddit-icon.png" /> <a href="../reddit/reddit.html">Reddit</a> </div> + <div class="title"> <img src="../../../assets/images/imgur-icon.png" /> <a href="../imgur/imgur.html">Imgur</a> </div> + <div class="title"> <img src="../../../assets/images/pixiv-icon.svg" /> <a href="../pixiv/pixiv.html" class="selected">Pixiv</a> </div> + + <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html">Spotify</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> + <div class="title"> <!-- https://markentier.tech/posts/2020/10/medium-icon-svg/ --> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor"> @@ -65,14 +81,17 @@ </svg> <a href="../medium/medium.html">Medium</a> </div> + <div class="title"> <img src="../../../assets/images/peertube-icon.svg" /> <a href="../peertube/peertube.html">Peertube</a> </div> + <div class="title"> <img src="../../../assets/images/lbry-icon.png" /> <a href="../lbry/lbry.html">LBRY/Odysee</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -81,6 +100,7 @@ </svg> <a href="../search/search.html">Search</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -89,6 +109,7 @@ </svg> <a href="../translate/translate.html">Translate</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -96,6 +117,7 @@ </svg> <a href="../maps/maps.html">Maps</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -103,6 +125,7 @@ </svg> <a href="../sendTargets/sendTargets.html">Send Files</a> </div> + </section> <section class="option-block"> diff --git a/src/pages/options/reddit/reddit.html b/src/pages/options/reddit/reddit.html index 97f5093b..a9c0b9bc 100644 --- a/src/pages/options/reddit/reddit.html +++ b/src/pages/options/reddit/reddit.html @@ -12,6 +12,7 @@ <body class="option"> <section class="links"> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor"> @@ -20,42 +21,57 @@ </svg> <a href="../general/general.html">General</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-icon.png" /> <a href="../youtube/youtube.html">YouTube</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-music-icon.png" /> <a href="../youtubeMusic/youtubeMusic.html">YT Music</a> </div> + <div class="title"> <img src="../../../assets/images/twitter-icon.png" /> <a href="../twitter/twitter.html">Twitter</a> </div> + <div class="title"> <img src="../../../assets/images/instagram-icon.png" /> <a href="../instagram/instagram.html">Instagram</a> </div> + <div class="title"> <img src="../../../assets/images/tiktok-icon.png" /> <a href="../tiktok/tiktok.html">TikTok</a> </div> + <div class="title"> <img src="../../../assets/images/reddit-icon.png" /> <a href="../reddit/reddit.html" class="selected">Reddit</a> </div> + <div class="title"> <img src="../../../assets/images/imgur-icon.png" /> <a href="../imgur/imgur.html">Imgur</a> </div> + <div class="title"> <img src="../../../assets/images/pixiv-icon.svg" /> <a href="../pixiv/pixiv.html">Pixiv</a> </div> + + <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html">Spotify</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> + <div class="title"> <!-- https://markentier.tech/posts/2020/10/medium-icon-svg/ --> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor"> @@ -65,14 +81,17 @@ </svg> <a href="../medium/medium.html">Medium</a> </div> + <div class="title"> <img src="../../../assets/images/peertube-icon.svg" /> <a href="../peertube/peertube.html">Peertube</a> </div> + <div class="title"> <img src="../../../assets/images/lbry-icon.png" /> <a href="../lbry/lbry.html">LBRY/Odysee</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -81,6 +100,7 @@ </svg> <a href="../search/search.html">Search</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -89,6 +109,7 @@ </svg> <a href="../translate/translate.html">Translate</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -96,6 +117,7 @@ </svg> <a href="../maps/maps.html">Maps</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -103,6 +125,7 @@ </svg> <a href="../sendTargets/sendTargets.html">Send Files</a> </div> + </section> diff --git a/src/pages/options/search/search.html b/src/pages/options/search/search.html index 6683c299..3539dbe2 100644 --- a/src/pages/options/search/search.html +++ b/src/pages/options/search/search.html @@ -12,6 +12,7 @@ <body class="option"> <section class="links"> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor"> @@ -20,42 +21,57 @@ </svg> <a href="../general/general.html">General</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-icon.png" /> <a href="../youtube/youtube.html">YouTube</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-music-icon.png" /> <a href="../youtubeMusic/youtubeMusic.html">YT Music</a> </div> + <div class="title"> <img src="../../../assets/images/twitter-icon.png" /> <a href="../twitter/twitter.html">Twitter</a> </div> + <div class="title"> <img src="../../../assets/images/instagram-icon.png" /> <a href="../instagram/instagram.html">Instagram</a> </div> + <div class="title"> <img src="../../../assets/images/tiktok-icon.png" /> <a href="../tiktok/tiktok.html">TikTok</a> </div> + <div class="title"> <img src="../../../assets/images/reddit-icon.png" /> <a href="../reddit/reddit.html">Reddit</a> </div> + <div class="title"> <img src="../../../assets/images/imgur-icon.png" /> <a href="../imgur/imgur.html">Imgur</a> </div> + <div class="title"> <img src="../../../assets/images/pixiv-icon.svg" /> <a href="../pixiv/pixiv.html">Pixiv</a> </div> + + <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html">Spotify</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> + <div class="title"> <!-- https://markentier.tech/posts/2020/10/medium-icon-svg/ --> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor"> @@ -65,14 +81,17 @@ </svg> <a href="../medium/medium.html">Medium</a> </div> + <div class="title"> <img src="../../../assets/images/peertube-icon.svg" /> <a href="../peertube/peertube.html">Peertube</a> </div> + <div class="title"> <img src="../../../assets/images/lbry-icon.png" /> <a href="../lbry/lbry.html">LBRY/Odysee</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -81,6 +100,7 @@ </svg> <a href="../search/search.html" class="selected">Search</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -89,6 +109,7 @@ </svg> <a href="../translate/translate.html">Translate</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -96,6 +117,7 @@ </svg> <a href="../maps/maps.html">Maps</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -103,6 +125,7 @@ </svg> <a href="../sendTargets/sendTargets.html">Send Files</a> </div> + </section> <section class="option-block"> diff --git a/src/pages/options/sendTargets/sendTargets.html b/src/pages/options/sendTargets/sendTargets.html index 983db907..76a794a5 100644 --- a/src/pages/options/sendTargets/sendTargets.html +++ b/src/pages/options/sendTargets/sendTargets.html @@ -53,6 +53,10 @@ <a href="../pixiv/pixiv.html">Pixiv</a> </div> <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html">Spotify</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> diff --git a/src/pages/options/spotify/spotify.html b/src/pages/options/spotify/spotify.html new file mode 100644 index 00000000..9bf08ef9 --- /dev/null +++ b/src/pages/options/spotify/spotify.html @@ -0,0 +1,198 @@ +<!DOCTYPE html> +<html lang="en"> + +<head> + <meta charset="UTF-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg" /> + <link href="../../stylesheets/styles.css" rel="stylesheet" /> + <title>LibRedirect Options: TikTok</title> +</head> + +<body class="option"> + <section class="links"> + + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" + width="26px" fill="currentColor"> + <path + d="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z" /> + </svg> + <a href="../general/general.html">General</a> + </div> + + <div class="title"> + <img src="../../../assets/images/youtube-icon.png" /> + <a href="../youtube/youtube.html">YouTube</a> + </div> + + <div class="title"> + <img src="../../../assets/images/youtube-music-icon.png" /> + <a href="../youtubeMusic/youtubeMusic.html">YT Music</a> + </div> + + <div class="title"> + <img src="../../../assets/images/twitter-icon.png" /> + <a href="../twitter/twitter.html">Twitter</a> + </div> + <div class="title"> + <img src="../../../assets/images/instagram-icon.png" /> + <a href="../instagram/instagram.html">Instagram</a> + </div> + + <div class="title"> + <img src="../../../assets/images/tiktok-icon.png" /> + <a href="../tiktok/tiktok.html" class="selected">TikTok</a> + </div> + + <div class="title"> + <img src="../../../assets/images/reddit-icon.png" /> + <a href="../reddit/reddit.html">Reddit</a> + </div> + + <div class="title"> + <img src="../../../assets/images/imgur-icon.png" /> + <a href="../imgur/imgur.html">Imgur</a> + </div> + + <div class="title"> + <img src="../../../assets/images/pixiv-icon.svg" /> + <a href="../pixiv/pixiv.html">Pixiv</a> + </div> + + <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html">Spotify</a> + </div> + + <div class="title"> + <img src="../../../assets/images/wikipedia-icon.svg" /> + <a href="../wikipedia/wikipedia.html">Wikipedia</a> + </div> + + <div class="title"> + <!-- https://markentier.tech/posts/2020/10/medium-icon-svg/ --> + <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor"> + <circle cx="500" cy="500" r="500" /> + <ellipse ry="475" rx="250" cy="501" cx="1296" /> + <ellipse cx="1682" cy="502" rx="88" ry="424" /> + </svg> + <a href="../medium/medium.html">Medium</a> + </div> + + <div class="title"> + <img src="../../../assets/images/peertube-icon.svg" /> + <a href="../peertube/peertube.html">Peertube</a> + </div> + + <div class="title"> + <img src="../../../assets/images/lbry-icon.png" /> + <a href="../lbry/lbry.html">LBRY/Odysee</a> + </div> + + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path + d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" /> + </svg> + <a href="../search/search.html">Search</a> + </div> + + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path + d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z" /> + </svg> + <a href="../translate/translate.html">Translate</a> + </div> + + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> + <path + d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" /> + </svg> + <a href="../maps/maps.html">Maps</a> + </div> + + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> + <path + d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z" /> + </svg> + <a href="../sendTargets/sendTargets.html">Send Files</a> + </div> + + </section> + + <section class="option-block"> + <div class="some-block option-block"> + <h4>Enable</h4> + <input id="disable-spotify" type="checkbox" checked /> + </div> + + <div class="some-block option-block"> + <h4>Protocol</h4> + <select id="protocol"> + <option value="normal">Normal</option> + <option value="tor">Tor</option> + </select> + </div> + + <hr> + + <div id="normal"> + <div class="some-block option-block"> + <h4>Default Instances</h4> + </div> + <div class="checklist" id="soju-normal-checklist"></div> + <hr> + <div class="some-block option-block"> + <h4>Custom Instances</h4> + </div> + <form id="custom-soju-normal-instance-form"> + <div class="some-block option-block"> + <input id="soju-normal-custom-instance" placeholder="https://soju.com" type="url" /> + <button type="submit" class="add" id="soju-normal-add-instance"> + <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> + </svg> + </button> + </div> + </form> + <div class="checklist" id="soju-normal-custom-checklist"></div> + </div> + <div id="tor"> + <div class="some-block option-block"> + <h4>Default Instances</h4> + </div> + <div class="checklist" id="soju-tor-checklist"></div> + <hr> + <div class="some-block option-block"> + <h4>Custom Instances</h4> + </div> + <form id="custom-soju-tor-instance-form"> + <div class="some-block option-block"> + <input id="soju-tor-custom-instance" placeholder="https://soju.com" type="url" /> + <button type="submit" class="add" id="soju-tor-add-instance"> + <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> + </svg> + </button> + </div> + </form> + <div class="checklist" id="soju-tor-custom-checklist"></div> + </div> + </section> + + + <script type="module" src="../init.js"></script> + <script type="module" src="./spotify.js"></script> + <!-- <script src="../../assets/javascripts/localise.js"></script> --> +</body> + +</html> \ 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/tiktok/tiktok.html b/src/pages/options/tiktok/tiktok.html index 4f82cecd..16e62a31 100644 --- a/src/pages/options/tiktok/tiktok.html +++ b/src/pages/options/tiktok/tiktok.html @@ -12,6 +12,7 @@ <body class="option"> <section class="links"> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor"> @@ -20,14 +21,17 @@ </svg> <a href="../general/general.html">General</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-icon.png" /> <a href="../youtube/youtube.html">YouTube</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-music-icon.png" /> <a href="../youtubeMusic/youtubeMusic.html">YT Music</a> </div> + <div class="title"> <img src="../../../assets/images/twitter-icon.png" /> <a href="../twitter/twitter.html">Twitter</a> @@ -36,26 +40,37 @@ <img src="../../../assets/images/instagram-icon.png" /> <a href="../instagram/instagram.html">Instagram</a> </div> + <div class="title"> <img src="../../../assets/images/tiktok-icon.png" /> <a href="../tiktok/tiktok.html" class="selected">TikTok</a> </div> + <div class="title"> <img src="../../../assets/images/reddit-icon.png" /> <a href="../reddit/reddit.html">Reddit</a> </div> + <div class="title"> <img src="../../../assets/images/imgur-icon.png" /> <a href="../imgur/imgur.html">Imgur</a> </div> + <div class="title"> <img src="../../../assets/images/pixiv-icon.svg" /> <a href="../pixiv/pixiv.html">Pixiv</a> </div> + + <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html">Spotify</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> + <div class="title"> <!-- https://markentier.tech/posts/2020/10/medium-icon-svg/ --> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor"> @@ -65,14 +80,17 @@ </svg> <a href="../medium/medium.html">Medium</a> </div> + <div class="title"> <img src="../../../assets/images/peertube-icon.svg" /> <a href="../peertube/peertube.html">Peertube</a> </div> + <div class="title"> <img src="../../../assets/images/lbry-icon.png" /> <a href="../lbry/lbry.html">LBRY/Odysee</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -81,6 +99,7 @@ </svg> <a href="../search/search.html">Search</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -89,6 +108,7 @@ </svg> <a href="../translate/translate.html">Translate</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -96,6 +116,7 @@ </svg> <a href="../maps/maps.html">Maps</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -103,6 +124,7 @@ </svg> <a href="../sendTargets/sendTargets.html">Send Files</a> </div> + </section> <section class="option-block"> diff --git a/src/pages/options/translate/translate.html b/src/pages/options/translate/translate.html index 34b2ebe5..37a2f2f0 100644 --- a/src/pages/options/translate/translate.html +++ b/src/pages/options/translate/translate.html @@ -12,6 +12,7 @@ <body class="option"> <section class="links"> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor"> @@ -20,42 +21,57 @@ </svg> <a href="../general/general.html">General</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-icon.png" /> <a href="../youtube/youtube.html">YouTube</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-music-icon.png" /> <a href="../youtubeMusic/youtubeMusic.html">YT Music</a> </div> + <div class="title"> <img src="../../../assets/images/twitter-icon.png" /> <a href="../twitter/twitter.html">Twitter</a> </div> + <div class="title"> <img src="../../../assets/images/instagram-icon.png" /> <a href="../instagram/instagram.html">Instagram</a> </div> + <div class="title"> <img src="../../../assets/images/tiktok-icon.png" /> <a href="../tiktok/tiktok.html">TikTok</a> </div> + <div class="title"> <img src="../../../assets/images/reddit-icon.png" /> <a href="../reddit/reddit.html">Reddit</a> </div> + <div class="title"> <img src="../../../assets/images/imgur-icon.png" /> <a href="../imgur/imgur.html">Imgur</a> </div> + <div class="title"> <img src="../../../assets/images/pixiv-icon.svg" /> <a href="../pixiv/pixiv.html">Pixiv</a> </div> + + <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html">Spotify</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> + <div class="title"> <!-- https://markentier.tech/posts/2020/10/medium-icon-svg/ --> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor"> @@ -65,14 +81,17 @@ </svg> <a href="../medium/medium.html">Medium</a> </div> + <div class="title"> <img src="../../../assets/images/peertube-icon.svg" /> <a href="../peertube/peertube.html">Peertube</a> </div> + <div class="title"> <img src="../../../assets/images/lbry-icon.png" /> <a href="../lbry/lbry.html">LBRY/Odysee</a> - </div> + </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -81,6 +100,7 @@ </svg> <a href="../search/search.html">Search</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -89,6 +109,7 @@ </svg> <a href="../translate/translate.html" class="selected">Translate</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -96,6 +117,7 @@ </svg> <a href="../maps/maps.html">Maps</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -103,6 +125,7 @@ </svg> <a href="../sendTargets/sendTargets.html">Send Files</a> </div> + </section> <section class="option-block"> <div class="some-block option-block"> diff --git a/src/pages/options/twitter/twitter.html b/src/pages/options/twitter/twitter.html index 9e4a5d45..33e1d5c9 100644 --- a/src/pages/options/twitter/twitter.html +++ b/src/pages/options/twitter/twitter.html @@ -13,6 +13,7 @@ <body class="option"> <section class="links"> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor"> @@ -21,42 +22,57 @@ </svg> <a href="../general/general.html">General</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-icon.png" /> <a href="../youtube/youtube.html">YouTube</a> </div> + <div class="title"> <img src="../../../assets/images/youtube-music-icon.png" /> <a href="../youtubeMusic/youtubeMusic.html">YT Music</a> </div> + <div class="title"> <img src="../../../assets/images/twitter-icon.png" /> <a href="../twitter/twitter.html" class="selected">Twitter</a> </div> + <div class="title"> <img src="../../../assets/images/instagram-icon.png" /> <a href="../instagram/instagram.html">Instagram</a> </div> + <div class="title"> <img src="../../../assets/images/tiktok-icon.png" /> <a href="../tiktok/tiktok.html">TikTok</a> </div> + <div class="title"> <img src="../../../assets/images/reddit-icon.png" /> <a href="../reddit/reddit.html">Reddit</a> </div> + <div class="title"> <img src="../../../assets/images/imgur-icon.png" /> <a href="../imgur/imgur.html">Imgur</a> </div> + <div class="title"> <img src="../../../assets/images/pixiv-icon.svg" /> <a href="../pixiv/pixiv.html">Pixiv</a> </div> + + <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html">Spotify</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> + <div class="title"> <!-- https://markentier.tech/posts/2020/10/medium-icon-svg/ --> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor"> @@ -66,14 +82,17 @@ </svg> <a href="../medium/medium.html">Medium</a> </div> + <div class="title"> <img src="../../../assets/images/peertube-icon.svg" /> <a href="../peertube/peertube.html">Peertube</a> </div> + <div class="title"> <img src="../../../assets/images/lbry-icon.png" /> <a href="../lbry/lbry.html">LBRY/Odysee</a> - </div> + </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -82,6 +101,7 @@ </svg> <a href="../search/search.html">Search</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -90,6 +110,7 @@ </svg> <a href="../translate/translate.html">Translate</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -97,6 +118,7 @@ </svg> <a href="../maps/maps.html">Maps</a> </div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> <path @@ -104,6 +126,7 @@ </svg> <a href="../sendTargets/sendTargets.html">Send Files</a> </div> + </section> <section class="option-block"> diff --git a/src/pages/options/wikipedia/wikipedia.html b/src/pages/options/wikipedia/wikipedia.html index 1c12ea16..be8bd5ad 100644 --- a/src/pages/options/wikipedia/wikipedia.html +++ b/src/pages/options/wikipedia/wikipedia.html @@ -53,6 +53,10 @@ <a href="../pixiv/pixiv.html">Pixiv</a> </div> <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html">Spotify</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html" class="selected">Wikipedia</a> </div> @@ -72,7 +76,7 @@ <div class="title"> <img src="../../../assets/images/lbry-icon.png" /> <a href="../lbry/lbry.html">LBRY/Odysee</a> - </div> + </div> <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html index 6146171e..ce19aa6c 100644 --- a/src/pages/options/youtube/youtube.html +++ b/src/pages/options/youtube/youtube.html @@ -54,6 +54,10 @@ <a href="../pixiv/pixiv.html">Pixiv</a> </div> <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html">Spotify</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> diff --git a/src/pages/options/youtubeMusic/youtubeMusic.html b/src/pages/options/youtubeMusic/youtubeMusic.html index ca90dcc4..ffa3cca2 100644 --- a/src/pages/options/youtubeMusic/youtubeMusic.html +++ b/src/pages/options/youtubeMusic/youtubeMusic.html @@ -54,6 +54,10 @@ <a href="../pixiv/pixiv.html">Pixiv</a> </div> <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html">Spotify</a> + </div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg" /> <a href="../wikipedia/wikipedia.html">Wikipedia</a> </div> @@ -73,7 +77,7 @@ <div class="title"> <img src="../../../assets/images/lbry-icon.png" /> <a href="../lbry/lbry.html">LBRY/Odysee</a> - </div> + </div> <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html index 419c9590..365de1d1 100644 --- a/src/pages/popup/popup.html +++ b/src/pages/popup/popup.html @@ -77,6 +77,14 @@ <input id="disable-pixiv" type="checkbox" checked /> </div> + <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 id="wikipedia" class="some-block"> <a class="title" href="https://wikipedia.org"> <img src="../../../assets/images/wikipedia-icon.svg" /> @@ -113,7 +121,6 @@ </a> <input id="disable-lbry" type="checkbox" checked /> </div> - <div id="search" class="some-block"> <a class="title" href="http://libredirect.onion"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js index 30630e6c..01dc7265 100644 --- a/src/pages/popup/popup.js +++ b/src/pages/popup/popup.js @@ -15,6 +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 sendTargetsHelper from "../../assets/javascripts/helpers/sendTargets.js"; import peertubeHelper from "../../assets/javascripts/helpers/peertube.js"; import lbryHelper from "../../assets/javascripts/helpers/lbry.js"; @@ -36,6 +37,7 @@ let disableSendTargetsElement = document.getElementById("disable-sendTargets"); let disableImgurElement = document.getElementById("disable-imgur"); let disableTiktokElement = document.getElementById("disable-tiktok"); let disablePixivElement = document.getElementById("disable-pixiv"); +let disableSpotifyElement = document.getElementById("disable-spotify"); async function wholeInit() { await youtubeHelper.init(); @@ -50,6 +52,7 @@ async function wholeInit() { await imgurHelper.init(); await tiktokHelper.init(); await pixivHelper.init(); + await spotifyHelper.init(); await sendTargetsHelper.init(); await peertubeHelper.init(); await lbryHelper.init(); @@ -69,6 +72,7 @@ wholeInit().then(() => { disableImgurElement.checked = !imgurHelper.getDisable(); disableTiktokElement.checked = !tiktokHelper.getDisable(); disablePixivElement.checked = !pixivHelper.getDisable(); + disableSpotifyElement.checked = !spotifyHelper.getDisable(); disableMediumElement.checked = !mediumHelper.getDisable(); disablePeertubeElement.checked = !peertubeHelper.getDisable(); disableLbryElement.checked = !lbryHelper.getDisable(); @@ -126,6 +130,10 @@ disablePixivElement.addEventListener("change", event => pixivHelper.setDisable(!event.target.checked) ); +disableSpotifyElement.addEventListener("change", + event => spotifyHelper.setDisable(!event.target.checked) +); + disableMediumElement.addEventListener("change", event => mediumHelper.setDisable(!event.target.checked) ); |
