@@ -305,7 +305,7 @@ async function testLatency(element, instances) {
let text;
if (m == 5000) text = '5000ms+'
- else if (m > 5000) text = m - 5000
+ else if (m > 5000) text = `ERROR: ${m - 5000}`;
else text = `${m}ms`;
element.innerHTML = `${href}:
${text}`;
}
@@ -336,13 +336,144 @@ function getCookiesFromStorage(frontend, to, name) {
)
}
+function copyRaw() {
+ browser.tabs.query(
+ { active: true, currentWindow: true }, tabs => {
+ let currTab = tabs[0];
+ if (currTab) {
+ let url = new URL(currTab.url);
+ let newUrl;
+ newUrl = youtubeHelper.reverse(url);
+
+ if (!newUrl) newUrl = twitterHelper.reverse(url);
+ if (!newUrl) newUrl = instagramHelper.reverse(url);
+ if (!newUrl) newUrl = tiktokHelper.reverse(url);
+ if (!newUrl) newUrl = imgurHelper.reverse(url);
+
+ if (newUrl) {
+ navigator.clipboard.writeText(newUrl);
+ const textElement = copyRawElement.getElementsByTagName('h4')[0]
+ const oldHtml = textElement.innerHTML;
+ textElement.innerHTML = 'Copied';
+ setTimeout(() => textElement.innerHTML = oldHtml, 1000);
+ }
+ }
+ }
+ )
+}
+
+
+function unify() {
+ browser.tabs.query(
+ { active: true, currentWindow: true },
+ async tabs => {
+ let currTab = tabs[0]
+ if (currTab) {
+ let url = new URL(currTab.url);
+
+ let result = await youtubeHelper.initInvidiousCookies(url);
+ if (!result) result = await youtubeHelper.initPipedLocalStorage(url, currTab.id);
+ if (!result) result = await youtubeHelper.initPipedMaterialLocalStorage(url, currTab.id);
+
+ if (!result) result = await twitterHelper.initNitterCookies(url);
+
+ if (!result) result = await redditHelper.initLibredditCookies(url);
+ if (!result) result = await redditHelper.initTedditCookies(url);
+
+ if (!result) result = await searchHelper.initSearxCookies(url);
+ if (!result) result = await searchHelper.initSearxngCookies(url);
+
+ if (!result) result = await tiktokHelper.initProxiTokCookies(url);
+
+ if (!result) result = await wikipediaHelper.initWikilessCookies(url);
+
+ if (!result) result = await translateHelper.initSimplyTranslateCookies(url);
+ if (!result) result = await translateHelper.initLingvaLocalStorage(url);
+
+ if (result) {
+ const textElement = unifyElement.getElementsByTagName('h4')[0]
+ const oldHtml = textElement.innerHTML;
+ textElement.innerHTML = 'Unified';
+ setTimeout(() => textElement.innerHTML = oldHtml, 1000);
+ }
+ }
+ }
+ )
+}
+
+function switchInstance() {
+ browser.tabs.query({ active: true, currentWindow: true }, async tabs => {
+ let currTab = tabs[0];
+ if (currTab) {
+ let url = new URL(currTab.url);
+ let newUrl;
+ newUrl = await youtubeHelper.switchInstance(url);
+ if (!newUrl) newUrl = await twitterHelper.switchInstance(url);
+ if (!newUrl) newUrl = await instagramHelper.switchInstance(url);
+ if (!newUrl) newUrl = await redditHelper.switchInstance(url);
+ if (!newUrl) newUrl = await searchHelper.switchInstance(url);
+ if (!newUrl) newUrl = await translateHelper.switchInstance(url);
+ if (!newUrl) newUrl = await mediumHelper.switchInstance(url);
+ if (!newUrl) newUrl = await sendTargetsHelper.switchInstance(url);
+ if (!newUrl) newUrl = await peertubeHelper.switchInstance(url);
+ if (!newUrl) newUrl = await lbryHelper.switchInstance(url);
+ if (!newUrl) newUrl = await imgurHelper.switchInstance(url);
+ if (!newUrl) newUrl = await wikipediaHelper.switchInstance(url);
+
+ if (newUrl) {
+ browser.tabs.update({ url: newUrl });
+ return true;
+ }
+ }
+ })
+ return false;
+}
+
+function latency(name, frontend, document, location, splitNames) {
+ let latencyElement;
+ let latencyLabel;
+ if (splitNames == true) {
+ latencyElement = document.getElementById(`latency-${frontend}`);
+ latencyLabel = document.getElementById(`latency-${frontend}-label`);
+ } else {
+ latencyElement = document.getElementById("latency");
+ latencyLabel = document.getElementById("latency-label");
+ }
+ latencyElement.addEventListener("click",
+ async () => {
+ let reloadWindow = () => location.reload();
+ latencyElement.addEventListener("click", reloadWindow);
+ let key = `${name}Redirects`
+ browser.storage.local.get(
+ key,
+ r => {
+ let redirects = r[key];
+ const oldHtml = latencyLabel.innerHTML;
+ latencyLabel.innerHTML = '...';
+ testLatency(latencyLabel, redirects[frontend].normal).then(r => {
+ browser.storage.local.set({ [`${frontend}Latency`]: r });
+ latencyLabel.innerHTML = oldHtml;
+ processDefaultCustomInstances(name, frontend, 'normal', document);
+ latencyElement.removeEventListener("click", reloadWindow)
+ });
+ }
+ )
+ }
+ );
+}
+
+
+
export default {
getRandomInstance,
updateInstances,
protocolHost,
processDefaultCustomInstances,
isRtl,
- testLatency,
+ latency,
copyCookie,
getCookiesFromStorage,
+ switchInstance,
+ copyRaw,
+ unify,
}
diff --git a/src/assets/javascripts/helpers/wikipedia.js b/src/assets/javascripts/helpers/wikipedia.js
index a8acb09..c870bff 100644
--- a/src/assets/javascripts/helpers/wikipedia.js
+++ b/src/assets/javascripts/helpers/wikipedia.js
@@ -1,6 +1,6 @@
window.browser = window.browser || window.chrome;
-import commonHelper from './common.js'
+import utils from './utils.js'
const targets = /^https?:\/{2}(([a-z]{1,}\.){0,})wikipedia\.org/
@@ -63,7 +63,7 @@ function initWikilessCookies(from) {
"wikilessI2pCustomRedirects",
],
r => {
- let protocolHost = commonHelper.protocolHost(from);
+ let protocolHost = utils.protocolHost(from);
if (![
...r.wikilessNormalRedirectsChecks,
...r.wikilessNormalCustomRedirects,
@@ -79,8 +79,8 @@ function initWikilessCookies(from) {
else if (r.wikipediaProtocol == 'i2p') checkedInstances = [...r.wikilessI2pRedirectsChecks, ...r.wikilessI2pCustomRedirects]
for (const to of checkedInstances) {
- commonHelper.copyCookie('wikiless', from, to, 'theme');
- commonHelper.copyCookie('wikiless', from, to, 'default_lang');
+ utils.copyCookie('wikiless', from, to, 'theme');
+ utils.copyCookie('wikiless', from, to, 'default_lang');
}
resolve(true);
}
@@ -104,76 +104,112 @@ function setWikilessCookies() {
if (r.wikipediaProtocol == 'normal') checkedInstances = [...r.wikilessNormalRedirectsChecks, ...r.wikilessNormalCustomRedirects]
else if (r.wikipediaProtocol == 'tor') checkedInstances = [...r.wikilessTorRedirectsChecks, ...r.wikilessTorCustomRedirects]
for (const to of checkedInstances) {
- commonHelper.getCookiesFromStorage('wikiless', to, 'theme');
- commonHelper.getCookiesFromStorage('wikiless', to, 'default_lang');
+ utils.getCookiesFromStorage('wikiless', to, 'theme');
+ utils.getCookiesFromStorage('wikiless', to, 'default_lang');
}
}
)
}
function redirect(url) {
- if (disable) return;
- if (!targets.test(url.href)) return;
+ return new Promise(resolve => {
+ browser.storage.local.get(
+ [
+ "disableWikipedia",
+ "wikipediaRedirects",
+ "wikipediaProtocol",
- let GETArguments = [];
- if (url.search.length > 0) {
- let search = url.search.substring(1); //get rid of '?'
- let argstrings = search.split("&");
- for (let i = 0; i < argstrings.length; i++) {
- let args = argstrings[i].split("=");
- GETArguments.push([args[0], args[1]]);
- }
- }
- let instancesList;
- if (protocol == 'normal') instancesList = [...wikilessNormalRedirectsChecks, ...wikilessNormalCustomRedirects];
- else if (protocol == 'tor') instancesList = [...wikilessTorRedirectsChecks, ...wikilessTorCustomRedirects];
- else if (protocol == 'i2p') instancesList = [...wikilessI2pRedirectsChecks, ...wikilessI2pCustomRedirects];
- if (instancesList.length === 0) return null;
- let randomInstance = commonHelper.getRandomInstance(instancesList)
+ "wikilessNormalRedirectsChecks",
+ "wikilessTorRedirectsChecks",
+ "wikilessI2pRedirectsChecks",
+ "wikilessNormalCustomRedirects",
+ "wikilessTorCustomRedirects",
+ "wikilessI2pCustomRedirects",
+ ],
+ r => {
+ if (r.disableWikipedia) { resolve(); return; }
+ if (!targets.test(url.href)) { resolve(); return; }
- let link = `${randomInstance}${url.pathname}`;
- let urlSplit = url.host.split(".");
- if (urlSplit[0] != "wikipedia" && urlSplit[0] != "www") {
- if (urlSplit[0] == "m")
- GETArguments.push(["mobileaction", "toggle_view_mobile"]);
- else
- GETArguments.push(["lang", urlSplit[0]]);
- if (urlSplit[1] == "m")
- GETArguments.push(["mobileaction", "toggle_view_mobile"]);
- // wikiless doesn't have mobile view support yet
- }
- for (let i = 0; i < GETArguments.length; i++)
- link += (i == 0 ? "?" : "&") + GETArguments[i][0] + "=" + GETArguments[i][1];
+ let GETArguments = [];
+ if (url.search.length > 0) {
+ let search = url.search.substring(1); //get rid of '?'
+ let argstrings = search.split("&");
+ for (let i = 0; i < argstrings.length; i++) {
+ let args = argstrings[i].split("=");
+ GETArguments.push([args[0], args[1]]);
+ }
+ }
+ let instancesList;
+ if (r.wikipediaProtocol == 'normal') instancesList = [...r.wikilessNormalRedirectsChecks, ...r.wikilessNormalCustomRedirects];
+ else if (r.wikipediaProtocol == 'tor') instancesList = [...r.wikilessTorRedirectsChecks, ...r.wikilessTorCustomRedirects];
+ else if (r.wikipediaProtocol == 'i2p') instancesList = [...r.wikilessI2pRedirectsChecks, ...r.wikilessI2pCustomRedirects];
+ if (instancesList.length === 0) { resolve(); return; }
+ let randomInstance = utils.getRandomInstance(instancesList)
- return link;
+ let link = `${randomInstance}${url.pathname}`;
+ let urlSplit = url.host.split(".");
+ if (urlSplit[0] != "wikipedia" && urlSplit[0] != "www") {
+ if (urlSplit[0] == "m")
+ GETArguments.push(["mobileaction", "toggle_view_mobile"]);
+ else
+ GETArguments.push(["lang", urlSplit[0]]);
+ if (urlSplit[1] == "m")
+ GETArguments.push(["mobileaction", "toggle_view_mobile"]);
+ // wikiless doesn't have mobile view support yet
+ }
+ for (let i = 0; i < GETArguments.length; i++)
+ link += (i == 0 ? "?" : "&") + GETArguments[i][0] + "=" + GETArguments[i][1];
+
+ resolve(link);
+ }
+ )
+ })
}
function switchInstance(url) {
- let protocolHost = commonHelper.protocolHost(url);
+ return new Promise(resolve => {
+ browser.storage.local.get(
+ [
+ "wikipediaRedirects",
+ "wikipediaProtocol",
- let wikipediaList = [
- ...redirects.wikiless.normal,
- ...redirects.wikiless.tor,
- ...redirects.wikiless.i2p,
+ "wikilessNormalRedirectsChecks",
+ "wikilessTorRedirectsChecks",
- ...wikilessNormalCustomRedirects,
- ...wikilessTorCustomRedirects,
- ...wikilessI2pCustomRedirects
- ]
- if (!wikipediaList.includes(protocolHost)) return null;
+ "wikilessI2pRedirectsChecks",
+ "wikilessNormalCustomRedirects",
- let instancesList;
- if (protocol == 'normal') instancesList = [...wikilessNormalCustomRedirects, ...wikilessNormalRedirectsChecks];
- else if (protocol == 'tor') instancesList = [...wikilessTorCustomRedirects, ...wikilessTorRedirectsChecks];
- else if (protocol == 'i2p') instancesList = [...wikilessI2pCustomRedirects, ...wikilessI2pRedirectsChecks];
+ "wikilessTorCustomRedirects",
+ "wikilessI2pCustomRedirects",
+ ],
+ r => {
+ let protocolHost = utils.protocolHost(url);
- let index = instancesList.indexOf(protocolHost);
- if (index > -1) instancesList.splice(index, 1);
+ let wikipediaList = [
+ ...r.wikipediaRedirects.wikiless.normal,
+ ...r.wikipediaRedirects.wikiless.tor,
+ ...r.wikipediaRedirects.wikiless.i2p,
- if (instancesList.length === 0) return null;
+ ...r.wikilessNormalCustomRedirects,
+ ...r.wikilessTorCustomRedirects,
+ ...r.wikilessI2pCustomRedirects
+ ]
+ if (!wikipediaList.includes(protocolHost)) resolve();
- let randomInstance = commonHelper.getRandomInstance(instancesList);
- return `${randomInstance}${url.pathname}${url.search}`;
+ let instancesList;
+ if (r.wikipediaProtocol == 'normal') instancesList = [...r.wikilessNormalCustomRedirects, ...r.wikilessNormalRedirectsChecks];
+ else if (r.wikipediaProtocol == 'tor') instancesList = [...r.wikilessTorCustomRedirects, ...r.wikilessTorRedirectsChecks];
+ else if (r.wikipediaProtocol == 'i2p') instancesList = [...r.wikilessI2pCustomRedirects, ...r.wikilessI2pRedirectsChecks];
+
+ let index = instancesList.indexOf(protocolHost);
+ if (index > -1) instancesList.splice(index, 1);
+ if (instancesList.length === 0) resolve();
+
+ let randomInstance = utils.getRandomInstance(instancesList);
+ resolve(`${randomInstance}${url.pathname}${url.search}`);
+ }
+ )
+ })
}
async function initDefaults() {
@@ -201,37 +237,6 @@ async function initDefaults() {
})
}
-async function init() {
- browser.storage.local.get(
- [
- "disableWikipedia",
- "wikipediaRedirects",
- "wikipediaProtocol",
-
- "wikilessNormalRedirectsChecks",
- "wikilessTorRedirectsChecks",
- "wikilessI2pRedirectsChecks",
- "wikilessNormalCustomRedirects",
- "wikilessTorCustomRedirects",
- "wikilessI2pCustomRedirects",
- ],
- r => {
- disable = r.disableWikipedia;
- protocol = r.wikipediaProtocol;
- redirects = r.wikipediaRedirects;
-
- wikilessNormalRedirectsChecks = r.wikilessNormalRedirectsChecks;
- wikilessNormalCustomRedirects = r.wikilessNormalCustomRedirects;
-
- wikilessTorRedirectsChecks = r.wikilessTorRedirectsChecks;
- wikilessTorCustomRedirects = r.wikilessTorCustomRedirects;
-
- wikilessI2pRedirectsChecks = r.wikilessI2pRedirectsChecks;
- wikilessI2pCustomRedirects = r.wikilessI2pCustomRedirects;
- }
- );
-}
-
export default {
getRedirects,
setRedirects,
@@ -241,6 +246,5 @@ export default {
redirect,
initDefaults,
- init,
switchInstance,
};
diff --git a/src/assets/javascripts/helpers/youtube/youtube.js b/src/assets/javascripts/helpers/youtube/youtube.js
index 31cc444..27cc539 100644
--- a/src/assets/javascripts/helpers/youtube/youtube.js
+++ b/src/assets/javascripts/helpers/youtube/youtube.js
@@ -2,7 +2,7 @@
window.browser = window.browser || window.chrome;
-import commonHelper from '../common.js'
+import utils from '../utils.js'
const targets = [
/^https?:\/{2}(www\.|music\.|m\.|)youtube\.com(\/.*|$)/,
@@ -34,7 +34,32 @@ let redirects = {
}
};
-const getRedirects = () => redirects;
+function setRedirects(val) {
+ browser.storage.local.get('cloudflareList', async r => {
+ redirects.invidious = val.invidious;
+ redirects.piped = val.piped;
+ invidiousNormalRedirectsChecks = [...redirects.invidious.normal];
+ pipedNormalRedirectsChecks = [...redirects.piped.normal];
+
+ for (const instance of r.cloudflareList) {
+ let i;
+
+ i = invidiousNormalRedirectsChecks.indexOf(instance);
+ if (i > -1) invidiousNormalRedirectsChecks.splice(i, 1);
+
+ i = pipedNormalRedirectsChecks.indexOf(instance);
+ if (i > -1) pipedNormalRedirectsChecks.splice(i, 1);
+ }
+
+ browser.storage.local.set({
+ youtubeRedirects: redirects,
+ invidiousNormalRedirectsChecks,
+ invidiousTorRedirectsChecks: redirects.invidious.tor,
+ pipedNormalRedirectsChecks,
+ pipedTorRedirectsChecks: redirects.piped.tor,
+ })
+ })
+}
let
invidiousNormalRedirectsChecks,
@@ -54,226 +79,238 @@ let
pipedMaterialTorRedirectsChecks,
pipedMaterialTorCustomRedirects;
-let
- disable,
- protocol,
- OnlyEmbeddedVideo,
- frontend,
- youtubeEmbedFrontend;
-
function redirect(url, details, initiator) {
- if (disable) return null;
-
- let protocolHost = commonHelper.protocolHost(url);
-
- if (!targets.some(rx => rx.test(url.href))) return null;
-
- if (
- initiator && (
+ return new Promise(resolve => {
+ browser.storage.local.get(
[
- ...redirects.invidious.normal,
- ...invidiousNormalCustomRedirects,
- ...redirects.invidious.tor,
- ...invidiousTorCustomRedirects,
+ "disableYoutube",
+ "OnlyEmbeddedVideo",
+ "youtubeFrontend",
+ "youtubeProtocol",
+ "youtubeEmbedFrontend",
- ...redirects.piped.normal,
- ...redirects.piped.tor,
- ...pipedNormalCustomRedirects,
- ...pipedTorCustomRedirects
- ].includes(initiator.origin)
+ "youtubeRedirects",
+
+ "invidiousNormalRedirectsChecks",
+ "invidiousNormalCustomRedirects",
+
+ "invidiousTorRedirectsChecks",
+ "invidiousTorCustomRedirects",
+
+ "pipedNormalRedirectsChecks",
+ "pipedNormalCustomRedirects",
+
+ "pipedTorRedirectsChecks",
+ "pipedTorCustomRedirects",
+
+ "pipedMaterialNormalRedirectsChecks",
+ "pipedMaterialNormalCustomRedirects",
+
+ "pipedMaterialTorRedirectsChecks",
+ "pipedMaterialTorCustomRedirects",
+ ],
+ r => {
+ if (r.disableYoutube) { resolve(); return; }
+ if (!targets.some(rx => rx.test(url.href))) { resolve(); return; }
+
+ if (
+ initiator && (
+ [
+ ...r.youtubeRedirects.invidious.normal,
+ ...r.invidiousNormalCustomRedirects,
+ ...r.youtubeRedirects.invidious.tor,
+ ...r.invidiousTorCustomRedirects,
+
+ ...r.youtubeRedirects.piped.normal,
+ ...r.youtubeRedirects.piped.tor,
+ ...r.pipedNormalCustomRedirects,
+ ...r.pipedTorCustomRedirects
+ ].includes(initiator.origin)
+ )
+ ) { resolve('BYPASSTAB'); return; }
+
+ if (url.pathname.match(/iframe_api/) || url.pathname.match(/www-widgetapi/)) { resolve(); return; } // Don't redirect YouTube Player API.
+
+ if (r.youtubeFrontend == 'yatte' && details.type === "main_frame")
+ resolve(url.href.replace(/^https?:\/{2}/, 'yattee://'));
+
+ else if (r.youtubeFrontend == 'freetube' && details.type === "main_frame")
+ resolve(`freetube://https:${url.pathname}${url.search}`);
+
+ else if (r.youtubeFrontend == 'freetube' && details.type !== "main_frame" && r.youtubeEmbedFrontend == "youtube")
+ resolve();
+
+ else if (
+ r.youtubeFrontend == 'invidious' ||
+ ((r.youtubeFrontend == 'freetube' || r.youtubeFrontend == 'yatte') && r.youtubeEmbedFrontend == 'invidious' && details.type == "sub_frame")
+ ) {
+
+ if (r.OnlyEmbeddedVideo == 'onlyEmbedded' && details.type !== "sub_frame") { resolve(); return; }
+ if (
+ r.OnlyEmbeddedVideo == 'onlyNotEmbedded' && details.type !== "main_frame" &&
+ !((r.youtubeFrontend == 'freetube' || r.youtubeFrontend == 'yatte') && r.youtubeEmbedFrontend == 'invidious' && details.type === "sub_frame")
+ ) { resolve(); return; }
+
+ let instancesList;
+ if (r.youtubeProtocol == 'normal') instancesList = [...r.invidiousNormalRedirectsChecks, ...r.invidiousNormalCustomRedirects];
+ else if (r.youtubeProtocol == 'tor') instancesList = [...r.invidiousTorRedirectsChecks, ...r.invidiousTorCustomRedirects];
+ if (instancesList.length === 0) { resolve(); return; }
+ let randomInstance = utils.getRandomInstance(instancesList);
+
+ resolve(`${randomInstance}${url.pathname}${url.search}`);
+
+ } else if (
+ r.youtubeFrontend == 'piped' ||
+ ((r.youtubeFrontend == 'freetube' || r.youtubeFrontend == 'yatte') && r.youtubeEmbedFrontend == 'piped' && details.type === "sub_frame")
+ ) {
+
+ if (r.OnlyEmbeddedVideo == 'onlyEmbedded' && details.type !== "sub_frame") { resolve(); return; }
+ if (
+ r.OnlyEmbeddedVideo == 'onlyNotEmbedded' && details.type !== "main_frame" &&
+ !((r.youtubeFrontend == 'freetube' || r.youtubeFrontend == 'yatte') && r.youtubeEmbedFrontend == 'piped' && details.type == "sub_frame")
+ ) { resolve(); return; }
+
+ let instancesList;
+ if (r.youtubeProtocol == 'normal') instancesList = [...r.pipedNormalRedirectsChecks, ...r.pipedNormalCustomRedirects];
+ else if (r.youtubeProtocol == 'tor') instancesList = [...r.pipedTorRedirectsChecks, ...r.pipedTorCustomRedirects];
+ if (instancesList.length === 0) { resolve(); return; }
+ let randomInstance = utils.getRandomInstance(instancesList);
+
+ resolve(`${randomInstance}${url.pathname}${url.search}`)
+ }
+ else if (r.youtubeFrontend == 'pipedMaterial' ||
+ ((r.youtubeFrontend == 'freetube' || r.youtubeFrontend == 'yatte') && r.youtubeEmbedFrontend == 'pipedMaterial' && details.type === "sub_frame")) {
+ if (r.OnlyEmbeddedVideo == 'onlyEmbedded' && details.type !== "sub_frame") { resolve(); return; }
+ if (
+ r.OnlyEmbeddedVideo == 'onlyNotEmbedded' && details.type !== "main_frame" &&
+ !((r.youtubeFrontend == 'freetube' || r.youtubeFrontend == 'yatte') && r.youtubeEmbedFrontend == 'pipedMaterial' && details.type == "sub_frame")
+ ) { resolve(); return; }
+
+ let instancesList;
+ if (r.youtubeProtocol == 'normal') instancesList = [...r.pipedMaterialNormalRedirectsChecks, ...r.pipedMaterialNormalCustomRedirects];
+ else if (r.youtubeProtocol == 'tor') instancesList = [...r.pipedMaterialTorRedirectsChecks, ...r.pipedMaterialTorCustomRedirects];
+ let randomInstance = utils.getRandomInstance(instancesList);
+
+ resolve(`${randomInstance}${url.pathname}${url.search}`);
+ }
+ else resolve('CANCEL');
+ }
)
- ) return 'BYPASSTAB';
-
- if (url.pathname.match(/iframe_api/) || url.pathname.match(/www-widgetapi/)) return null; // Don't redirect YouTube Player API.
-
- if (frontend == 'yatte' && details.type === "main_frame")
- return url.href.replace(/^https?:\/{2}/, 'yattee://');
-
- else if (frontend == 'freetube' && details.type === "main_frame") {
- return `freetube://https:${url.pathname}${url.search}`;
- }
-
- else if (frontend == 'freetube' && details.type !== "main_frame" && youtubeEmbedFrontend == "youtube")
- return null;
-
- else if (
- frontend == 'invidious' ||
- ((frontend == 'freetube' || frontend == 'yatte') && youtubeEmbedFrontend == 'invidious' && details.type == "sub_frame")
- ) {
-
- if (OnlyEmbeddedVideo == 'onlyEmbedded' && details.type !== "sub_frame") return null;
- if (
- OnlyEmbeddedVideo == 'onlyNotEmbedded' && details.type !== "main_frame" &&
- !((frontend == 'freetube' || frontend == 'yatte') && youtubeEmbedFrontend == 'invidious' && details.type === "sub_frame")
- ) return null;
-
- let instancesList;
- if (protocol == 'normal') instancesList = [...invidiousNormalRedirectsChecks, ...invidiousNormalCustomRedirects];
- else if (protocol == 'tor') instancesList = [...invidiousTorRedirectsChecks, ...invidiousTorCustomRedirects];
- if (instancesList.length === 0) return null;
- let randomInstance = commonHelper.getRandomInstance(instancesList);
-
- return `${randomInstance}${url.pathname}${url.search}`;
-
- } else if (
- frontend == 'piped' ||
- ((frontend == 'freetube' || frontend == 'yatte') && youtubeEmbedFrontend == 'piped' && details.type === "sub_frame")
- ) {
-
- if (OnlyEmbeddedVideo == 'onlyEmbedded' && details.type !== "sub_frame") return null;
- if (
- OnlyEmbeddedVideo == 'onlyNotEmbedded' && details.type !== "main_frame" &&
- !((frontend == 'freetube' || frontend == 'yatte') && youtubeEmbedFrontend == 'piped' && details.type == "sub_frame")
- ) return null;
-
- let instancesList;
- if (protocol == 'normal') instancesList = [...pipedNormalRedirectsChecks, ...pipedNormalCustomRedirects];
- else if (protocol == 'tor') instancesList = [...pipedTorRedirectsChecks, ...pipedTorCustomRedirects];
- if (instancesList.length === 0) return null;
- let randomInstance = commonHelper.getRandomInstance(instancesList);
-
- return `${randomInstance}${url.pathname}${url.search}`;
- }
- else if (frontend == 'pipedMaterial' ||
- ((frontend == 'freetube' || frontend == 'yatte') && youtubeEmbedFrontend == 'pipedMaterial' && details.type === "sub_frame")) {
- if (OnlyEmbeddedVideo == 'onlyEmbedded' && details.type !== "sub_frame") return null;
- if (
- OnlyEmbeddedVideo == 'onlyNotEmbedded' && details.type !== "main_frame" &&
- !((frontend == 'freetube' || frontend == 'yatte') && youtubeEmbedFrontend == 'pipedMaterial' && details.type == "sub_frame")
- ) return null;
-
- let instancesList;
- if (protocol == 'normal') instancesList = [...pipedMaterialNormalRedirectsChecks, ...pipedMaterialNormalCustomRedirects];
- else if (protocol == 'tor') instancesList = [...pipedMaterialTorRedirectsChecks, ...pipedMaterialTorCustomRedirects];
- let randomInstance = commonHelper.getRandomInstance(instancesList);
-
- return `${randomInstance}${url.pathname}${url.search}`;
- }
- return 'CANCEL';
+ })
}
function reverse(url) {
- browser.storage.local.get(
- [
- "youtubeRedirects",
- "invidiousNormalCustomRedirects",
- "invidiousTorCustomRedirects",
- "pipedNormalCustomRedirects",
- "pipedTorCustomRedirects",
- ],
- r => {
- let protocolHost = commonHelper.protocolHost(url);
- if (![
- ...r.youtubeRedirects.invidious.normal,
- ...r.youtubeRedirects.invidious.tor,
+ return new Promise(resolve => {
+ browser.storage.local.get(
+ [
+ "youtubeRedirects",
+ "invidiousNormalCustomRedirects",
+ "invidiousTorCustomRedirects",
+ "pipedNormalCustomRedirects",
+ "pipedTorCustomRedirects",
+ "pipedMaterialNormalCustomRedirects",
+ "pipedMaterialTorCustomRedirects",
+ ],
+ r => {
+ let protocolHost = utils.protocolHost(url);
+ if (![
+ ...r.youtubeRedirects.invidious.normal,
+ ...r.youtubeRedirects.invidious.tor,
- ...r.youtubeRedirects.piped.normal,
- ...r.youtubeRedirects.piped.tor,
+ ...r.youtubeRedirects.piped.normal,
+ ...r.youtubeRedirects.piped.tor,
- ...r.invidiousNormalCustomRedirects,
- ...r.invidiousTorCustomRedirects,
+ ...r.youtubeRedirects.pipedMaterial.normal,
+ ...r.youtubeRedirects.pipedMaterial.tor,
- ...r.pipedNormalCustomRedirects,
- ...r.pipedTorCustomRedirects,
- ].includes(protocolHost)) return;
+ ...r.invidiousNormalCustomRedirects,
+ ...r.invidiousTorCustomRedirects,
- return `https://youtube.com${url.pathname}${url.search}`;
- })
+ ...r.pipedNormalCustomRedirects,
+ ...r.pipedTorCustomRedirects,
+
+ ...r.pipedMaterialNormalCustomRedirects,
+ ...r.pipedMaterialTorCustomRedirects,
+ ].includes(protocolHost)) { resolve(); return; }
+
+ resolve(`https://youtube.com${url.pathname}${url.search}`);
+ })
+ })
}
function switchInstance(url) {
- let protocolHost = commonHelper.protocolHost(url);
- if (
- protocol == 'normal' &&
- ![
- ...redirects.invidious.normal,
- ...redirects.piped.normal,
- ...redirects.pipedMaterial.normal,
+ return new Promise(resolve => {
+ browser.storage.local.get(
+ [
+ "youtubeRedirects",
+ "youtubeFrontend",
+ "youtubeProtocol",
- ...invidiousNormalCustomRedirects,
- ...pipedNormalCustomRedirects,
- ...pipedMaterialNormalCustomRedirects
- ].includes(protocolHost)
- ) return null;
+ "invidiousNormalRedirectsChecks",
+ "invidiousNormalCustomRedirects",
- if (protocol == 'tor' &&
- ![
- ...redirects.invidious.tor,
- ...redirects.piped.tor,
- ...redirects.pipedMaterial.tor,
+ "invidiousTorRedirectsChecks",
+ "invidiousTorCustomRedirects",
- ...invidiousTorCustomRedirects,
- ...pipedTorCustomRedirects,
- ...pipedMaterialTorCustomRedirects
- ].includes(protocolHost)
- ) return null;
+ "pipedNormalRedirectsChecks",
+ "pipedNormalCustomRedirects",
- let instancesList;
- if (frontend == 'invidious') {
- if (protocol == 'normal') instancesList = [...invidiousNormalRedirectsChecks, ...invidiousNormalCustomRedirects];
- else if (protocol == 'tor') instancesList = [...invidiousTorRedirectsChecks, ...invidiousTorCustomRedirects];
- }
- else if (frontend == 'piped') {
- if (protocol == 'normal') instancesList = [...pipedNormalRedirectsChecks, ...pipedNormalCustomRedirects];
- else if (protocol == 'tor') instancesList = [...pipedTorRedirectsChecks, ...pipedTorCustomRedirects];
- }
- else if (frontend == 'pipedMaterial') {
- if (protocol == 'normal') instancesList = [...pipedMaterialNormalRedirectsChecks, ...pipedMaterialNormalCustomRedirects];
- else if (protocol == 'tor') instancesList = [...pipedMaterialTorRedirectsChecks, ...pipedMaterialTorCustomRedirects];
- }
+ "pipedTorRedirectsChecks",
+ "pipedTorCustomRedirects",
- let index = instancesList.indexOf(protocolHost);
- if (index > -1) instancesList.splice(index, 1);
+ "pipedMaterialNormalRedirectsChecks",
+ "pipedMaterialNormalCustomRedirects",
- if (instancesList.length == 0) return null;
- let randomInstance = commonHelper.getRandomInstance(instancesList);
- return `${randomInstance}${url.pathname}${url.search}`;
+ "pipedMaterialTorRedirectsChecks",
+ "pipedMaterialTorCustomRedirects",
+ ],
+ r => {
+ let protocolHost = utils.protocolHost(url);
+ if (![
+ ...r.youtubeRedirects.invidious.normal,
+ ...r.youtubeRedirects.invidious.tor,
+
+ ...r.youtubeRedirects.piped.normal,
+ ...r.youtubeRedirects.piped.tor,
+
+ ...r.youtubeRedirects.pipedMaterial.normal,
+ ...r.youtubeRedirects.pipedMaterial.tor,
+
+ ...r.invidiousNormalCustomRedirects,
+ ...r.invidiousTorCustomRedirects,
+
+ ...r.pipedNormalCustomRedirects,
+ ...r.pipedTorCustomRedirects,
+
+ ...r.pipedMaterialNormalCustomRedirects,
+ ...r.pipedMaterialTorCustomRedirects
+ ].includes(protocolHost)) { resolve(); return; }
+
+
+ let instancesList;
+ if (r.youtubeProtocol == 'normal') {
+ if (r.youtubeFrontend == 'invidious') instancesList = [...r.invidiousNormalRedirectsChecks, ...r.invidiousNormalCustomRedirects];
+ else if (r.youtubeFrontend == 'piped') instancesList = [...r.pipedNormalRedirectsChecks, ...r.pipedNormalCustomRedirects];
+ else if (r.youtubeFrontend == 'pipedMaterial') instancesList = [...r.pipedMaterialNormalRedirectsChecks, ...r.pipedMaterialNormalCustomRedirects];
+ }
+ else if (r.youtubeProtocol == 'tor') {
+ if (r.youtubeFrontend == 'invidious') instancesList = [...r.invidiousTorRedirectsChecks, ...r.invidiousTorCustomRedirects];
+ else if (r.youtubeFrontend == 'piped') instancesList = [...r.pipedTorRedirectsChecks, ...r.pipedTorCustomRedirects];
+ else if (r.youtubeFrontend == 'pipedMaterial') instancesList = [...r.pipedMaterialTorRedirectsChecks, ...r.pipedMaterialTorCustomRedirects];
+ }
+
+ let index = instancesList.indexOf(protocolHost);
+ if (index > -1) instancesList.splice(index, 1);
+ if (instancesList.length == 0) { resolve(); return; }
+
+ let randomInstance = utils.getRandomInstance(instancesList);
+ resolve(`${randomInstance}${url.pathname}${url.search}`);
+ }
+ )
+ })
}
-function isPipedorInvidious(url, type, frontend) {
- init();
- let protocolHost = commonHelper.protocolHost(url);
-
- if (type !== "main_frame" && type !== "sub_frame") return false;
-
- if (frontend == 'invidious')
- return [
- ...redirects.invidious.normal,
- ...redirects.invidious.tor,
- ...invidiousNormalCustomRedirects,
- ...invidiousTorCustomRedirects,
- ].includes(protocolHost);
-
- if (frontend == 'piped')
- return [
- ...redirects.piped.normal,
- ...redirects.piped.tor,
- ...pipedNormalCustomRedirects,
- ...pipedTorCustomRedirects,
- ].includes(protocolHost);
-
- if (frontend == 'pipedMaterial')
- return [
- ...redirects.pipedMaterial.normal,
- ...redirects.pipedMaterial.tor,
- ...pipedMaterialNormalCustomRedirects,
- ...pipedMaterialTorCustomRedirects,
- ].includes(protocolHost);
-
- return [
- ...redirects.invidious.normal,
- ...redirects.invidious.tor,
- ...invidiousNormalCustomRedirects,
- ...invidiousTorCustomRedirects,
-
- ...redirects.piped.normal,
- ...redirects.piped.tor,
- ...pipedNormalCustomRedirects,
- ...pipedTorCustomRedirects,
- ].includes(protocolHost);
-}
-
-async function initDefaults() {
+function initDefaults() {
return new Promise(async resolve => {
fetch('/instances/data.json').then(response => response.text()).then(async data => {
let dataJson = JSON.parse(data);
@@ -334,71 +371,7 @@ async function initDefaults() {
})
}
-async function init() {
- return new Promise(
- resolve => {
- browser.storage.local.get(
- [
- "disableYoutube",
- "OnlyEmbeddedVideo",
- "youtubeRedirects",
- "youtubeFrontend",
-
- "invidiousNormalRedirectsChecks",
- "invidiousNormalCustomRedirects",
-
- "invidiousTorRedirectsChecks",
- "invidiousTorCustomRedirects",
-
- "pipedNormalRedirectsChecks",
- "pipedNormalCustomRedirects",
-
- "pipedTorRedirectsChecks",
- "pipedTorCustomRedirects",
-
- "pipedMaterialNormalRedirectsChecks",
- "pipedMaterialNormalCustomRedirects",
-
- "pipedMaterialTorRedirectsChecks",
- "pipedMaterialTorCustomRedirects",
-
- "youtubeEmbedFrontend",
- "youtubeProtocol",
- ],
- r => {
- redirects = r.youtubeRedirects;
-
- disable = r.disableYoutube;
- protocol = r.youtubeProtocol;
- frontend = r.youtubeFrontend;
-
- invidiousNormalRedirectsChecks = r.invidiousNormalRedirectsChecks;
- invidiousNormalCustomRedirects = r.invidiousNormalCustomRedirects;
-
- invidiousTorRedirectsChecks = r.invidiousTorRedirectsChecks;
- invidiousTorCustomRedirects = r.invidiousTorCustomRedirects;
-
- pipedNormalRedirectsChecks = r.pipedNormalRedirectsChecks;
- pipedNormalCustomRedirects = r.pipedNormalCustomRedirects;
-
- pipedTorRedirectsChecks = r.pipedTorRedirectsChecks;
- pipedTorCustomRedirects = r.pipedTorCustomRedirects;
-
- pipedMaterialNormalRedirectsChecks = r.pipedMaterialNormalRedirectsChecks;
- pipedMaterialNormalCustomRedirects = r.pipedMaterialNormalCustomRedirects;
-
- pipedMaterialTorRedirectsChecks = r.pipedMaterialTorRedirectsChecks;
- pipedMaterialTorCustomRedirects = r.pipedMaterialTorCustomRedirects;
-
- youtubeEmbedFrontend = r.youtubeEmbedFrontend;
- OnlyEmbeddedVideo = r.OnlyEmbeddedVideo;
-
- resolve();
- });
- })
-}
-
-async function initInvidiousCookies(from) {
+function initInvidiousCookies(from) {
return new Promise(resolve => {
browser.storage.local.get(
[
@@ -409,18 +382,18 @@ async function initInvidiousCookies(from) {
"invidiousTorCustomRedirects",
],
r => {
- let protocolHost = commonHelper.protocolHost(from);
+ let protocolHost = utils.protocolHost(from);
if (![
...r.invidiousNormalRedirectsChecks,
...r.invidiousTorRedirectsChecks,
...r.invidiousNormalCustomRedirects,
...r.invidiousTorCustomRedirects,
- ].includes(protocolHost)) return;
+ ].includes(protocolHost)) { resolve(); return; }
let checkedInstances;
if (r.youtubeProtocol == 'normal') checkedInstances = [...r.invidiousNormalRedirectsChecks, ...r.invidiousNormalCustomRedirects]
else if (r.youtubeProtocol == 'tor') checkedInstances = [...r.invidiousTorRedirectsChecks, ...r.invidiousTorCustomRedirects]
for (const to of checkedInstances)
- commonHelper.copyCookie('invidious', from, to, 'PREFS');
+ utils.copyCookie('invidious', from, to, 'PREFS');
resolve(true);
}
)
@@ -444,12 +417,12 @@ function setInvidiousCookies() {
if (r.youtubeProtocol == 'normal') checkedInstances = [...r.invidiousNormalRedirectsChecks, ...r.invidiousNormalCustomRedirects]
else if (r.youtubeProtocol == 'tor') checkedInstances = [...r.invidiousTorRedirectsChecks, ...r.invidiousTorCustomRedirects]
for (const to of checkedInstances)
- commonHelper.getCookiesFromStorage('invidious', to, 'PREFS');
+ utils.getCookiesFromStorage('invidious', to, 'PREFS');
}
)
}
-async function initPipedLocalStorage(url, tabId) {
+function initPipedLocalStorage(url, tabId) {
return new Promise(resolve => {
browser.storage.local.get(
[
@@ -459,13 +432,13 @@ async function initPipedLocalStorage(url, tabId) {
"pipedTorCustomRedirects",
],
r => {
- let protocolHost = commonHelper.protocolHost(url);
+ let protocolHost = utils.protocolHost(url);
if (![
...r.pipedNormalCustomRedirects,
...r.pipedNormalRedirectsChecks,
...r.pipedTorRedirectsChecks,
...r.pipedTorCustomRedirects,
- ].includes(protocolHost)) resolve();
+ ].includes(protocolHost)) { resolve(); return; }
browser.tabs.executeScript(
tabId,
{
@@ -479,38 +452,40 @@ async function initPipedLocalStorage(url, tabId) {
})
}
-async function setPipedLocalStorage(url, tabId) {
- browser.storage.local.get(
- [
- "disableYoutube",
- "youtubeFrontend",
- "pipedNormalRedirectsChecks",
- "pipedNormalCustomRedirects",
- "pipedTorRedirectsChecks",
- "pipedTorCustomRedirects",
- ],
- r => {
- if (!r.disableYoutube && r.youtubeFrontend == 'pipedMaterial') return;
- let protocolHost = commonHelper.protocolHost(url);
- if (![
- ...r.pipedNormalRedirectsChecks,
- ...r.pipedTorRedirectsChecks,
- ...r.pipedNormalCustomRedirects,
- ...r.pipedTorCustomRedirects,
- ].includes(protocolHost)) return;
- browser.tabs.executeScript(
- tabId,
- {
- file: "/assets/javascripts/helpers/youtube/set_piped_preferences.js",
- runAt: "document_start"
- }
- );
- return true;
- }
- )
+function setPipedLocalStorage(url, tabId) {
+ return new Promise(resolve => {
+ browser.storage.local.get(
+ [
+ "disableYoutube",
+ "youtubeFrontend",
+ "pipedNormalRedirectsChecks",
+ "pipedNormalCustomRedirects",
+ "pipedTorRedirectsChecks",
+ "pipedTorCustomRedirects",
+ ],
+ r => {
+ if (!r.disableYoutube && r.youtubeFrontend == 'pipedMaterial') { resolve(); return; }
+ let protocolHost = utils.protocolHost(url);
+ if (![
+ ...r.pipedNormalRedirectsChecks,
+ ...r.pipedTorRedirectsChecks,
+ ...r.pipedNormalCustomRedirects,
+ ...r.pipedTorCustomRedirects,
+ ].includes(protocolHost)) { resolve(); return; }
+ browser.tabs.executeScript(
+ tabId,
+ {
+ file: "/assets/javascripts/helpers/youtube/set_piped_preferences.js",
+ runAt: "document_start"
+ }
+ );
+ resolve(true);
+ }
+ )
+ })
}
-async function initPipedMaterialLocalStorage(tabId) {
+function initPipedMaterialLocalStorage(tabId) {
return new Promise(resolve => {
browser.storage.local.get(
[
@@ -520,13 +495,13 @@ async function initPipedMaterialLocalStorage(tabId) {
"pipedMaterialTorCustomRedirects",
],
r => {
- const protocolHost = commonHelper.protocolHost(url);
+ const protocolHost = utils.protocolHost(url);
if (![
...r.pipedMaterialNormalCustomRedirects,
...r.pipedMaterialNormalRedirectsChecks,
...r.pipedMaterialTorRedirectsChecks,
...r.pipedMaterialTorCustomRedirects,
- ].includes(protocolHost)) return;
+ ].includes(protocolHost)) { resolve(); return; }
browser.tabs.executeScript(
tabId,
{
@@ -540,79 +515,91 @@ async function initPipedMaterialLocalStorage(tabId) {
})
}
-async function setPipedMaterialLocalStorage(url, tabId) {
- browser.storage.local.get(
- [
- "disableYoutube",
- "youtubeFrontend",
- "pipedMaterialNormalRedirectsChecks",
- "pipedMaterialTorRedirectsChecks",
- "pipedMaterialNormalCustomRedirects",
- "pipedMaterialTorCustomRedirects",
- ],
- r => {
- if (r.disableYoutube || r.youtubeFrontend != 'pipedMaterial') return;
- const protocolHost = commonHelper.protocolHost(url);
- if (![
- ...r.pipedMaterialNormalRedirectsChecks,
- ...r.pipedMaterialTorRedirectsChecks,
- ...r.pipedMaterialNormalCustomRedirects,
- ...r.pipedMaterialTorCustomRedirects,
- ].includes(protocolHost)) return;
- browser.tabs.executeScript(
- tabId,
- {
- file: "/assets/javascripts/helpers/youtube/set_pipedMaterial_preferences.js",
- runAt: "document_start"
- }
- );
- return true;
- }
- )
+function setPipedMaterialLocalStorage(url, tabId) {
+ return new Promise(resolve => {
+ browser.storage.local.get(
+ [
+ "disableYoutube",
+ "youtubeFrontend",
+ "pipedMaterialNormalRedirectsChecks",
+ "pipedMaterialTorRedirectsChecks",
+ "pipedMaterialNormalCustomRedirects",
+ "pipedMaterialTorCustomRedirects",
+ ],
+ r => {
+ if (r.disableYoutube || r.youtubeFrontend != 'pipedMaterial') { resolve(); return; }
+ const protocolHost = utils.protocolHost(url);
+ if (![
+ ...r.pipedMaterialNormalRedirectsChecks,
+ ...r.pipedMaterialTorRedirectsChecks,
+ ...r.pipedMaterialNormalCustomRedirects,
+ ...r.pipedMaterialTorCustomRedirects,
+ ].includes(protocolHost)) { resolve(); return; }
+ browser.tabs.executeScript(
+ tabId,
+ {
+ file: "/assets/javascripts/helpers/youtube/set_pipedMaterial_preferences.js",
+ runAt: "document_start"
+ }
+ );
+ resolve(true);
+ }
+ )
+ })
}
function removeXFrameOptions(e) {
- const url = new URL(e.url);
- let protocolHost = commonHelper.protocolHost(url);
- const list = [
- ...redirects.invidious.normal,
- ...invidiousNormalCustomRedirects,
- ...redirects.invidious.tor,
- ...invidiousTorCustomRedirects,
+ return new Promise(resolve => {
+ browser.storage.local.get(
+ [
+ "youtubeRedirects",
+ "pipedMaterialNormalRedirectsChecks",
+ "pipedMaterialTorRedirectsChecks",
+ "invidiousNormalCustomRedirects",
+ "invidiousTorCustomRedirects",
+ ],
+ r => {
+ const url = new URL(e.url);
+ let protocolHost = utils.protocolHost(url);
+ const list = [
+ ...r.youtubeRedirects.invidious.normal,
+ ...r.youtubeRedirects.invidious.tor,
+ ...r.youtubeRedirects.piped.normal,
+ ...r.youtubeRedirects.piped.tor,
- ...redirects.piped.normal,
- ...redirects.piped.tor,
- ...pipedNormalCustomRedirects,
- ...pipedTorCustomRedirects
- ];
- if (!list.includes(protocolHost) || e.type != 'sub_frame') return;
- let isChanged = false;
- for (const i in e.responseHeaders) if (e.responseHeaders[i].name == 'x-frame-options') {
- e.responseHeaders.splice(i, 1);
- isChanged = true;
- }
- if (isChanged) return { responseHeaders: e.responseHeaders };
+ ...r.invidiousNormalCustomRedirects,
+ ...r.invidiousTorCustomRedirects,
+
+ ...r.pipedNormalCustomRedirects,
+ ...r.pipedTorCustomRedirects
+ ];
+ if (!list.includes(protocolHost) || e.type != 'sub_frame') { resolve(); return; }
+ let isChanged = false;
+ for (const i in e.responseHeaders) if (e.responseHeaders[i].name == 'x-frame-options') {
+ e.responseHeaders.splice(i, 1);
+ isChanged = true;
+ }
+ if (isChanged) resolve({ responseHeaders: e.responseHeaders });
+ })
+ })
}
export default {
+ setRedirects,
initPipedMaterialLocalStorage,
setPipedLocalStorage,
setPipedMaterialLocalStorage,
initInvidiousCookies,
setInvidiousCookies,
- getRedirects,
redirect,
reverse,
switchInstance,
- isPipedorInvidious,
-
initPipedLocalStorage,
initDefaults,
- init,
removeXFrameOptions,
};
diff --git a/src/assets/javascripts/helpers/youtubeMusic.js b/src/assets/javascripts/helpers/youtubeMusic.js
index 9854914..1b194c1 100644
--- a/src/assets/javascripts/helpers/youtubeMusic.js
+++ b/src/assets/javascripts/helpers/youtubeMusic.js
@@ -1,6 +1,6 @@
"use strict";
-import commonHelper from './common.js'
+import utils from './utils.js'
window.browser = window.browser || window.chrome;
@@ -16,55 +16,61 @@ let redirects = {
},
};
-const getRedirects = () => redirects; // youtubeMusicRedirects
+function redirect(url, type, initiator) {
+ return new Promise(resolve => {
+ browser.storage.local.get(
+ [
+ "disableYoutubeMusic",
-let beatbumpNormalRedirectsChecks;
-let beatbumpNormalCustomRedirects = [];
-let disable; // disableYoutubeMusic
+ "beatbumpNormalRedirectsChecks",
+ "beatbumpNormalCustomRedirects",
+ ],
+ r => {
+ /*
+ Video
+ https://music.youtube.com/watch?v=_PkGiKBW-DA&list=RDAMVM_PkGiKBW-DA
+ https://beatbump.ml/listen?id=_PkGiKBW-DA&list=RDAMVM_PkGiKBW-DA
-function isYoutubeMusic(url, initiator) {
- if (disable) return false
- return targets.some(rx => rx.test(url.href));
+ Playlist
+ https://music.youtube.com/playlist?list=PLqxd0OMLeWy64zlwhjouj92ISc38FbOns
+ https://music.youtube.com/playlist?list=PLqxd0OMLeWy7lrJSzt9LnOJjbC1IaruPM
+ https://music.youtube.com/playlist?list=PLQod4DlD72ZMJmOrSNbmEmK_iZ1oXPzKd
+ https://beatbump.ml/playlist/VLPLqxd0OMLeWy64zlwhjouj92ISc38FbOns
+
+ Channel
+ https://music.youtube.com/channel/UCfgmMDI7T5tOQqjnOBRe_wg
+ https://beatbump.ml/artist/UCfgmMDI7T5tOQqjnOBRe_wg
+
+ Albums
+ https://music.youtube.com/playlist?list=OLAK5uy_n-9HVh3cryV2gREZM9Sc0JwEKYjjfi0dU
+ https://music.youtube.com/playlist?list=OLAK5uy_lcr5O1zS8f6WIFI_yxqVp2RK9Dyy2bbw0
+ https://beatbump.ml/release?id=MPREb_3DURc4yEUtD
+ https://beatbump.ml/release?id=MPREb_evaZrV1WNdS
+
+ https://music.youtube.com/playlist?list=OLAK5uy_n6OHVllUZUCnlIY1m-gUaH8uqkN3Y-Ca8
+ https://music.youtube.com/playlist?list=OLAK5uy_nBOTxAc3_RGB82-Z54jdARGxGaCYlpngY
+ https://beatbump.ml/release?id=MPREb_QygdC0wEoLe
+
+ https://music.youtube.com/watch?v=R6gSMSYKhKU&list=OLAK5uy_n-9HVh3cryV2gREZM9Sc0JwEKYjjfi0dU
+ */
+ if (r.disableYoutubeMusic) { resolve(); return; }
+ if (!targets.some(rx => rx.test(url.href))) { resolve(); return; }
+
+ let instancesList = [...r.beatbumpNormalRedirectsChecks, ...r.beatbumpNormalCustomRedirects];
+ if (instancesList.length === 0) { resolve(); return; }
+ let randomInstance = utils.getRandomInstance(instancesList);
+
+ resolve(
+ `${randomInstance}${url.pathname}${url.search}`
+ .replace("/watch?v=", "/listen?id=")
+ .replace("/channel/", "/artist/")
+ .replace("/playlist?list=", "/playlist/VL")
+ );
+ }
+ )
+ })
}
-function redirect(url, type) {
- // Video
- // https://music.youtube.com/watch?v=_PkGiKBW-DA&list=RDAMVM_PkGiKBW-DA
- // https://beatbump.ml/listen?id=_PkGiKBW-DA&list=RDAMVM_PkGiKBW-DA
-
- // Playlist
- // https://music.youtube.com/playlist?list=PLqxd0OMLeWy64zlwhjouj92ISc38FbOns
- // https://music.youtube.com/playlist?list=PLqxd0OMLeWy7lrJSzt9LnOJjbC1IaruPM
- // https://music.youtube.com/playlist?list=PLQod4DlD72ZMJmOrSNbmEmK_iZ1oXPzKd
- // https://beatbump.ml/playlist/VLPLqxd0OMLeWy64zlwhjouj92ISc38FbOns
-
- // Channel
- // https://music.youtube.com/channel/UCfgmMDI7T5tOQqjnOBRe_wg
- // https://beatbump.ml/artist/UCfgmMDI7T5tOQqjnOBRe_wg
-
- // Albums
- // https://music.youtube.com/playlist?list=OLAK5uy_n-9HVh3cryV2gREZM9Sc0JwEKYjjfi0dU
- // https://music.youtube.com/playlist?list=OLAK5uy_lcr5O1zS8f6WIFI_yxqVp2RK9Dyy2bbw0
- // https://beatbump.ml/release?id=MPREb_3DURc4yEUtD
- // https://beatbump.ml/release?id=MPREb_evaZrV1WNdS
-
- // https://music.youtube.com/playlist?list=OLAK5uy_n6OHVllUZUCnlIY1m-gUaH8uqkN3Y-Ca8
- // https://music.youtube.com/playlist?list=OLAK5uy_nBOTxAc3_RGB82-Z54jdARGxGaCYlpngY
- // https://beatbump.ml/release?id=MPREb_QygdC0wEoLe
-
- // https://music.youtube.com/watch?v=R6gSMSYKhKU&list=OLAK5uy_n-9HVh3cryV2gREZM9Sc0JwEKYjjfi0dU
-
- let instancesList = [...beatbumpNormalRedirectsChecks, ...beatbumpNormalCustomRedirects];
- if (instancesList.length === 0) return null;
- let randomInstance = commonHelper.getRandomInstance(instancesList);
-
- return `${randomInstance}${url.pathname}${url.search}`
- .replace("/watch?v=", "/listen?id=")
- .replace("/channel/", "/artist/")
- .replace("/playlist?list=", "/playlist/VL");
-}
-
-
async function initDefaults() {
await browser.storage.local.set({
disableYoutubeMusic: true,
@@ -75,27 +81,7 @@ async function initDefaults() {
})
}
-async function init() {
- browser.storage.local.get(
- [
- "disableYoutubeMusic",
-
- "beatbumpNormalRedirectsChecks",
- "beatbumpNormalCustomRedirects",
- ],
- r => {
- disable = r.disableYoutubeMusic;
-
- beatbumpNormalRedirectsChecks = r.beatbumpNormalRedirectsChecks;
- beatbumpNormalCustomRedirects = r.beatbumpNormalCustomRedirects;
- });
-}
-
export default {
- getRedirects,
redirect,
- isYoutubeMusic,
-
initDefaults,
- init,
};
diff --git a/src/manifest.json b/src/manifest.json
index f826947..5101211 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -60,9 +60,21 @@
"default": "Alt+Shift+L"
},
"description": "__MSG_switchInstance__"
+ },
+ "copyRaw": {
+ "suggested_key": {
+ "default": "Alt+Shift+C"
+ },
+ "description": "Copies the original link. Ex: Copies the original twitter link when in while nitter website"
+ },
+ "unify": {
+ "suggested_key": {
+ "default": "Alt+Shift+U"
+ },
+ "description": "Copies the preferences (cookies, localStorage) from the current opened instance and copy them to all the other selected instances"
}
},
"default_locale": "en",
"update_url": "https://raw.githubusercontent.com/libredirect/libredirect/master/src/updates/updates.xml",
"key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAroWDSoSRZ1scj+eJRrvnhJbrqXTKnhQuxs6+AJg16sqr0bsMdFV+MSY4i4xnK+K5WOYkBliWXgUyk/wzicoAjOnSJddrL/Md4FuWHI2NVIkrlsLOrYkygi5OLqGPajRH/w8Cdmg7KzEpXe/OnYV0/qS8li8huEdTzdeLdhfbiVl1j3DOr4OJALQ7mPeeNFHFo/oVQ+OkSezWLezA5jUGfhtzPYV6u1TXzX7lCi8E/BbDbwkvvXOMcjXCv08kjdLOY2djCA2a6zr0xAb3q8DlexAMZ8vMof7AQRFtBKhLc9n9VFoipMMdBOVQQj/eIcRILBrmkcZNnJxFKiHNJ+NcZQIDAQAB"
-}
+}
\ No newline at end of file
diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index d112e00..d8f0bb3 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -16,6 +16,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 utils from "../../assets/javascripts/helpers/utils.js";
window.browser = window.browser || window.chrome;
@@ -55,21 +56,9 @@ browser.runtime.onInstalled.addListener(
)
async function wholeInit() {
- await youtubeHelper.init();
- await youtubeMusicHelper.init();
- await twitterHelper.init();
- await instagramHelper.init();
await mapsHelper.init();
- await searchHelper.init();
- await translateHelper.init();
- await mediumHelper.init();
- await redditHelper.init();
- await wikipediaHelper.init();
- await imgurHelper.init();
- await tiktokHelper.init();
await sendTargetsHelper.init();
await peertubeHelper.init();
- await lbryHelper.init();
await generalHelper.init();
}
@@ -97,22 +86,21 @@ browser.webRequest.onBeforeRequest.addListener(
else if (details.initiator)
initiator = new URL(details.initiator);
- let newUrl = youtubeHelper.redirect(url, details, initiator)
- if (youtubeMusicHelper.isYoutubeMusic(url, initiator)) newUrl = youtubeMusicHelper.redirect(url, details.type)
-
- if (!newUrl) newUrl = twitterHelper.redirect(url, initiator);
- if (!newUrl) newUrl = instagramHelper.redirect(url, details.type, initiator);
+ let newUrl = await youtubeHelper.redirect(url, details, initiator)
+ if (!newUrl) newUrl = await youtubeMusicHelper.redirect(url, details.type)
+ if (!newUrl) newUrl = await twitterHelper.redirect(url, initiator);
+ if (!newUrl) newUrl = await instagramHelper.redirect(url, details.type, initiator);
if (!newUrl) newUrl = await mapsHelper.redirect(url, initiator);
- if (!newUrl) newUrl = redditHelper.redirect(url, details.type, initiator);
- if (!newUrl) newUrl = mediumHelper.redirect(url, details.type, initiator);
- if (!newUrl) newUrl = imgurHelper.redirect(url, details.type, initiator);
- if (!newUrl) newUrl = tiktokHelper.redirect(url, details.type, initiator);
- if (!newUrl) newUrl = sendTargetsHelper.redirect(url, details.type, initiator);
- if (!newUrl) newUrl = peertubeHelper.redirect(url, details.type, initiator);
- if (!newUrl) newUrl = lbryHelper.redirect(url, details.type, initiator);
- if (!newUrl) newUrl = translateHelper.redirect(url);
- if (!newUrl) newUrl = searchHelper.redirect(url)
- if (!newUrl) newUrl = wikipediaHelper.redirect(url);
+ if (!newUrl) newUrl = await redditHelper.redirect(url, details.type, initiator);
+ if (!newUrl) newUrl = await mediumHelper.redirect(url, details.type, initiator);
+ if (!newUrl) newUrl = await imgurHelper.redirect(url, details.type, initiator);
+ if (!newUrl) newUrl = await tiktokHelper.redirect(url, details.type, initiator);
+ if (!newUrl) newUrl = await sendTargetsHelper.redirect(url, details.type, initiator);
+ if (!newUrl) newUrl = await peertubeHelper.redirect(url, details.type, initiator);
+ if (!newUrl) newUrl = await lbryHelper.redirect(url, details.type, initiator);
+ if (!newUrl) newUrl = await translateHelper.redirect(url);
+ if (!newUrl) newUrl = await searchHelper.redirect(url)
+ if (!newUrl) newUrl = await wikipediaHelper.redirect(url);
if (
details.frameAncestors && details.frameAncestors.length > 0 &&
@@ -229,35 +217,13 @@ browser.tabs.onUpdated.addListener(
}
);
-async function changeWholeInstance(url) {
- await wholeInit();
- let newUrl = youtubeHelper.switchInstance(url);
- if (!newUrl) newUrl = twitterHelper.switchInstance(url);
- if (!newUrl) newUrl = instagramHelper.switchInstance(url);
- if (!newUrl) newUrl = redditHelper.switchInstance(url);
- if (!newUrl) newUrl = searchHelper.switchInstance(url);
- if (!newUrl) newUrl = translateHelper.switchInstance(url);
- if (!newUrl) newUrl = mediumHelper.switchInstance(url);
- if (!newUrl) newUrl = sendTargetsHelper.switchInstance(url);
- if (!newUrl) newUrl = peertubeHelper.switchInstance(url);
- if (!newUrl) newUrl = imgurHelper.switchInstance(url);
- if (!newUrl) newUrl = wikipediaHelper.switchInstance(url);
- return newUrl;
-}
+
browser.commands.onCommand.addListener(
command => {
- if (command === 'switchInstance')
- browser.tabs.query(
- { active: true, currentWindow: true },
- tabs => {
- let url;
- try { url = new URL(tabs[0].url); }
- catch (_) { return }
- let newUrl = changeWholeInstance(url);
- if (newUrl) browser.tabs.update({ url: newUrl });
- }
- );
+ if (command === 'switchInstance') utils.switchInstance();
+ else if (command == 'copyRaw') utils.copyRaw();
+ else if (command == 'unify') utils.unify();
}
)
@@ -273,16 +239,24 @@ browser.contextMenus.create({
contexts: ["browser_action"]
});
+browser.contextMenus.create({
+ id: "copyRaw",
+ title: "Copy Raw",
+ contexts: ["browser_action"]
+});
+
+browser.contextMenus.create({
+ id: "unify",
+ title: "Unify",
+ contexts: ["browser_action"]
+});
+
+
browser.contextMenus.onClicked.addListener(
- (info, tab) => {
- if (info.menuItemId == 'switchInstance') {
- let url;
- try { url = new URL(tab.url); }
- catch (_) { return }
- let newUrl = changeWholeInstance(url);
- if (newUrl) browser.tabs.update({ url: newUrl });
- }
- else if (info.menuItemId == 'settings')
- browser.runtime.openOptionsPage()
+ (info) => {
+ if (info.menuItemId == 'switchInstance') utils.switchInstance();
+ else if (info.menuItemId == 'settings') browser.runtime.openOptionsPage()
+ else if (info.menuItemId == 'copyRaw') utils.copyRaw();
+ else if (info.menuItemId == 'unify') utils.unify();
}
);
diff --git a/src/pages/background/incognito.js b/src/pages/background/incognito.js
index 6e02347..16eccf7 100644
--- a/src/pages/background/incognito.js
+++ b/src/pages/background/incognito.js
@@ -20,21 +20,10 @@ import youtubeMusicHelper from "../../assets/javascripts/helpers/youtubeMusic.js
window.browser = window.browser || window.chrome;
async function wholeInit() {
- await youtubeHelper.init();
await youtubeMusicHelper.init();
- await twitterHelper.init();
- await instagramHelper.init();
await mapsHelper.init();
- await searchHelper.init();
- await translateHelper.init();
- await mediumHelper.init();
- await redditHelper.init();
- await wikipediaHelper.init();
- await imgurHelper.init();
- await tiktokHelper.init();
await sendTargetsHelper.init();
await peertubeHelper.init();
- await lbryHelper.init();
await generalHelper.init();
}
await wholeInit();
diff --git a/src/pages/options/general/general.js b/src/pages/options/general/general.js
index bcf7a52..c8a600c 100644
--- a/src/pages/options/general/general.js
+++ b/src/pages/options/general/general.js
@@ -1,7 +1,7 @@
"use strict";
window.browser = window.browser || window.chrome;
-import commonHelper from "../../../assets/javascripts/helpers/common.js";
+import utils from "../../../assets/javascripts/helpers/utils.js";
import generalHelper from "../../../assets/javascripts/helpers/general.js";
@@ -10,7 +10,7 @@ let updateInstancesElement = document.getElementById("update-instances");
updateInstancesElement.addEventListener("click", () => {
let oldHtml = updateInstancesElement.innerHTML
updateInstancesElement.innerHTML = '...';
- if (commonHelper.updateInstances()) {
+ if (utils.updateInstances()) {
updateInstancesElement.innerHTML = 'Done!';
new Promise(resolve => setTimeout(resolve, 1500)).then( // sleep 1500ms
() => updateInstancesElement.innerHTML = oldHtml
diff --git a/src/pages/options/imgur/imgur.js b/src/pages/options/imgur/imgur.js
index 597d015..0b1343c 100644
--- a/src/pages/options/imgur/imgur.js
+++ b/src/pages/options/imgur/imgur.js
@@ -1,5 +1,5 @@
import imgurHelper from "../../../assets/javascripts/helpers/imgur.js";
-import commonHelper from "../../../assets/javascripts/helpers/common.js";
+import utils from "../../../assets/javascripts/helpers/utils.js";
let disableImgurElement = document.getElementById("disable-imgur");
let protocolElement = document.getElementById("protocol")
@@ -45,26 +45,8 @@ browser.storage.local.get(
}
);
-commonHelper.processDefaultCustomInstances('imgur', 'rimgo', 'normal', document);
-commonHelper.processDefaultCustomInstances('imgur', 'rimgo', 'tor', document);
-commonHelper.processDefaultCustomInstances('imgur', 'rimgo', 'i2p', document);
+utils.processDefaultCustomInstances('imgur', 'rimgo', 'normal', document);
+utils.processDefaultCustomInstances('imgur', 'rimgo', 'tor', document);
+utils.processDefaultCustomInstances('imgur', 'rimgo', 'i2p', document);
-
-let latencyElement = document.getElementById("latency");
-let latencyLabel = document.getElementById("latency-label");
-latencyElement.addEventListener("click",
- async () => {
- let reloadWindow = () => location.reload();
- latencyElement.addEventListener("click", reloadWindow);
- await imgurHelper.init();
- let redirects = imgurHelper.getRedirects();
- const oldHtml = latencyLabel.innerHTML;
- latencyLabel.innerHTML = '...';
- commonHelper.testLatency(latencyLabel, redirects.rimgo.normal).then(r => {
- browser.storage.local.set({ rimgoLatency: r });
- latencyLabel.innerHTML = oldHtml;
- commonHelper.processDefaultCustomInstances('imgur', 'rimgo', 'normal', document);
- latencyElement.removeEventListener("click", reloadWindow)
- });
- }
-);
+utils.latency('imgur', 'rimgo', document, location)
\ No newline at end of file
diff --git a/src/pages/options/init.js b/src/pages/options/init.js
index 78ea11f..b9ff495 100644
--- a/src/pages/options/init.js
+++ b/src/pages/options/init.js
@@ -1,5 +1,5 @@
window.browser = window.browser || window.chrome;
-import commonHelper from "../../assets/javascripts/helpers/common.js";
+import utils from "../../assets/javascripts/helpers/utils.js";
function changeTheme() {
browser.storage.local.get(
@@ -34,4 +34,4 @@ browser.storage.onChanged.addListener(changeTheme)
window.matchMedia("(prefers-color-scheme: dark)").addEventListener("change", changeTheme)
-if (commonHelper.isRtl()) document.getElementsByTagName("body")[0].classList.add("rtl");
\ No newline at end of file
+if (utils.isRtl()) document.getElementsByTagName("body")[0].classList.add("rtl");
\ No newline at end of file
diff --git a/src/pages/options/instagram/instagram.js b/src/pages/options/instagram/instagram.js
index 39d1142..955aafc 100644
--- a/src/pages/options/instagram/instagram.js
+++ b/src/pages/options/instagram/instagram.js
@@ -1,5 +1,5 @@
import instagramHelper from "../../../assets/javascripts/helpers/instagram.js";
-import commonHelper from "../../../assets/javascripts/helpers/common.js";
+import utils from "../../../assets/javascripts/helpers/utils.js";
const disable = document.getElementById("disable-bibliogram");
const protocol = document.getElementById("protocol");
@@ -36,24 +36,7 @@ browser.storage.local.get(
changeProtocolSettings();
})
-commonHelper.processDefaultCustomInstances('instagram', 'bibliogram', 'normal', document);
-commonHelper.processDefaultCustomInstances('instagram', 'bibliogram', 'tor', document);
+utils.processDefaultCustomInstances('instagram', 'bibliogram', 'normal', document);
+utils.processDefaultCustomInstances('instagram', 'bibliogram', 'tor', document);
-let latencyElement = document.getElementById("latency");
-let latencyLabel = document.getElementById("latency-label");
-latencyElement.addEventListener("click",
- async () => {
- let reloadWindow = () => location.reload();
- latencyElement.addEventListener("click", reloadWindow);
- await instagramHelper.init();
- let redirects = instagramHelper.getRedirects();
- const oldHtml = latencyLabel.innerHTML;
- latencyLabel.innerHTML = '...';
- commonHelper.testLatency(latencyLabel, redirects.bibliogram.normal).then(r => {
- browser.storage.local.set({ bibliogramLatency: r });
- latencyLabel.innerHTML = oldHtml;
- commonHelper.processDefaultCustomInstances('instagram', 'bibliogram', 'normal', document);
- latencyElement.removeEventListener("click", reloadWindow);
- });
- }
-);
\ No newline at end of file
+utils.latency('instagram', 'bibliogram', document, location)
\ No newline at end of file
diff --git a/src/pages/options/lbry/lbry.js b/src/pages/options/lbry/lbry.js
index fcac7bd..92cc21a 100644
--- a/src/pages/options/lbry/lbry.js
+++ b/src/pages/options/lbry/lbry.js
@@ -1,5 +1,5 @@
import lbryHelper from "../../../assets/javascripts/helpers/lbry.js";
-import commonHelper from "../../../assets/javascripts/helpers/common.js";
+import utils from "../../../assets/javascripts/helpers/utils.js";
let disable = document.getElementById("disable-lbry");
let protocol = document.getElementById("protocol")
@@ -37,24 +37,7 @@ browser.storage.local.get(
}
)
-commonHelper.processDefaultCustomInstances('lbryTargets', 'librarian', 'normal', document);
-commonHelper.processDefaultCustomInstances('lbryTargets', 'librarian', 'tor', document);
+utils.processDefaultCustomInstances('lbryTargets', 'librarian', 'normal', document);
+utils.processDefaultCustomInstances('lbryTargets', 'librarian', 'tor', document);
-let latencyElement = document.getElementById("latency");
-let latencyLabel = document.getElementById("latency-label");
-latencyElement.addEventListener("click",
- async () => {
- let reloadWindow = () => location.reload();
- latencyElement.addEventListener("click", reloadWindow);
- await lbryHelper.init();
- let redirects = lbryHelper.getRedirects();
- const oldHtml = latencyLabel.innerHTML;
- latencyLabel.innerHTML = '...';
- commonHelper.testLatency(latencyLabel, redirects.librarian.normal).then(r => {
- browser.storage.local.set({ librarianLatency: r });
- latencyLabel.innerHTML = oldHtml;
- commonHelper.processDefaultCustomInstances('lbry', 'librarian', 'normal', document);
- latencyElement.removeEventListener("click", reloadWindow);
- });
- }
-);
\ No newline at end of file
+utils.latency('lbryTargets', 'librarian', document, location)
\ No newline at end of file
diff --git a/src/pages/options/maps/maps.js b/src/pages/options/maps/maps.js
index 7e18def..6db8c03 100644
--- a/src/pages/options/maps/maps.js
+++ b/src/pages/options/maps/maps.js
@@ -1,5 +1,5 @@
import mapsHelper from "../../../assets/javascripts/helpers/maps.js";
-import commonHelper from "../../../assets/javascripts/helpers/common.js";
+import utils from "../../../assets/javascripts/helpers/utils.js";
const disable = document.getElementById("disable-osm");
const frontend = document.getElementById("maps-frontend");
@@ -29,23 +29,4 @@ browser.storage.local.get(
changeFrontendsSettings();
}
)
-commonHelper.processDefaultCustomInstances('maps', 'facil', 'normal', document);
-
-let latencyElement = document.getElementById("latency");
-let latencyLabel = document.getElementById("latency-label");
-latencyElement.addEventListener("click",
- async () => {
- let reloadWindow = () => location.reload();
- latencyElement.addEventListener("click", reloadWindow);
- await mapsHelper.init();
- let redirects = mapsHelper.getRedirects();
- const oldHtml = latencyLabel.innerHTML;
- latencyLabel.innerHTML = '...';
- commonHelper.testLatency(latencyLabel, redirects.facil.normal).then(r => {
- browser.storage.local.set({ facilLatency: r });
- latencyLabel.innerHTML = oldHtml;
- commonHelper.processDefaultCustomInstances('maps', 'facil', 'normal', document);
- latencyElement.removeEventListener("click", reloadWindow);
- });
- }
-);
\ No newline at end of file
+utils.processDefaultCustomInstances('maps', 'facil', 'normal', document);
\ No newline at end of file
diff --git a/src/pages/options/medium/medium.js b/src/pages/options/medium/medium.js
index 786f8f1..9f00878 100644
--- a/src/pages/options/medium/medium.js
+++ b/src/pages/options/medium/medium.js
@@ -1,5 +1,5 @@
import mediumHelper from "../../../assets/javascripts/helpers/medium.js";
-import commonHelper from "../../../assets/javascripts/helpers/common.js";
+import utils from "../../../assets/javascripts/helpers/utils.js";
let disable = document.getElementById("disable-medium");
let protocol = document.getElementById("protocol")
@@ -15,8 +15,8 @@ browser.storage.local.get(
changeProtocolSettings();
}
)
-commonHelper.processDefaultCustomInstances('medium', 'scribe', 'normal', document);
-commonHelper.processDefaultCustomInstances('medium', 'scribe', 'tor', document);
+utils.processDefaultCustomInstances('medium', 'scribe', 'normal', document);
+utils.processDefaultCustomInstances('medium', 'scribe', 'tor', document);
document.addEventListener("change", async () => {
await browser.storage.local.set({
@@ -39,21 +39,4 @@ function changeProtocolSettings() {
}
}
-let latencyElement = document.getElementById("latency");
-let latencyLabel = document.getElementById("latency-label");
-latencyElement.addEventListener("click",
- async () => {
- let reloadWindow = () => location.reload();
- latencyElement.addEventListener("click", reloadWindow);
- await mediumHelper.init();
- let redirects = mediumHelper.getRedirects();
- const oldHtml = latencyLabel.innerHTML;
- latencyLabel.innerHTML = '...';
- commonHelper.testLatency(latencyLabel, redirects.scribe.normal).then(r => {
- browser.storage.local.set({ scribeLatency: r });
- latencyLabel.innerHTML = oldHtml;
- commonHelper.processDefaultCustomInstances('medium', 'scribe', 'normal', document);
- latencyElement.removeEventListener("click", reloadWindow);
- });
- }
-);
\ No newline at end of file
+utils.latency('medium', 'scribe', document, location)
\ No newline at end of file
diff --git a/src/pages/options/peertube/peertube.js b/src/pages/options/peertube/peertube.js
index 818e3fe..0bf16cc 100644
--- a/src/pages/options/peertube/peertube.js
+++ b/src/pages/options/peertube/peertube.js
@@ -1,5 +1,5 @@
import peertubeHelper from "../../../assets/javascripts/helpers/peertube.js";
-import commonHelper from "../../../assets/javascripts/helpers/common.js";
+import utils from "../../../assets/javascripts/helpers/utils.js";
let disable = document.getElementById("disable-peertube");
let protocol = document.getElementById("protocol")
@@ -14,8 +14,8 @@ browser.storage.local.get(
changeProtocolSettings();
}
)
-commonHelper.processDefaultCustomInstances('peertube', 'simpleertube', 'normal', document);
-commonHelper.processDefaultCustomInstances('peertube', 'simpleertube', 'tor', document);
+utils.processDefaultCustomInstances('peertube', 'simpleertube', 'normal', document);
+utils.processDefaultCustomInstances('peertube', 'simpleertube', 'tor', document);
document.addEventListener("change", async () => {
await browser.storage.local.set({
@@ -37,22 +37,4 @@ function changeProtocolSettings() {
torDiv.style.display = 'block';
}
}
-
-let latencyElement = document.getElementById("latency");
-let latencyLabel = document.getElementById("latency-label");
-latencyElement.addEventListener("click",
- async () => {
- let reloadWindow = () => location.reload();
- latencyElement.addEventListener("click", reloadWindow);
- await peertubeHelper.init();
- let redirects = peertubeHelper.getRedirects();
- const oldHtml = latencyLabel.innerHTML;
- latencyLabel.innerHTML = '...';
- commonHelper.testLatency(latencyLabel, redirects.simpleertube.normal).then(r => {
- browser.storage.local.set({ simpleertubeLatency: r });
- latencyLabel.innerHTML = oldHtml;
- commonHelper.processDefaultCustomInstances('peertube', 'simpleertube', 'normal', document);
- latencyElement.removeEventListener("click", reloadWindow);
- });
- }
-);
\ No newline at end of file
+utils.latency('peertube', 'simpleertube', document, location)
\ No newline at end of file
diff --git a/src/pages/options/reddit/reddit.js b/src/pages/options/reddit/reddit.js
index 5239964..3661f73 100644
--- a/src/pages/options/reddit/reddit.js
+++ b/src/pages/options/reddit/reddit.js
@@ -1,5 +1,5 @@
import redditHelper from "../../../assets/javascripts/helpers/reddit.js";
-import commonHelper from "../../../assets/javascripts/helpers/common.js";
+import utils from "../../../assets/javascripts/helpers/utils.js";
let libredditDivElement = document.getElementById("libreddit")
let tedditDivElement = document.getElementById("teddit")
@@ -81,46 +81,10 @@ browser.storage.local.get(
}
)
-commonHelper.processDefaultCustomInstances('reddit', 'libreddit', 'normal', document);
-commonHelper.processDefaultCustomInstances('reddit', 'libreddit', 'tor', document);
-commonHelper.processDefaultCustomInstances('reddit', 'teddit', 'normal', document);
-commonHelper.processDefaultCustomInstances('reddit', 'teddit', 'tor', document);
+utils.processDefaultCustomInstances('reddit', 'libreddit', 'normal', document);
+utils.processDefaultCustomInstances('reddit', 'libreddit', 'tor', document);
+utils.processDefaultCustomInstances('reddit', 'teddit', 'normal', document);
+utils.processDefaultCustomInstances('reddit', 'teddit', 'tor', document);
-
-let latencyLibredditElement = document.getElementById("latency-libreddit");
-let latencyLibredditLabel = document.getElementById("latency-libreddit-label");
-latencyLibredditElement.addEventListener("click",
- async () => {
- let reloadWindow = () => location.reload();
- latencyLibredditElement.addEventListener("click", reloadWindow);
- await redditHelper.init();
- let redirects = redditHelper.getRedirects();
- const oldHtml = latencyLibredditLabel.innerHTML;
- latencyLibredditLabel.innerHTML = '...';
- commonHelper.testLatency(latencyLibredditLabel, redirects.libreddit.normal).then(r => {
- browser.storage.local.set({ libredditLatency: r });
- latencyLibredditLabel.innerHTML = oldHtml;
- commonHelper.processDefaultCustomInstances('reddit', 'libreddit', 'normal', document);
- latencyLibredditElement.removeEventListener("click", reloadWindow);
- });
- }
-);
-
-let latencyTedditElement = document.getElementById("latency-teddit");
-let latencyTedditLabel = document.getElementById("latency-teddit-label");
-latencyTedditElement.addEventListener("click",
- async () => {
- let reloadWindow = () => location.reload();
- latencyTedditElement.addEventListener("click", reloadWindow);
- await redditHelper.init();
- let redirects = redditHelper.getRedirects();
- const oldHtml = latencyTedditLabel.innerHTML;
- latencyTedditLabel.innerHTML = '...';
- commonHelper.testLatency(latencyTedditLabel, redirects.teddit.normal).then(r => {
- browser.storage.local.set({ tedditLatency: r });
- latencyTedditLabel.innerHTML = oldHtml;
- commonHelper.processDefaultCustomInstances('reddit', 'teddit', 'normal', document);
- latencyTedditElement.removeEventListener("click", reloadWindow);
- });
- }
-);
\ No newline at end of file
+utils.latency('reddit', 'libreddit', document, location, true)
+utils.latency('reddit', 'teddit', document, location, true)
\ No newline at end of file
diff --git a/src/pages/options/search/search.js b/src/pages/options/search/search.js
index 47f27c0..fb92805 100644
--- a/src/pages/options/search/search.js
+++ b/src/pages/options/search/search.js
@@ -1,5 +1,5 @@
import searchHelper from "../../../assets/javascripts/helpers/search.js";
-import commonHelper from "../../../assets/javascripts/helpers/common.js";
+import utils from "../../../assets/javascripts/helpers/utils.js";
let searxDiv = document.getElementById("searx");
let searxngDiv = document.getElementById("searxng");
@@ -127,69 +127,16 @@ function changeProtocolSettings() {
}
}
-commonHelper.processDefaultCustomInstances('search', 'searx', 'normal', document);
-commonHelper.processDefaultCustomInstances('search', 'searx', 'tor', document);
-commonHelper.processDefaultCustomInstances('search', 'searx', 'i2p', document);
-commonHelper.processDefaultCustomInstances('search', 'searxng', 'normal', document);
-commonHelper.processDefaultCustomInstances('search', 'searxng', 'tor', document);
-commonHelper.processDefaultCustomInstances('search', 'searxng', 'i2p', document);
-commonHelper.processDefaultCustomInstances('search', 'whoogle', 'normal', document);
-commonHelper.processDefaultCustomInstances('search', 'whoogle', 'tor', document);
-commonHelper.processDefaultCustomInstances('search', 'whoogle', 'i2p', document);
+utils.processDefaultCustomInstances('search', 'searx', 'normal', document);
+utils.processDefaultCustomInstances('search', 'searx', 'tor', document);
+utils.processDefaultCustomInstances('search', 'searx', 'i2p', document);
+utils.processDefaultCustomInstances('search', 'searxng', 'normal', document);
+utils.processDefaultCustomInstances('search', 'searxng', 'tor', document);
+utils.processDefaultCustomInstances('search', 'searxng', 'i2p', document);
+utils.processDefaultCustomInstances('search', 'whoogle', 'normal', document);
+utils.processDefaultCustomInstances('search', 'whoogle', 'tor', document);
+utils.processDefaultCustomInstances('search', 'whoogle', 'i2p', document);
-let latencySearxElement = document.getElementById("latency-searx");
-let latencySearxLabel = document.getElementById("latency-searx-label");
-latencySearxElement.addEventListener("click",
- async () => {
- let reloadWindow = () => location.reload();
- latencySearxElement.addEventListener("click", reloadWindow);
- await searchHelper.init();
- let redirects = searchHelper.getRedirects();
- const oldHtml = latencySearxLabel.innerHTML;
- latencySearxLabel.innerHTML = '...';
- commonHelper.testLatency(latencySearxLabel, redirects.searx.normal).then(r => {
- browser.storage.local.set({ searxLatency: r });
- latencySearxLabel.innerHTML = oldHtml;
- commonHelper.processDefaultCustomInstances('search', 'searx', 'normal', document);
- latencySearxElement.removeEventListener("click", reloadWindow);
- });
- }
-);
-
-let latencySearxngElement = document.getElementById("latency-searxng");
-let latencySearxngLabel = document.getElementById("latency-searxng-label");
-latencySearxngElement.addEventListener("click",
- async () => {
- let reloadWindow = () => location.reload();
- latencySearxngElement.addEventListener("click", reloadWindow);
- await searchHelper.init();
- let redirects = searchHelper.getRedirects();
- const oldHtml = latencySearxngLabel.innerHTML;
- latencySearxngLabel.innerHTML = '...';
- commonHelper.testLatency(latencySearxngLabel, redirects.searxng.normal).then(r => {
- browser.storage.local.set({ searxngLatency: r });
- latencySearxngLabel.innerHTML = oldHtml;
- commonHelper.processDefaultCustomInstances('search', 'searxng', 'normal', document);
- latencySearxngElement.removeEventListener("click", reloadWindow);
- });
- }
-);
-
-let latencyWhoogleElement = document.getElementById("latency-whoogle");
-let latencyWhoogleLabel = document.getElementById("latency-whoogle-label");
-latencyWhoogleElement.addEventListener("click",
- async () => {
- let reloadWindow = () => location.reload();
- latencyWhoogleElement.addEventListener("click", reloadWindow);
- await searchHelper.init();
- let redirects = searchHelper.getRedirects();
- const oldHtml = latencyWhoogleLabel.innerHTML;
- latencyWhoogleLabel.innerHTML = '...';
- commonHelper.testLatency(latencyWhoogleLabel, redirects.whoogle.normal).then(r => {
- browser.storage.local.set({ whoogleLatency: r });
- latencyWhoogleLabel.innerHTML = oldHtml;
- commonHelper.processDefaultCustomInstances('search', 'whoogle', 'normal', document);
- latencyWhoogleElement.removeEventListener("click", reloadWindow);
- });
- }
-);
\ No newline at end of file
+utils.latency('search', 'searx', document, location, true)
+utils.latency('search', 'searxng', document, location, true)
+utils.latency('search', 'whoogle', document, location, true)
diff --git a/src/pages/options/sendTargets/sendTargets.js b/src/pages/options/sendTargets/sendTargets.js
index 057ae86..0cb1da0 100644
--- a/src/pages/options/sendTargets/sendTargets.js
+++ b/src/pages/options/sendTargets/sendTargets.js
@@ -1,5 +1,5 @@
import sendTargetsHelper from "../../../assets/javascripts/helpers/sendTargets.js";
-import commonHelper from "../../../assets/javascripts/helpers/common.js";
+import utils from "../../../assets/javascripts/helpers/utils.js";
let disable = document.getElementById("disable-sendTargets");
let protocol = document.getElementById("protocol")
@@ -37,24 +37,7 @@ function changeProtocolSettings() {
}
}
-commonHelper.processDefaultCustomInstances('sendTargets', 'send', 'normal', document);
-commonHelper.processDefaultCustomInstances('sendTargets', 'send', 'tor', document);
+utils.processDefaultCustomInstances('sendTargets', 'send', 'normal', document);
+utils.processDefaultCustomInstances('sendTargets', 'send', 'tor', document);
-let latencyElement = document.getElementById("latency");
-let latencyLabel = document.getElementById("latency-label");
-latencyElement.addEventListener("click",
- async () => {
- let reloadWindow = () => location.reload();
- latencyElement.addEventListener("click", reloadWindow);
- await sendTargetsHelper.init();
- let redirects = sendTargetsHelper.getRedirects();
- const oldHtml = latencyLabel.innerHTML;
- latencyLabel.innerHTML = '...';
- commonHelper.testLatency(latencyLabel, redirects.send.normal).then(r => {
- browser.storage.local.set({ sendLatency: r });
- latencyLabel.innerHTML = oldHtml;
- commonHelper.processDefaultCustomInstances('sendTargets', 'send', 'normal', document);
- latencyElement.removeEventListener("click", reloadWindow)
- });
- }
-);
\ No newline at end of file
+utils.latency('sendTargets', 'send', document, location)
\ No newline at end of file
diff --git a/src/pages/options/tiktok/tiktok.js b/src/pages/options/tiktok/tiktok.js
index 8055fc9..5a57b46 100644
--- a/src/pages/options/tiktok/tiktok.js
+++ b/src/pages/options/tiktok/tiktok.js
@@ -1,5 +1,5 @@
import tiktokHelper from "../../../assets/javascripts/helpers/tiktok.js";
-import commonHelper from "../../../assets/javascripts/helpers/common.js";
+import utils from "../../../assets/javascripts/helpers/utils.js";
let disable = document.getElementById("disable-tiktok");
let protocol = document.getElementById("protocol")
@@ -49,24 +49,7 @@ function changeProtocolSettings() {
}
}
-commonHelper.processDefaultCustomInstances('tiktok', 'proxiTok', 'normal', document);
-commonHelper.processDefaultCustomInstances('tiktok', 'proxiTok', 'tor', document);
+utils.processDefaultCustomInstances('tiktok', 'proxiTok', 'normal', document);
+utils.processDefaultCustomInstances('tiktok', 'proxiTok', 'tor', document);
-let latencyElement = document.getElementById("latency");
-let latencyLabel = document.getElementById("latency-label");
-latencyElement.addEventListener("click",
- async () => {
- let reloadWindow = () => location.reload();
- latencyElement.addEventListener("click", reloadWindow);
- await tiktokHelper.init();
- let redirects = tiktokHelper.getRedirects();
- const oldHtml = latencyLabel.innerHTML;
- latencyLabel.innerHTML = '...';
- commonHelper.testLatency(latencyLabel, redirects.proxiTok.normal).then(r => {
- browser.storage.local.set({ proxiTokLatency: r });
- latencyLabel.innerHTML = oldHtml;
- commonHelper.processDefaultCustomInstances('tiktok', 'proxiTok', 'normal', document);
- latencyElement.removeEventListener("click", reloadWindow)
- });
- }
-);
\ No newline at end of file
+utils.latency('tiktok', 'proxiTok', document, location)
\ No newline at end of file
diff --git a/src/pages/options/translate/translate.js b/src/pages/options/translate/translate.js
index 55a2d74..998ebc3 100644
--- a/src/pages/options/translate/translate.js
+++ b/src/pages/options/translate/translate.js
@@ -1,5 +1,5 @@
import translateHelper from "../../../assets/javascripts/helpers/translate/translate.js";
-import commonHelper from "../../../assets/javascripts/helpers/common.js";
+import utils from "../../../assets/javascripts/helpers/utils.js";
let disable = document.getElementById("disable-simplyTranslate");
let simplyTranslateDiv = document.getElementById("simplyTranslate");
@@ -66,45 +66,10 @@ document.addEventListener("change", () => {
})
-commonHelper.processDefaultCustomInstances('translate', 'simplyTranslate', 'normal', document)
-commonHelper.processDefaultCustomInstances('translate', 'simplyTranslate', 'tor', document);
-commonHelper.processDefaultCustomInstances('translate', 'lingva', 'normal', document);
-commonHelper.processDefaultCustomInstances('translate', 'lingva', 'tor', document);
+utils.processDefaultCustomInstances('translate', 'simplyTranslate', 'normal', document)
+utils.processDefaultCustomInstances('translate', 'simplyTranslate', 'tor', document);
+utils.processDefaultCustomInstances('translate', 'lingva', 'normal', document);
+utils.processDefaultCustomInstances('translate', 'lingva', 'tor', document);
-let latencySimplyTranslateElement = document.getElementById("latency-simplyTranslate");
-let latencySimplyTranslateLabel = document.getElementById("latency-simplyTranslate-label");
-latencySimplyTranslateElement.addEventListener("click",
- async () => {
- let reloadWindow = () => location.reload();
- latencySimplyTranslateElement.addEventListener("click", reloadWindow);
- await translateHelper.init();
- let redirects = translateHelper.getRedirects();
- const oldHtml = latencySimplyTranslateLabel.innerHTML;
- latencySimplyTranslateLabel.innerHTML = '...';
- commonHelper.testLatency(latencySimplyTranslateLabel, redirects.simplyTranslate.normal).then(r => {
- browser.storage.local.set({ simplyTranslateLatency: r });
- latencySimplyTranslateLabel.innerHTML = oldHtml;
- commonHelper.processDefaultCustomInstances('translate', 'simplyTranslate', 'normal', document)
- latencySimplyTranslateElement.removeEventListener("click", reloadWindow);
- });
- }
-);
-
-let latencyLingvaElement = document.getElementById("latency-lingva");
-let latencyLingvaLabel = document.getElementById("latency-lingva-label");
-latencyLingvaElement.addEventListener("click",
- async () => {
- let reloadWindow = () => location.reload();
- latencyLingvaElement.addEventListener("click", reloadWindow);
- await translateHelper.init();
- let redirects = translateHelper.getRedirects();
- const oldHtml = latencyLingvaLabel.innerHTML;
- latencyLingvaLabel.innerHTML = '...';
- commonHelper.testLatency(latencyLingvaLabel, redirects.lingva.normal).then(r => {
- browser.storage.local.set({ lingvaLatency: r });
- latencyLingvaLabel.innerHTML = oldHtml;
- commonHelper.processDefaultCustomInstances('translate', 'lingva', 'normal', document);
- latencyLingvaElement.removeEventListener("click", reloadWindow);
- });
- }
-);
\ No newline at end of file
+utils.latency('translate', 'simplyTranslate', document, location, true)
+utils.latency('translate', 'lingva', document, location, true)
\ No newline at end of file
diff --git a/src/pages/options/twitter/twitter.html b/src/pages/options/twitter/twitter.html
index 2bd204a..95e0a0b 100644
--- a/src/pages/options/twitter/twitter.html
+++ b/src/pages/options/twitter/twitter.html
@@ -117,27 +117,6 @@