aboutsummaryrefslogtreecommitdiffstats
path: root/src/assets
diff options
context:
space:
mode:
Diffstat (limited to 'src/assets')
-rw-r--r--src/assets/javascripts/imgur.js6
-rw-r--r--src/assets/javascripts/instagram.js8
-rw-r--r--src/assets/javascripts/lbry.js4
-rw-r--r--src/assets/javascripts/medium.js8
-rw-r--r--src/assets/javascripts/peertube.js4
-rw-r--r--src/assets/javascripts/reddit.js8
-rw-r--r--src/assets/javascripts/search.js8
-rw-r--r--src/assets/javascripts/sendTargets.js8
-rw-r--r--src/assets/javascripts/tiktok.js4
-rw-r--r--src/assets/javascripts/translate/translate.js28
-rw-r--r--src/assets/javascripts/twitter.js8
-rw-r--r--src/assets/javascripts/utils.js22
-rw-r--r--src/assets/javascripts/wikipedia.js8
-rw-r--r--src/assets/javascripts/youtube/youtube.js8
14 files changed, 64 insertions, 68 deletions
diff --git a/src/assets/javascripts/imgur.js b/src/assets/javascripts/imgur.js
index 9f93f362..d22430ee 100644
--- a/src/assets/javascripts/imgur.js
+++ b/src/assets/javascripts/imgur.js
@@ -21,7 +21,7 @@ function setRedirects() {
rimgoTorRedirectsChecks = [...redirects.rimgo.tor];
rimgoI2pRedirectsChecks = [...redirects.rimgo.i2p];
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
const a = rimgoNormalRedirectsChecks.indexOf(instance);
if (a > -1) rimgoNormalRedirectsChecks.splice(a, 1);
@@ -156,9 +156,9 @@ function initDefaults() {
fetch('/instances/data.json').then(response => response.text()).then(async data => {
let dataJson = JSON.parse(data);
redirects.rimgo = dataJson.rimgo;
- browser.storage.local.get('cloudflareList', async r => {
+ browser.storage.local.get('cloudflareBlackList', async r => {
rimgoNormalRedirectsChecks = [...redirects.rimgo.normal];
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
const i = rimgoNormalRedirectsChecks.indexOf(instance);
if (i > -1) rimgoNormalRedirectsChecks.splice(i, 1);
}
diff --git a/src/assets/javascripts/instagram.js b/src/assets/javascripts/instagram.js
index f5c54b3a..e1542a18 100644
--- a/src/assets/javascripts/instagram.js
+++ b/src/assets/javascripts/instagram.js
@@ -12,10 +12,10 @@ let redirects = {
}
};
function setRedirects(val) {
- browser.storage.local.get('cloudflareList', async r => {
+ browser.storage.local.get('cloudflareBlackList', async r => {
redirects.bibliogram = val;
bibliogramNormalRedirectsChecks = [...redirects.bibliogram.normal];
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
const a = bibliogramNormalRedirectsChecks.indexOf(instance);
if (a > -1) bibliogramNormalRedirectsChecks.splice(a, 1);
}
@@ -133,9 +133,9 @@ function initDefaults() {
fetch('/instances/data.json').then(response => response.text()).then(data => {
let dataJson = JSON.parse(data);
redirects.bibliogram = dataJson.bibliogram;
- browser.storage.local.get('cloudflareList', r => {
+ browser.storage.local.get('cloudflareBlackList', r => {
bibliogramNormalRedirectsChecks = [...redirects.bibliogram.normal];
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
const i = bibliogramNormalRedirectsChecks.indexOf(instance);
if (i > -1) bibliogramNormalRedirectsChecks.splice(i, 1);
}
diff --git a/src/assets/javascripts/lbry.js b/src/assets/javascripts/lbry.js
index b44cc738..d4f4359a 100644
--- a/src/assets/javascripts/lbry.js
+++ b/src/assets/javascripts/lbry.js
@@ -121,9 +121,9 @@ function redirect(url, type, initiator) {
function initDefaults() {
return new Promise(resolve => {
- browser.storage.local.get('cloudflareList', async r => {
+ browser.storage.local.get('cloudflareBlackList', async r => {
librarianNormalRedirectsChecks = [...redirects.librarian.normal];
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
let i;
i = librarianNormalRedirectsChecks.indexOf(instance);
diff --git a/src/assets/javascripts/medium.js b/src/assets/javascripts/medium.js
index 7be6b0d1..06abd64e 100644
--- a/src/assets/javascripts/medium.js
+++ b/src/assets/javascripts/medium.js
@@ -35,10 +35,10 @@ let redirects = {
}
};
function setRedirects(val) {
- browser.storage.local.get('cloudflareList', r => {
+ browser.storage.local.get('cloudflareBlackList', r => {
redirects.scribe = val;
scribeNormalRedirectsChecks = [...redirects.scribe.normal];
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
const a = scribeNormalRedirectsChecks.indexOf(instance);
if (a > -1) scribeNormalRedirectsChecks.splice(a, 1);
}
@@ -141,10 +141,10 @@ function initDefaults() {
fetch('/instances/data.json').then(response => response.text()).then(data => {
let dataJson = JSON.parse(data);
redirects.scribe = dataJson.scribe;
- browser.storage.local.get('cloudflareList',
+ browser.storage.local.get('cloudflareBlackList',
async r => {
scribeNormalRedirectsChecks = [...redirects.scribe.normal];
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
let i = scribeNormalRedirectsChecks.indexOf(instance);
if (i > -1) scribeNormalRedirectsChecks.splice(i, 1);
}
diff --git a/src/assets/javascripts/peertube.js b/src/assets/javascripts/peertube.js
index ed15bce9..d1c06bf2 100644
--- a/src/assets/javascripts/peertube.js
+++ b/src/assets/javascripts/peertube.js
@@ -122,9 +122,9 @@ function initDefaults() {
return new Promise(resolve => {
fetch('/instances/data.json').then(response => response.text()).then(async data => {
let dataJson = JSON.parse(data);
- browser.storage.local.get('cloudflareList', async r => {
+ browser.storage.local.get('cloudflareBlackList', async r => {
simpleertubeNormalRedirectsChecks = [...redirects.simpleertube.normal];
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
let i = simpleertubeNormalRedirectsChecks.indexOf(instance);
if (i > -1) simpleertubeNormalRedirectsChecks.splice(i, 1);
}
diff --git a/src/assets/javascripts/reddit.js b/src/assets/javascripts/reddit.js
index ce55bb83..c10ebe2f 100644
--- a/src/assets/javascripts/reddit.js
+++ b/src/assets/javascripts/reddit.js
@@ -17,11 +17,11 @@ let redirects = {
},
};
function setRedirects(val) {
- browser.storage.local.get('cloudflareList', r => {
+ browser.storage.local.get('cloudflareBlackList', r => {
redirects = val;
libredditNormalRedirectsChecks = [...redirects.libreddit.normal];
tedditNormalRedirectsChecks = [...redirects.teddit.normal]
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
const a = libredditNormalRedirectsChecks.indexOf(instance);
if (a > -1) libredditNormalRedirectsChecks.splice(a, 1);
@@ -322,10 +322,10 @@ function initDefaults() {
let dataJson = JSON.parse(data);
redirects.teddit = dataJson.teddit;
redirects.libreddit = dataJson.libreddit;
- browser.storage.local.get('cloudflareList', async r => {
+ browser.storage.local.get('cloudflareBlackList', async r => {
libredditNormalRedirectsChecks = [...redirects.libreddit.normal];
tedditNormalRedirectsChecks = [...redirects.teddit.normal]
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
let i;
i = libredditNormalRedirectsChecks.indexOf(instance);
diff --git a/src/assets/javascripts/search.js b/src/assets/javascripts/search.js
index 227eba86..6d6fd365 100644
--- a/src/assets/javascripts/search.js
+++ b/src/assets/javascripts/search.js
@@ -28,12 +28,12 @@ let redirects = {
};
function setRedirects(val) {
- browser.storage.local.get('cloudflareList', r => {
+ browser.storage.local.get('cloudflareBlackList', r => {
redirects = val;
searxNormalRedirectsChecks = [...redirects.searx.normal];
searxngNormalRedirectsChecks = [...redirects.searxng.normal];
whoogleNormalRedirectsChecks = [...redirects.whoogle.normal];
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
const a = searxNormalRedirectsChecks.indexOf(instance);
if (a > -1) searxNormalRedirectsChecks.splice(a, 1);
@@ -394,11 +394,11 @@ function initDefaults() {
redirects.searxng = dataJson.searxng;
redirects.whoogle = dataJson.whoogle;
- browser.storage.local.get('cloudflareList', async r => {
+ browser.storage.local.get('cloudflareBlackList', async r => {
whoogleNormalRedirectsChecks = [...redirects.whoogle.normal];
searxNormalRedirectsChecks = [...redirects.searx.normal];
searxngNormalRedirectsChecks = [...redirects.searxng.normal];
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
let i;
i = whoogleNormalRedirectsChecks.indexOf(instance);
diff --git a/src/assets/javascripts/sendTargets.js b/src/assets/javascripts/sendTargets.js
index a3e87268..72a153ec 100644
--- a/src/assets/javascripts/sendTargets.js
+++ b/src/assets/javascripts/sendTargets.js
@@ -15,10 +15,10 @@ let redirects = {
}
}
function setRedirects(val) {
- browser.storage.local.get('cloudflareList', r => {
+ browser.storage.local.get('cloudflareBlackList', r => {
redirects.send = val;
sendNormalRedirectsChecks = [...redirects.send.normal];
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
const a = sendNormalRedirectsChecks.indexOf(instance);
if (a > -1) sendNormalRedirectsChecks.splice(a, 1);
}
@@ -117,9 +117,9 @@ function initDefaults() {
fetch('/instances/data.json').then(response => response.text()).then(async data => {
let dataJson = JSON.parse(data);
redirects.send = dataJson.send;
- browser.storage.local.get('cloudflareList', async r => {
+ browser.storage.local.get('cloudflareBlackList', async r => {
sendNormalRedirectsChecks = [...redirects.send.normal];
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
let i = sendNormalRedirectsChecks.indexOf(instance);
if (i > -1) sendNormalRedirectsChecks.splice(i, 1);
}
diff --git a/src/assets/javascripts/tiktok.js b/src/assets/javascripts/tiktok.js
index 05370b67..a462cec4 100644
--- a/src/assets/javascripts/tiktok.js
+++ b/src/assets/javascripts/tiktok.js
@@ -13,10 +13,10 @@ let redirects = {
}
}
function setRedirects(val) {
- browser.storage.local.get('cloudflareList', r => {
+ browser.storage.local.get('cloudflareBlackList', r => {
redirects.proxiTok = val;
proxiTokNormalRedirectsChecks = [...redirects.proxiTok.normal];
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
const a = proxiTokNormalRedirectsChecks.indexOf(instance);
if (a > -1) proxiTokNormalRedirectsChecks.splice(a, 1);
}
diff --git a/src/assets/javascripts/translate/translate.js b/src/assets/javascripts/translate/translate.js
index 0dccc848..efb42313 100644
--- a/src/assets/javascripts/translate/translate.js
+++ b/src/assets/javascripts/translate/translate.js
@@ -73,20 +73,16 @@ init();
browser.storage.onChanged.addListener(init)
function setRedirects(val) {
- browser.storage.local.get('cloudflareList', r => {
+ browser.storage.local.get('cloudflareBlackList', r => {
redirects = val;
- simplyTranslateNormalRedirectsChecks = [...redirects.simplyTranslate.normal];
lingvaNormalRedirectsChecks = [...redirects.lingva.normal]
- for (const instance of r.cloudflareList) {
- const a = simplyTranslateNormalRedirectsChecks.indexOf(instance);
- if (a > -1) simplyTranslateNormalRedirectsChecks.splice(a, 1);
-
- const b = lingvaNormalRedirectsChecks.indexOf(instance);
- if (b > -1) lingvaNormalRedirectsChecks.splice(b, 1);
+ for (const instance of r.cloudflareBlackList) {
+ const i = lingvaNormalRedirectsChecks.indexOf(instance);
+ if (i > -1) lingvaNormalRedirectsChecks.splice(i, 1);
}
browser.storage.local.set({
translateRedirects: redirects,
- simplyTranslateNormalRedirectsChecks,
+ simplyTranslateNormalRedirectsChecks: redirects.simplyTranslate.normal,
simplyTranslateTorRedirectsChecks: redirects.simplyTranslate.tor,
lingvaNormalRedirectsChecks,
lingvaTorRedirectsChecks: redirects.lingva.tor,
@@ -261,16 +257,12 @@ function initDefaults() {
let dataJson = JSON.parse(data);
redirects.simplyTranslate = dataJson.simplyTranslate;
redirects.lingva = dataJson.lingva;
- browser.storage.local.get('cloudflareList',
+ browser.storage.local.get('cloudflareBlackList',
async r => {
- simplyTranslateNormalRedirectsChecks = [...redirects.simplyTranslate.normal];
lingvaNormalRedirectsChecks = [...redirects.lingva.normal]
- for (const instance of r.cloudflareList) {
- const a = simplyTranslateNormalRedirectsChecks.indexOf(instance);
- if (a > -1) simplyTranslateNormalRedirectsChecks.splice(a, 1);
-
- const b = lingvaNormalRedirectsChecks.indexOf(instance);
- if (b > -1) lingvaNormalRedirectsChecks.splice(b, 1);
+ for (const instance of r.cloudflareBlackList) {
+ const i = lingvaNormalRedirectsChecks.indexOf(instance);
+ if (i > -1) lingvaNormalRedirectsChecks.splice(i, 1);
}
await browser.storage.local.set({
translateDisable: false,
@@ -279,7 +271,7 @@ function initDefaults() {
translateRedirects: redirects,
simplyTranslateNormalRedirectsChecks: simplyTranslateNormalRedirectsChecks,
- simplyTranslateNormalCustomRedirects: [],
+ simplyTranslateNormalCustomRedirects: [...redirects.simplyTranslate.normal],
simplyTranslateTorRedirectsChecks: [...redirects.simplyTranslate.tor],
simplyTranslateTorCustomRedirects: [],
diff --git a/src/assets/javascripts/twitter.js b/src/assets/javascripts/twitter.js
index 8a730444..81a4513f 100644
--- a/src/assets/javascripts/twitter.js
+++ b/src/assets/javascripts/twitter.js
@@ -17,10 +17,10 @@ let redirects = {
};
function setRedirects(val) {
- browser.storage.local.get('cloudflareList', r => {
+ browser.storage.local.get(['cloudflareBlackList', 'authenticateBlackList'], r => {
redirects.nitter = val;
nitterNormalRedirectsChecks = [...redirects.nitter.normal];
- for (const instance of r.cloudflareList) {
+ for (const instance of [...r.cloudflareBlackList, ...r.authenticateBlackList]) {
let i = nitterNormalRedirectsChecks.indexOf(instance);
if (i > -1) nitterNormalRedirectsChecks.splice(i, 1);
}
@@ -204,9 +204,9 @@ function initDefaults() {
fetch('/instances/data.json').then(response => response.text()).then(data => {
let dataJson = JSON.parse(data);
redirects.nitter = dataJson.nitter;
- browser.storage.local.get('cloudflareList', async r => {
+ browser.storage.local.get(['cloudflareBlackList', 'authenticateBlackList'], async r => {
nitterNormalRedirectsChecks = [...redirects.nitter.normal];
- for (const instance of r.cloudflareList) {
+ for (const instance of [...r.cloudflareBlackList, ...r.authenticateBlackList]) {
let i = nitterNormalRedirectsChecks.indexOf(instance);
if (i > -1) nitterNormalRedirectsChecks.splice(i, 1);
}
diff --git a/src/assets/javascripts/utils.js b/src/assets/javascripts/utils.js
index fd306b0c..44247d96 100644
--- a/src/assets/javascripts/utils.js
+++ b/src/assets/javascripts/utils.js
@@ -18,11 +18,13 @@ function getRandomInstance(instances) {
return instances[~~(instances.length * Math.random())];
}
-let cloudflareList = [];
-async function initCloudflareList() {
+let cloudflareBlackList = [];
+let authenticateBlackList = [];
+async function initcloudflareBlackList() {
return new Promise(resolve => {
- fetch('/instances/blocklist.json').then(response => response.text()).then(data => {
- cloudflareList = JSON.parse(data);
+ fetch('/instances/blacklist.json').then(response => response.text()).then(data => {
+ cloudflareBlackList = JSON.parse(data).cloudflare;
+ authenticateBlackList = JSON.parse(data).authenticate;
resolve();
})
});
@@ -34,7 +36,7 @@ function updateInstances() {
http.open('GET', 'https://raw.githubusercontent.com/libredirect/libredirect/master/src/instances/data.json', false);
http.send(null);
if (http.status === 200) {
- await initCloudflareList();
+ await initcloudflareBlackList();
const instances = JSON.parse(http.responseText);
youtubeHelper.setRedirects({ 'invidious': instances.invidious, 'piped': instances.piped, })
@@ -73,7 +75,7 @@ async function processDefaultCustomInstances(target, name, protocol, document) {
let nameCustomInstances = [];
let nameCheckListElement = nameProtocolElement.getElementsByClassName('checklist')[0];
- await initCloudflareList();
+ await initcloudflareBlackList();
let nameDefaultRedirects;
@@ -123,7 +125,8 @@ async function processDefaultCustomInstances(target, name, protocol, document) {
</div>`,
...redirects[name][protocol].map(
x => {
- let cloudflare = cloudflareList.includes(x) ? ' <span style="color:red;">cloudflare</span>' : '';
+ const cloudflare = cloudflareBlackList.includes(x) ? ' <span style="color:red;">cloudflare</span>' : '';
+ const authenticate = authenticateBlackList.includes(x) ? ' <span style="color:orange;">authenticate</span>' : '';
let ms = instancesLatency[x];
let latencyColor = (ms <= 1000 ? "green" : ms <= 2000 ? "orange" : "red");
@@ -132,10 +135,11 @@ async function processDefaultCustomInstances(target, name, protocol, document) {
else if (ms > 5000) latencyLimit = `ERROR: ${ms - 5000}`;
else latencyLimit = ms + 'ms';
- let latency = x in instancesLatency ? '<span style="color:' + latencyColor + ';">' + latencyLimit + '</span>' : '';
+ const latency = x in instancesLatency ? '<span style="color:' + latencyColor + ';">' + latencyLimit + '</span>' : '';
+ let warnings = [cloudflare, authenticate, latency].join(' ');
return `<div>
- <x><a href="${x}" target="_blank">${x}</a>${cloudflare} ${latency}</x>
+ <x><a href="${x}" target="_blank">${x}</a>${warnings}</x>
<input type="checkbox" class="${x}"/>
</div>`;
}
diff --git a/src/assets/javascripts/wikipedia.js b/src/assets/javascripts/wikipedia.js
index 96e96bce..db7bf20b 100644
--- a/src/assets/javascripts/wikipedia.js
+++ b/src/assets/javascripts/wikipedia.js
@@ -12,10 +12,10 @@ let redirects = {
}
};
function setRedirects(val) {
- browser.storage.local.get('cloudflareList', r => {
+ browser.storage.local.get('cloudflareBlackList', r => {
redirects.wikiless = val;
wikilessNormalRedirectsChecks = [...redirects.wikiless.normal];
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
const a = wikilessNormalRedirectsChecks.indexOf(instance);
if (a > -1) wikilessNormalRedirectsChecks.splice(a, 1);
}
@@ -180,9 +180,9 @@ function initDefaults() {
fetch('/instances/data.json').then(response => response.text()).then(async data => {
let dataJson = JSON.parse(data);
redirects.wikiless = dataJson.wikiless;
- browser.storage.local.get('cloudflareList', async r => {
+ browser.storage.local.get('cloudflareBlackList', async r => {
wikilessNormalRedirectsChecks = [...redirects.wikiless.normal];
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
let i = wikilessNormalRedirectsChecks.indexOf(instance);
if (i > -1) wikilessNormalRedirectsChecks.splice(i, 1);
}
diff --git a/src/assets/javascripts/youtube/youtube.js b/src/assets/javascripts/youtube/youtube.js
index 19ab5491..468c4792 100644
--- a/src/assets/javascripts/youtube/youtube.js
+++ b/src/assets/javascripts/youtube/youtube.js
@@ -34,12 +34,12 @@ let redirects = {
}
};
function setRedirects(val) {
- browser.storage.local.get('cloudflareList', r => {
+ browser.storage.local.get('cloudflareBlackList', r => {
redirects.invidious = val.invidious;
redirects.piped = val.piped;
invidiousNormalRedirectsChecks = [...redirects.invidious.normal];
pipedNormalRedirectsChecks = [...redirects.piped.normal];
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
const a = invidiousNormalRedirectsChecks.indexOf(instance);
if (a > -1) invidiousNormalRedirectsChecks.splice(a, 1);
@@ -245,13 +245,13 @@ function initDefaults() {
let dataJson = JSON.parse(data);
redirects.invidious = dataJson.invidious;
redirects.piped = dataJson.piped;
- browser.storage.local.get('cloudflareList', async r => {
+ browser.storage.local.get('cloudflareBlackList', async r => {
invidiousNormalRedirectsChecks = [...redirects.invidious.normal];
pipedNormalRedirectsChecks = [...redirects.piped.normal];
pipedMaterialNormalRedirectsChecks = [...redirects.pipedMaterial.normal];
- for (const instance of r.cloudflareList) {
+ for (const instance of r.cloudflareBlackList) {
const a = invidiousNormalRedirectsChecks.indexOf(instance);
if (a > -1) invidiousNormalRedirectsChecks.splice(a, 1);
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-05 17:19:35 +0000