diff --git a/README.md b/README.md
index 9a67625..3813ca5 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,6 @@ Instagram => [Bibliogram](https://sr.ht/~cadence/bibliogram/)\
TikTok => [ProxiTok](https://github.com/pablouser1/ProxiTok)\
Reddit => [Libreddit](https://github.com/spikecodes/libreddit#instances), [Teddit](https://codeberg.org/teddit/teddit#instances), [Old Reddit](https://old.reddit.com)\
Imgur => [Rimgo](https://codeberg.org/video-prize-ranch/rimgo)\
-Spotify => [Soju](https://github.com/coffeebank/soju)\
Wikipedia => [Wikiless](https://codeberg.org/orenom/wikiless)\
Medium => [Scribe](https://sr.ht/~edwardloveall/scribe/)\
Peertube => [SimpleerTube](https://git.sr.ht/~metalune/simpleweb_peertube)\
@@ -37,6 +36,12 @@ Send Files => [Send](https://github.com/timvisee/send)
[![Patreon](./img/patreon.svg)](https://patreon.com/LibRedirect)\
BTC: **bc1qrhue0frps6p2vkg978u9ayethnwprtmfug827q**
+[FAQ](https://libredirect.github.io/faq.html)
+
+## Mirror Repos
+[![GitHub](https://raw.githubusercontent.com/ManeraKai/manerakai/main/icons/github.svg)](https://github.com/libredirect/libredirect/)
+[![Codeberg](https://raw.githubusercontent.com/ManeraKai/manerakai/main/icons/codeberg.svg)](https://codeberg.org/LibRedirect/libredirect)
+
## Development
[![Matrix Badge](https://badges.alefvanoon.xyz/matrix/libredirect:matrix.org?label=matrix)](https://matrix.to/#/#libredirect:tokhmi.xyz)
### Install Dependencies
@@ -79,11 +84,5 @@ npm run start
- select `load unpacked extension`
- select `src` folder
-## Mirror Repos
-[![GitHub](https://raw.githubusercontent.com/ManeraKai/manerakai/main/icons/github.svg)](https://github.com/libredirect/libredirect/)
-[![Codeberg](https://raw.githubusercontent.com/ManeraKai/manerakai/main/icons/codeberg.svg)](https://codeberg.org/LibRedirect/libredirect)
-
-
-[FAQ](https://github.com/libredirect/libredirect/wiki/FAQ)\
[Privacy Policy](Privacy-Policy.md)\
-Credits: [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect)
+Credits: [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect)
\ No newline at end of file
diff --git a/img/badge-chromium.png b/img/badge-chromium.png
index 532fcb2..4d3e138 100644
Binary files a/img/badge-chromium.png and b/img/badge-chromium.png differ
diff --git a/pug/options/general/general.pug b/pug/options/general/general.pug
index 34efa64..b5b46d5 100644
--- a/pug/options/general/general.pug
+++ b/pug/options/general/general.pug
@@ -120,12 +120,6 @@ body.option(dir="auto")
|Reddit
input#reddit(type="checkbox")
- div
- div
- img(src="../../../assets/images/spotify-icon.png")
- |Spotify
- input#spotify(type="checkbox")
-
div
div
svg(xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor")
diff --git a/pug/options/spotify/spotify.pug b/pug/options/spotify/spotify.pug
deleted file mode 100644
index 9795141..0000000
--- a/pug/options/spotify/spotify.pug
+++ /dev/null
@@ -1,24 +0,0 @@
-doctype html
-html(lang="en")
- include ../../widgets/head.pug
- title General
-script(type="module" src="../../../assets/javascripts/localise.js")
-body.option(dir="auto")
- include ../../widgets/links.pug
- +links('spotify')
-
- section.option-block
- .some-block.option-block
- h4(data-localise="__MSG_enable__") Enable
- input#disable-spotify(type="checkbox")
-
- #soju
- hr
- .normal
- include ../../widgets/instances.pug
- +instances('https://soju.com')
- include ../../widgets/latency.pug
- +latency()
-
- script(type="module" src="../init.js")
- script(type="module" src="./spotify.js")
diff --git a/pug/widgets/links.pug b/pug/widgets/links.pug
index 89eab33..8daf48b 100644
--- a/pug/widgets/links.pug
+++ b/pug/widgets/links.pug
@@ -36,10 +36,6 @@ mixin links(service)
img(src="../../../assets/images/imgur-icon.png")
a(href="../imgur/imgur.html" data-localise="__MSG_imgur__" class=service == "imgur" ? "selected" : "") Imgur
- .title
- img(src="../../../assets/images/spotify-icon.png")
- a(href="../spotify/spotify.html" data-localise="__MSG_spotify__" class=service == "spotify" ? "selected" : "") Spotify
-
.title
img(src="../../../assets/images/wikipedia-icon.svg")
a(href="../wikipedia/wikipedia.html" data-localise="__MSG_wikipedia__" class=service == "wikipedia" ? "selected" : "") Wikipedia
diff --git a/src/_locales/ar/messages.json b/src/_locales/ar/messages.json
index 8769301..731217c 100644
--- a/src/_locales/ar/messages.json
+++ b/src/_locales/ar/messages.json
@@ -99,11 +99,6 @@
"description": "used in general.html"
},
- "spotify": {
- "message": "سبوتيفاي",
- "description": "used in general.html"
- },
-
"medium": {
"message": "ميديام",
"description": "used in general.html"
diff --git a/src/_locales/de/messages.json b/src/_locales/de/messages.json
index 3b5ab01..700e15d 100644
--- a/src/_locales/de/messages.json
+++ b/src/_locales/de/messages.json
@@ -99,11 +99,6 @@
"description": "used in general.html"
},
- "spotify": {
- "message": "Spotify",
- "description": "used in general.html"
- },
-
"medium": {
"message": "Medium",
"description": "used in general.html"
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index e347c66..c52dff6 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -99,11 +99,6 @@
"description": "used in general.html"
},
- "spotify": {
- "message": "Spotify",
- "description": "used in general.html"
- },
-
"medium": {
"message": "Medium",
"description": "used in general.html"
diff --git a/src/assets/javascripts/helpers/general.js b/src/assets/javascripts/helpers/general.js
index 56f76d8..b657062 100644
--- a/src/assets/javascripts/helpers/general.js
+++ b/src/assets/javascripts/helpers/general.js
@@ -110,7 +110,6 @@ let allPopupFrontends = [
"tikTok",
"imgur",
"reddit",
- "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 9ff2c7d..0000000
--- a/src/assets/javascripts/helpers/spotify.js
+++ /dev/null
@@ -1,107 +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",
- ]
- }
-}
-
-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);
- }
- browser.storage.local.set({ sojuNormalRedirectsChecks })
-}
-
-let sojuNormalRedirectsChecks;
-let sojuNormalCustomRedirects;
-let disable; // disableSpotifyTargets
-
-function switchInstance(url) {
- let protocolHost = commonHelper.protocolHost(url);
-
- let sojuList = [
- ...redirects.soju.normal,
- ...sojuNormalCustomRedirects
- ];
-
- if (!sojuList.includes(protocolHost)) return;
-
- let instancesList = [...sojuNormalRedirectsChecks, ...sojuNormalCustomRedirects];
-
- 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 (type != "main_frame") 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;
-
- let instancesList = [...sojuNormalRedirectsChecks, ...sojuNormalCustomRedirects];
- 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 initDefaults() {
- await browser.storage.local.set({
- disableSpotifyTargets: true,
-
- spotifyRedirects: redirects,
-
- sojuNormalRedirectsChecks: [...redirects.soju.normal],
- sojuNormalCustomRedirects: [],
- })
-}
-
-async function init() {
- browser.storage.local.get(
- [
- "disableSpotifyTargets",
-
- "sojuNormalRedirectsChecks",
- "sojuNormalCustomRedirects",
- ],
- r => {
- disable = r.disableSpotifyTargets;
-
- sojuNormalRedirectsChecks = r.sojuNormalRedirectsChecks;
- sojuNormalCustomRedirects = r.sojuNormalCustomRedirects;
- }
- )
-}
-
-export default {
- setRedirects,
-
- switchInstance,
-
- redirect,
- initDefaults,
- init,
-};
diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index b54da6c..bea688c 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -14,7 +14,7 @@ import tiktokHelper from "../../assets/javascripts/helpers/tiktok.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";
@@ -39,7 +39,6 @@ browser.runtime.onInstalled.addListener(async details => {
sendTargetsHelper.initDefaults();
peertubeHelper.initDefaults();
lbryHelper.initDefaults();
- spotifyHelper.initDefaults();
})
}
})
@@ -60,7 +59,6 @@ async function wholeInit() {
await sendTargetsHelper.init();
await peertubeHelper.init();
await lbryHelper.init();
- await spotifyHelper.init();
await generalHelper.init();
}
@@ -114,8 +112,6 @@ 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)
@@ -196,8 +192,6 @@ async function redirectOfflineInstance(url, tabId) {
if (!newUrl) newUrl = lbryHelper.switchInstance(url);
- if (!newUrl) newUrl = spotifyHelper.switchInstance(url);
-
if (newUrl) {
if (counter >= 5) {
browser.tabs.update(tabId, { url: `/pages/errors/instance_offline.html?url=${encodeURIComponent(newUrl)}` });
diff --git a/src/pages/background/incognito.js b/src/pages/background/incognito.js
index 035700d..6e02347 100644
--- a/src/pages/background/incognito.js
+++ b/src/pages/background/incognito.js
@@ -14,7 +14,6 @@ import tiktokHelper from "../../assets/javascripts/helpers/tiktok.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";
@@ -36,7 +35,6 @@ async function wholeInit() {
await sendTargetsHelper.init();
await peertubeHelper.init();
await lbryHelper.init();
- await spotifyHelper.init();
await generalHelper.init();
}
await wholeInit();
diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html
index 7f21046..c8a8b3f 100644
--- a/src/pages/options/general/general.html
+++ b/src/pages/options/general/general.html
@@ -22,7 +22,6 @@
-
-
-
Spotify
-
-