From ddcbb9725de7fece31664617a1c99784d64af4c4 Mon Sep 17 00:00:00 2001 From: BobIsMyManager Date: Thu, 14 Jul 2022 11:40:19 +0100 Subject: [PATCH 01/15] non-breaking optimizations to search and librex support --- src/assets/javascripts/search.js | 93 ++++++++++++++++++++++- src/pages/options/index.html | 106 +++++++++++++++++++++++---- src/pages/options/widgets/search.js | 101 +++++++++++++++++++++++-- src/pages/options/widgets/search.pug | 43 +++++++---- 4 files changed, 304 insertions(+), 39 deletions(-) diff --git a/src/assets/javascripts/search.js b/src/assets/javascripts/search.js index 5a91ff8..93bb10a 100644 --- a/src/assets/javascripts/search.js +++ b/src/assets/javascripts/search.js @@ -5,8 +5,12 @@ import utils from './utils.js' const targets = [ /^https?:\/{2}search\.libredirect\.invalid/, ]; +// Ill optimise all of assets/javascripts at a later date. For now, I'll just add librex and optimse options javascript +const frontends = new Array("searx", "searxng", "whoogle", "librex") +const protocols = new Array("normal", "tor", "i2p") -let redirects = { +const redirects = {} + /* "searx": { "normal": [], "tor": [], @@ -22,7 +26,27 @@ let redirects = { "tor": [], "i2p": [] } -}; + */ +//}; + +//let tmp = "{" + +for (let i = 0; i < frontends.length; i++) { + //redirects.frontends[i] = {} + //redirects.push(frontends[i]) + //tmp = frontends[i] + //tmp = tmp + '\n"' + frontends[i] + '": {' + redirects[frontends[i]] = {} + for (let x = 0; x < protocols.length; x++) { + //redirects.frontends[i].protocols = [] + //tmp = tmp + '\n"' + protocols[x] + '": [],' + redirects[frontends[i]][protocols[x]] = [] + } + //tmp = tmp + "\n}," +} +//tmp = tmp + "\n}" + +//const redirects = JSON.parse(tmp) function setRedirects(val) { browser.storage.local.get('cloudflareBlackList', r => { @@ -30,6 +54,7 @@ function setRedirects(val) { searxNormalRedirectsChecks = [...redirects.searx.normal]; searxngNormalRedirectsChecks = [...redirects.searxng.normal]; whoogleNormalRedirectsChecks = [...redirects.whoogle.normal]; + librexNormalRedirectsChecks = [...redirects.librex.normal]; for (const instance of r.cloudflareBlackList) { const a = searxNormalRedirectsChecks.indexOf(instance); if (a > -1) searxNormalRedirectsChecks.splice(a, 1); @@ -39,12 +64,16 @@ function setRedirects(val) { const c = whoogleNormalRedirectsChecks.indexOf(instance); if (c > -1) whoogleNormalRedirectsChecks.splice(c, 1); + + const d = librexNormalRedirectsChecks.indexOf(instance); + if (c > -1) librexNormalRedirectsChecks.splice(d, 1); } browser.storage.local.set({ searchRedirects: redirects, searxNormalRedirectsChecks, searxngNormalRedirectsChecks, whoogleNormalRedirectsChecks, + librexNormalRedirectsChecks, }); }) } @@ -71,7 +100,13 @@ let searxngTorRedirectsChecks, searxngTorCustomRedirects, searxngI2pRedirectsChecks, - searxngI2pCustomRedirects; + searxngI2pCustomRedirects, + librexNormalRedirectsChecks, + librexNormalCustomRedirects, + librexTorRedirectsChecks, + librexTorCustomRedirects, + librexI2pRedirectsChecks, + librexI2pCustomRedirects; function init() { return new Promise(async resolve => { @@ -99,6 +134,12 @@ function init() { "searxngTorCustomRedirects", "searxngI2pRedirectsChecks", "searxngI2pCustomRedirects", + "librexNormalRedirectsChecks", + "librexNormalCustomRedirects", + "librexTorRedirectsChecks", + "librexTorCustomRedirects", + "librexI2pRedirectsChecks", + "librexI2pCustomRedirects" ], r => { disableSearch = r.disableSearch; @@ -123,6 +164,12 @@ function init() { searxngTorCustomRedirects = r.searxngTorCustomRedirects; searxngI2pRedirectsChecks = r.searxngI2pRedirectsChecks; searxngI2pCustomRedirects = r.searxngI2pCustomRedirects; + librexNormalRedirectsChecks = r.librexNormalRedirectsChecks; + librexNormalCustomRedirects = r.librexNormalCustomRedirects; + librexTorRedirectsChecks = r.librexTorRedirectsChecks; + librexTorCustomRedirects = r.librexTorCustomRedirects; + librexI2pRedirectsChecks = r.librexI2pRedirectsChecks; + librexI2pCustomRedirects = r.librexI2pCustomRedirects; resolve(); } ) @@ -307,6 +354,14 @@ function redirect(url, disableOverride) { randomInstance = utils.getRandomInstance(instancesList) path = "/search"; } + else if (searchFrontend == 'librex') { + let instancesList; + if (searchProtocol == 'normal') instancesList = [...librexNormalRedirectsChecks, ...librexNormalCustomRedirects]; + if (searchProtocol == 'tor') instancesList = [...librexTorRedirectsChecks, ...librexTorCustomRedirects]; + if (searchProtocol == 'i2p') instancesList = [...librexI2pRedirectsChecks, ...librexI2pCustomRedirects]; + randomInstance = utils.getRandomInstance(instancesList) + path = "/search.php"; + } if ( ((url.hostname.includes('google') || url.hostname.includes('bing')) && !url.searchParams.has('q')) || @@ -345,6 +400,10 @@ function switchInstance(url, disableOverride) { ...searchRedirects.whoogle.tor, ...searchRedirects.whoogle.i2p, + ...searchRedirects.librex.normal, + ...searchRedirects.librex.tor, + ...searchRedirects.librex.i2p, + ...searxNormalCustomRedirects, ...searxTorCustomRedirects, ...searxI2pCustomRedirects, @@ -356,6 +415,10 @@ function switchInstance(url, disableOverride) { ...whoogleNormalCustomRedirects, ...whoogleTorCustomRedirects, ...whoogleI2pCustomRedirects, + + ...librexNormalCustomRedirects, + ...librexTorCustomRedirects, + ...librexI2pCustomRedirects, ].includes(protocolHost)) { resolve(); return; } let instancesList; @@ -363,16 +426,19 @@ function switchInstance(url, disableOverride) { if (searchFrontend == 'searx') instancesList = [...searxNormalRedirectsChecks, ...searxNormalCustomRedirects]; else if (searchFrontend == 'searxng') instancesList = [...searxngNormalRedirectsChecks, ...searxngNormalCustomRedirects]; else if (searchFrontend == 'whoogle') instancesList = [...whoogleNormalRedirectsChecks, ...whoogleNormalCustomRedirects]; + else if (searchFrontend == 'librex') instancesList = [...librexNormalRedirectsChecks, ...librexNormalCustomRedirects]; } else if (searchProtocol == 'tor') { if (searchFrontend == 'searx') instancesList = [...searxTorRedirectsChecks, ...searxTorCustomRedirects]; else if (searchFrontend == 'searxng') instancesList = [...searxngTorRedirectsChecks, ...searxngTorCustomRedirects]; else if (searchFrontend == 'whoogle') instancesList = [...whoogleTorRedirectsChecks, ...whoogleTorCustomRedirects]; + else if (searchFrontend == 'librex') instancesList = [...librexTorRedirectsChecks, ...librexTorCustomRedirects]; } else if (searchProtocol == 'i2p') { if (searchFrontend == 'searx') instancesList = [...searxI2pRedirectsChecks, ...searxI2pCustomRedirects]; else if (searchFrontend == 'searxng') instancesList = [...searxngI2pRedirectsChecks, ...searxngI2pCustomRedirects]; else if (searchFrontend == 'whoogle') instancesList = [...whoogleI2pRedirectsChecks, ...whoogleI2pCustomRedirects]; + else if (searchFrontend == 'librex') instancesList = [...librexI2pRedirectsChecks, ...librexI2pCustomRedirects]; } const i = instancesList.indexOf(protocolHost); @@ -388,14 +454,20 @@ function initDefaults() { return new Promise(async resolve => { fetch('/instances/data.json').then(response => response.text()).then(async data => { let dataJson = JSON.parse(data); + /* redirects.searx = dataJson.searx; redirects.searxng = dataJson.searxng; redirects.whoogle = dataJson.whoogle; + */ + for (let i = 0; i < frontends.length; i++) { + redirects[frontends[i]] = dataJson[frontends[i]] + } browser.storage.local.get('cloudflareBlackList', async r => { whoogleNormalRedirectsChecks = [...redirects.whoogle.normal]; searxNormalRedirectsChecks = [...redirects.searx.normal]; searxngNormalRedirectsChecks = [...redirects.searxng.normal]; + librexNormalRedirectsChecks = [...redirects.librex.normal]; for (const instance of r.cloudflareBlackList) { let i; @@ -407,6 +479,9 @@ function initDefaults() { i = searxngNormalRedirectsChecks.indexOf(instance); if (i > -1) searxngNormalRedirectsChecks.splice(i, 1); + + i = librexNormalRedirectsChecks.indexOf(instance); + if (i > -1) librexNormalRedirectsChecks.splice(i, 1) } browser.storage.local.set({ disableSearch: false, @@ -424,6 +499,7 @@ function initDefaults() { whoogleI2pRedirectsChecks: [...redirects.whoogle.i2p], whoogleI2pCustomRedirects: [], + searxNormalRedirectsChecks: searxNormalRedirectsChecks, searxNormalCustomRedirects: [], @@ -433,6 +509,7 @@ function initDefaults() { searxI2pRedirectsChecks: [...redirects.searx.i2p], searxI2pCustomRedirects: [], + searxngNormalRedirectsChecks: searxngNormalRedirectsChecks, searxngNormalCustomRedirects: [], @@ -441,6 +518,16 @@ function initDefaults() { searxngI2pRedirectsChecks: [...redirects.searxng.i2p], searxngI2pCustomRedirects: [], + + + librexNormalRedirectsChecks: librexNormalRedirectsChecks, + librexNormalCustomRedirects: [], + + librexTorRedirectsChecks: librexTorRedirectsChecks, + librexTorCustomRedirects: [], + + librexI2pRedirectsChecks: librexI2pRedirectsChecks, + librexI2pCustomRedirects: [] }, () => resolve()) }) }) diff --git a/src/pages/options/index.html b/src/pages/options/index.html index 241a20e..80c2a03 100644 --- a/src/pages/options/index.html +++ b/src/pages/options/index.html @@ -1502,20 +1502,19 @@ + -
-
-

Protocol

- -
+
+

Protocol

+
-

Note: To use Search to its full potential, make LibRedirect as the Default Search Engine

+

Note: To use Search, make LibRedirect the Default Search Engine

@@ -1560,7 +1559,7 @@
- +
- +
- +
- +
- +
- + + +
+
+
+
+ +
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+ + +
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+
+
+

+ +
+
+
+

Fallback to normal if no frontends are available for the current protocol

+ +
+

@@ -274,33 +289,23 @@
-
+

Embedded Videos Frontend

-
-
-

Protocol

- -
-
-

Redirect Type

- -
+
+

Redirect Type

+
@@ -315,7 +320,7 @@
- +
- + + +
+ +
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+
- + + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+
- + + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+ +
+ + +
+ +
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
@@ -519,13 +713,6 @@

Enable

-
-

Protocol

- -

Redirect Type

+ + +
+ +
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+
-
-

Protocol

- -
@@ -659,6 +881,48 @@
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
@@ -671,13 +935,6 @@

Enable

-
-

Protocol

- -
@@ -721,7 +978,49 @@
- + + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+
-
-

Protocol

- -
@@ -800,7 +1092,49 @@
- + + +
+ +
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+
- + + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+
-
-

Protocol

- -
@@ -927,7 +1295,7 @@
- +
- + + +
+ +
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+
-
-

Protocol

- -
@@ -1021,7 +1402,7 @@
- +
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
@@ -1064,13 +1466,6 @@

Enable

-
-

Protocol

- -
@@ -1114,7 +1509,49 @@
- + + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+
-
-

Protocol

- -
@@ -1186,7 +1616,49 @@
- + + +
+ +
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+
-
-

Protocol

- -
@@ -1258,7 +1723,49 @@
- + + +
+ +
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+
-
-

Protocol

- -
@@ -1330,7 +1830,49 @@
- + + +
+ +
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+
-
-

Protocol

- -
@@ -1402,7 +1937,49 @@
- + + +
+ +
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+
-
-

Protocol

- -
@@ -1484,6 +2054,48 @@
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
@@ -1505,14 +2117,6 @@
-
-

Protocol

- -

Note: To use Search, make LibRedirect the Default Search Engine

@@ -1590,6 +2194,27 @@
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
@@ -1665,6 +2290,27 @@
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
@@ -1740,6 +2386,27 @@
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
@@ -1815,6 +2482,27 @@
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
@@ -1834,15 +2522,6 @@
-
-

Protocol

- -
@@ -1981,7 +2660,49 @@
- + + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+ +
+ + +
+ +
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
@@ -2054,13 +2838,6 @@

Enable

-
-

Protocol

- -
@@ -2104,7 +2881,49 @@
- + + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+
-

Fallback to normal if no frontends are available for the current protocol

- +

Fallback to normal if no instances are available for the current protocol

+
diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js index 106bd53..0f7a314 100644 --- a/src/pages/options/widgets/general.js +++ b/src/pages/options/widgets/general.js @@ -169,8 +169,8 @@ protocolElement.addEventListener("change", event => { location.reload(); }) -let protocolFallbackElement = document.getElementById("protocol-fallback") -protocolFallbackElement.addEventListener("change", event => { +let protocolFallbackCheckbox = document.getElementById("protocol-fallback-checkbox") +protocolFallbackCheckbox.addEventListener("change", event => { browser.storage.local.set({ protocolFallback: event.target.checked}); }) @@ -208,9 +208,10 @@ browser.storage.local.get( autoRedirectElement.checked = r.autoRedirect; themeElement.value = r.theme; protocolElement.value = r.protocol; - protocolFallbackElement.checked = r.protocolFallback; + protocolFallbackCheckbox.checked = r.protocolFallback; // firstPartyIsolate.checked = r.firstPartyIsolate; - + + let protocolFallbackElement = document.getElementById('protocol-fallback') if (protocolElement.value == "normal") { protocolFallbackElement.style.display = 'none'; } else { diff --git a/src/pages/options/widgets/general.pug b/src/pages/options/widgets/general.pug index 11fbd0f..e04e9e2 100644 --- a/src/pages/options/widgets/general.pug +++ b/src/pages/options/widgets/general.pug @@ -25,7 +25,7 @@ section#general_page.option-block #protocol-fallback .some-block.option-block h4(data-localise="__MSG_protocolFallback__") Fallback to normal if no instances are available for the current protocol - input#protocol-fallback(type="checkbox") + input#protocol-fallback-checkbox(type="checkbox") .some-block.option-block h4(data-localise="__MSG_autoRedirect__") From 2e448143158a987d9ea21e231748f2bc6849d8b6 Mon Sep 17 00:00:00 2001 From: BobIsMyManager Date: Sat, 23 Jul 2022 18:08:18 +0100 Subject: [PATCH 13/15] Fixed one of the errors (1 remaining) --- src/assets/javascripts/utils.js | 6 ++++-- src/assets/javascripts/youtube/youtube.js | 10 +++++----- src/pages/options/index.html | 4 ++-- src/pages/options/widgets/maps.pug | 2 +- src/pages/options/widgets/youtube.pug | 4 ++++ 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/assets/javascripts/utils.js b/src/assets/javascripts/utils.js index 7428a79..b04024e 100644 --- a/src/assets/javascripts/utils.js +++ b/src/assets/javascripts/utils.js @@ -114,13 +114,15 @@ async function processDefaultCustomInstances(target, name, protocol, document) { function calcNameCheckBoxes() { let isTrue = true; - for (const item of redirects[name][protocol]) + for (const item of redirects[name][protocol]) { if (!nameDefaultRedirects.includes(item)) { isTrue = false; break; } - for (const element of nameCheckListElement.getElementsByTagName('input')) + } + for (const element of nameCheckListElement.getElementsByTagName('input')) { element.checked = nameDefaultRedirects.includes(element.className) + } if (nameDefaultRedirects.length == 0) isTrue = false; nameProtocolElement.getElementsByClassName('toggle-all')[0].checked = isTrue; } diff --git a/src/assets/javascripts/youtube/youtube.js b/src/assets/javascripts/youtube/youtube.js index 439f560..ffc08ed 100644 --- a/src/assets/javascripts/youtube/youtube.js +++ b/src/assets/javascripts/youtube/youtube.js @@ -160,7 +160,7 @@ function all() { ...youtubeRedirects.piped.tor, ...youtubeRedirects.pipedMaterial.normal, - ...youtubeRedirects.pipedMaterial.tor, + //...youtubeRedirects.pipedMaterial.tor, ...invidiousNormalCustomRedirects, ...invidiousTorCustomRedirects, @@ -380,9 +380,9 @@ function copyPasteInvidiousCookies(test, from) { if (protocol == 'loki') checkedInstances = [...invidiousLokiCustomRedirects]; else if (protocol == 'i2p') checkedInstances = [...invidiousI2pCustomRedirects]; - else if (protocol == 'tor') checkedInstances = [...invidiousTorRedirectsChecks, ...invidiousTorCustomRedirects] - if ((instancesList.length === 0 && protocolFallback) || protocol == 'normal') { - checkedInstances = [...invidiousNormalRedirectsChecks, ...invidiousNormalCustomRedirects] + else if (protocol == 'tor') checkedInstances = [...invidiousTorRedirectsChecks, ...invidiousTorCustomRedirects]; + if ((checkedInstances.length === 0 && protocolFallback) || protocol == 'normal') { + checkedInstances = [...invidiousNormalRedirectsChecks, ...invidiousNormalCustomRedirects]; } const i = checkedInstances.indexOf(protocolHost); if (i !== -1) checkedInstances.splice(i, 1); @@ -400,7 +400,7 @@ function pasteInvidiousCookies() { if (protocol == 'loki') checkedInstances = [...invidiousLokiCustomRedirects]; else if (protocol == 'i2p') checkedInstances = [...invidiousI2pCustomRedirects]; else if (protocol == 'tor') checkedInstances = [...invidiousTorRedirectsChecks, ...invidiousTorCustomRedirects] - if ((instancesList.length === 0 && protocolFallback) || protocol == 'normal') { + if ((checkedInstances.length === 0 && protocolFallback) || protocol == 'normal') { checkedInstances = [...invidiousNormalRedirectsChecks, ...invidiousNormalCustomRedirects] } utils.getCookiesFromStorage('invidious', checkedInstances, 'PREFS'); diff --git a/src/pages/options/index.html b/src/pages/options/index.html index 96b8d55..29e454b 100644 --- a/src/pages/options/index.html +++ b/src/pages/options/index.html @@ -2754,13 +2754,13 @@
-
diff --git a/src/pages/options/widgets/maps.pug b/src/pages/options/widgets/maps.pug index f220e35..166e649 100644 --- a/src/pages/options/widgets/maps.pug +++ b/src/pages/options/widgets/maps.pug @@ -18,7 +18,7 @@ section#maps_page.option-block include ../../widgets/instances.pug +instances('https://facilmap.com') include ../../widgets/latency.pug - +latency('facilmap') + +latency('facil') .tor +instances('http://facilmap.onion') include ../../widgets/instances.pug diff --git a/src/pages/options/widgets/youtube.pug b/src/pages/options/widgets/youtube.pug index cf17562..a7832d4 100644 --- a/src/pages/options/widgets/youtube.pug +++ b/src/pages/options/widgets/youtube.pug @@ -50,7 +50,9 @@ section#youtube_page.option-block #piped hr .normal + include ../../widgets/instances.pug +instances('https://piped.com') + include ../../widgets/latency.pug +latency('piped') .tor +instances('http://piped.onion') @@ -65,7 +67,9 @@ section#youtube_page.option-block #pipedMaterial hr .normal + include ../../widgets/instances.pug +instances('https://piped-material.com') + include ../../widgets/latency.pug +latency('pipedMaterial') .tor +instances('http://piped-material.onion') From 0333efdab8f13af432df33f442c1782f257409dc Mon Sep 17 00:00:00 2001 From: BobIsMyManager Date: Sat, 23 Jul 2022 21:00:28 +0100 Subject: [PATCH 14/15] Re-add instances list (for dev reasons) --- src/instances/blacklist.json | 57 ++ src/instances/data.json | 1680 ++++++++++++++++++++++++++++++++++ 2 files changed, 1737 insertions(+) create mode 100644 src/instances/blacklist.json create mode 100644 src/instances/data.json diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json new file mode 100644 index 0000000..021c9e5 --- /dev/null +++ b/src/instances/blacklist.json @@ -0,0 +1,57 @@ +{ + "cloudflare": [ + "https://invidious.kavin.rocks", + "https://piped.kavin.rocks", + "https://piped.tokhmi.xyz", + "https://piped.moomoo.me", + "https://piped.syncpundit.com", + "https://piped.mha.fi", + "https://piped.shimul.me", + "https://pipedus.palash.dev", + "https://nitter.domain.glass", + "https://birdsite.xanny.family", + "https://nitter.moomoo.me", + "https://notabird.site", + "https://fuckthesacklers.network", + "https://nitter.winscloud.net", + "https://twtr.bch.bar", + "https://twitter.dr460nf1r3.org", + "https://nitter.garudalinux.org", + "https://nitter.wef.lol", + "https://nitter.catalyst.sx", + "https://nitter.fprivacy.com", + "https://bib.actionsack.com", + "https://libreddit.domain.glass", + "https://r.nf", + "https://libreddit.flux.industries", + "https://lr.oversold.host", + "https://libreddit.hu", + "https://lr.stilic.ml", + "https://reddi.tk", + "https://r.walkx.org", + "https://libreddit.yonalee.eu", + "https://libreddit.winscloud.net", + "https://r.ahwx.org", + "https://reddit.dr460nf1r3.org", + "https://libreddit.encrypted-data.xyz", + "https://libreddit.eu.org", + "https://teddit.domain.glass", + "https://teddit.httpjames.space", + "https://teddit.encrypted-data.xyz", + "https://teddit.garudalinux.org", + "https://tedd.it", + "https://wiki.604kph.xyz", + "https://searx.org", + "https://searx.run", + "https://search.albony.xyz", + "https://search.garudalinux.org", + "https://search.dr460nf1r3.org", + "https://search.wef.lol", + "https://librex.catalyst.sx", + "https://i.actionsack.com", + "https://rimgo.encrypted-data.xyz" + ], + "authenticate": [ + "https://nitter.nixnet.services" + ] +} \ No newline at end of file diff --git a/src/instances/data.json b/src/instances/data.json new file mode 100644 index 0000000..ed734e6 --- /dev/null +++ b/src/instances/data.json @@ -0,0 +1,1680 @@ +{ + "invidious": { + "normal": [ + "https://yewtu.be", + "https://vid.puffyan.us", + "https://invidious.snopyta.org", + "https://invidious.kavin.rocks", + "https://inv.riverside.rocks", + "https://invidious.osi.kr", + "https://y.com.sb", + "https://yt.artemislena.eu", + "https://invidious.flokinet.to", + "https://invidious.sethforprivacy.com", + "https://invidious.tiekoetter.com", + "https://inv.bp.projectsegfau.lt", + "https://invidious.projectsegfau.lt", + "https://inv.vern.cc", + "https://invidious.nerdvpn.de", + "https://invidious.slipfox.xyz", + "https://invidious.weblibre.org", + "https://invidious.esmailelbob.xyz", + "https://youtube.076.ne.jp", + "https://invidious.namazso.eu" + ], + "tor": [ + "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion", + "http://w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd.onion", + "http://kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad.onion", + "http://grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad.onion", + "http://osbivz6guyeahrwp2lnwyjk2xos342h4ocsxyqrlaopqjuhwn2djiiyd.onion", + "http://u2cvlit75owumwpy4dj2hsmvkq7nvrclkpht7xgyye2pyoxhpmclkrad.onion", + "http://euxxcnhsynwmfidvhjf6uzptsmh4dipkmgdmcmxxuo7tunp3ad2jrwyd.onion", + "http://invidious.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion", + "http://inv.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion" + ] + }, + "piped": { + "normal": [ + "https://piped.kavin.rocks", + "https://piped.tokhmi.xyz", + "https://piped.moomoo.me", + "https://il.ax", + "https://piped.syncpundit.com", + "https://piped.mha.fi", + "https://piped.shimul.me", + "https://pipedus.palash.dev", + "https://yt.jae.fi", + "https://piped.mint.lgbt", + "https://piped.privacy.com.de", + "https://piped.esmailelbob.xyz" + ], + "tor": [ + "http://piped2bbch4xslbl2ckr6k62q56kon56ffowxaqzy42ai22a4sash3ad.onion" + ] + }, + "pipedMaterial": { + "normal": [ + "https://piped-material.১.net", + "https://piped-material.ftp.sh", + "https://piped-staging.ftp.sh", + "https://ui.piped.১.net" + ] + }, + "proxiTok": { + "normal": [ + "https://proxitok.herokuapp.com", + "https://proxitok.pussthecat.org", + "https://proxitok.privacydev.net" + ], + "tor": [] + }, + "send": { + "normal": [ + "https://send.vis.ee", + "https://send.zcyph.cc", + "https://send.turingpoint.de", + "https://send.ephemeral.land", + "https://send.mni.li", + "https://send.monks.tools", + "https://send.boblorange.net", + "https://send.aurorabilisim.com", + "https://nhanh.cloud", + "https://send.datahoarder.dev", + "https://fileupload.ggc-project.de", + "https://drop.chapril.org", + "https://send.jeugdhulp.be", + "https://files.psu.ru", + "https://send.portailpro.net", + "https://bytefile.de", + "https://transfer.acted.org" + ], + "tor": [] + }, + "nitter": { + "normal": [ + "https://nitter.net", + "https://nitter.42l.fr", + "https://nitter.pussthecat.org", + "https://nitter.nixnet.services", + "https://nitter.fdn.fr", + "https://nitter.1d4.us", + "https://nitter.kavin.rocks", + "https://nitter.unixfox.eu", + "https://nitter.domain.glass", + "https://nitter.namazso.eu", + "https://birdsite.xanny.family", + "https://nitter.hu", + "https://nitter.moomoo.me", + "https://bird.trom.tf", + "https://nitter.it", + "https://twitter.censors.us", + "https://nitter.grimneko.de", + "https://n.hyperborea.cloud", + "https://nitter.ca", + "https://twitter.076.ne.jp", + "https://nitter.fly.dev", + "https://notabird.site", + "https://nitter.weiler.rocks", + "https://nitter.sethforprivacy.com", + "https://nttr.stream", + "https://nitter.cutelab.space", + "https://nitter.nl", + "https://nitter.mint.lgbt", + "https://nitter.bus-hit.me", + "https://fuckthesacklers.network", + "https://nitter.esmailelbob.xyz", + "https://tw.artemislena.eu", + "https://de.nttr.stream", + "https://nitter.winscloud.net", + "https://nitter.tiekoetter.com", + "https://nitter.spaceint.fr", + "https://twtr.bch.bar", + "https://nitter.privacy.com.de", + "https://nitter.mastodon.pro", + "https://nitter.notraxx.ch", + "https://nitter.poast.org", + "https://nitter.bird.froth.zone", + "https://nitter.dcs0.hu", + "https://twitter.dr460nf1r3.org", + "https://nitter.garudalinux.org", + "https://twitter.beparanoid.de", + "https://n.ramle.be", + "https://nitter.cz", + "https://nitter.privacydev.net", + "https://tweet.lambda.dance", + "https://nitter.ebnar.xyz", + "https://nitter.kylrth.com", + "https://nitter.foss.wtf", + "https://nitter.priv.pw", + "https://nt.vern.cc", + "https://nitter.wef.lol", + "https://nitter.tokhmi.xyz", + "https://nitter.catalyst.sx", + "https://unofficialbird.com", + "https://nitter.projectsegfau.lt", + "https://singapore.unofficialbird.com", + "https://twt.funami.tech", + "https://nitter.fprivacy.com", + "https://canada.unofficialbird.com", + "https://india.unofficialbird.com", + "https://nederland.unofficialbird.com", + "https://uk.unofficialbird.com", + "https://n.l5.ca" + ], + "tor": [ + "http://3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion", + "http://nitter.l4qlywnpwqsluw65ts7md3khrivpirse744un3x7mlskqauz5pyuzgqd.onion", + "http://nitter7bryz3jv7e3uekphigvmoyoem4al3fynerxkj22dmoxoq553qd.onion", + "http://npf37k3mtzwxreiw52ccs5ay4e6qt2fkcs2ndieurdyn2cuzzsfyfvid.onion", + "http://nitter.v6vgyqpa7yefkorazmg5d5fimstmvm2vtbirt6676mt7qmllrcnwycqd.onion", + "http://i23nv6w3juvzlw32xzoxcqzktegd4i4fu3nmnc2ewv4ggiu4ledwklad.onion", + "http://26oq3gioiwcmfojub37nz5gzbkdiqp7fue5kvye7d4txv4ny6fb4wwid.onion", + "http://vfaomgh4jxphpbdfizkm5gbtjahmei234giqj4facbwhrfjtcldauqad.onion", + "http://iwgu3cv7ywf3gssed5iqtavmrlszgsxazkmwwnt4h2kdait75thdyrqd.onion", + "http://erpnncl5nhyji3c32dcfmztujtl3xaddqb457jsbkulq24zqq7ifdgad.onion", + "http://ckzuw5misyahmg7j5t5xwwuj3bwy62jfolxyux4brfflramzsvvd3syd.onion", + "http://jebqj47jgxleaiosfcxfibx2xdahjettuydlxbg64azd4khsxv6kawid.onion", + "http://nttr2iupbb6fazdpr2rgbooon2tzbbsvvkagkgkwohhodjzj43stxhad.onion", + "http://nitraeju2mipeziu2wtcrqsxg7h62v5y4eqgwi75uprynkj74gevvuqd.onion", + "http://nitter.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion", + "http://ibsboeui2im5o7dxnik3s5yghufumgy5abevtij5nbizequfpu4qi4ad.onion", + "http://ec5nvbycpfa5k6ro77blxgkyrzbkv7uy6r5cngcbkadtjj2733nm3uyd.onion", + "http://twitter.ap3jtgssd7qn4vfoa62gi2ijddoblslbeuw5dan3xt7myvqpura5i4qd.onion", + "http://twitter.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion", + "http://nitter.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion", + "http://fbdi323aj3t6hdx4jtkuwxrnafzskquciowu2yu3jizfssaq35aow6ad.onion", + "http://nitterqdyumlovt7tjqpdjrluitgmtpa53qq3idlpgoe4kxo7gs3xvad.onion", + "http://nitter.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion", + "http://aaaaaxx74hbzeibageieowryhsqvimbdiitfkfe47tvgawkwkjh3coqd.onion", + "http://wiio4sgs4247brk7hj6qck2jxnvldwfdbguigc5ivpxrsegnliyfvuqd.onion" + ] + }, + "bibliogram": { + "normal": [ + "https://bibliogram.art", + "https://bibliogram.snopyta.org", + "https://bibliogram.pussthecat.org", + "https://bibliogram.1d4.us", + "https://bibliogram.froth.zone", + "https://insta.trom.tf", + "https://insta.tromdienste.de", + "https://ig.tokhmi.xyz", + "https://ig.beparanoid.de", + "https://bibliogram.privacydev.net", + "https://bibliogram.priv.pw", + "https://ig.funami.tech", + "https://bib.actionsack.com" + ], + "tor": [] + }, + "libreddit": { + "normal": [ + "https://libredd.it", + "https://libreddit.spike.codes", + "https://libreddit.dothq.co", + "https://libreddit.kavin.rocks", + "https://reddit.invak.id", + "https://reddit.phii.me", + "https://lr.riverside.rocks", + "https://libreddit.strongthany.cc", + "https://libreddit.database.red", + "https://libreddit.privacy.com.de", + "https://libreddit.domain.glass", + "https://libreddit.sugoma.tk", + "https://libreddit.jamiethalacker.dev", + "https://reddit.artemislena.eu", + "https://r.nf", + "https://libreddit.some-things.org", + "https://reddit.stuehieyr.com", + "https://lr.mint.lgbt", + "https://libreddit.igna.rocks", + "https://libreddit.autarkic.org", + "https://libreddit.flux.industries", + "https://libreddit.drivet.xyz", + "https://lr.oversold.host", + "https://libreddit.de", + "https://libreddit.pussthecat.org", + "https://libreddit.mutahar.rocks", + "https://libreddit.northboot.xyz", + "https://leddit.xyz", + "https://de.leddit.xyz", + "https://lr.cowfee.moe", + "https://libreddit.hu", + "https://libreddit.totaldarkness.net", + "https://libreddit.esmailelbob.xyz", + "https://lr.vern.cc", + "https://libreddit.nl", + "https://lr.stilic.ml", + "https://reddi.tk", + "https://libreddit.bus-hit.me", + "https://libreddit.datatunnel.xyz", + "https://libreddit.crewz.me", + "https://r.walkx.org", + "https://libreddit.kylrth.com", + "https://libreddit.yonalee.eu", + "https://libreddit.winscloud.net", + "https://libreddit.tiekoetter.com", + "https://reddit.rtrace.io", + "https://libreddit.lunar.icu", + "https://libreddit.privacydev.net", + "https://libreddit.notyourcomputer.net", + "https://r.ahwx.org", + "https://bob.fr.to", + "https://reddit.beparanoid.de", + "https://libreddit.dcs0.hu", + "https://reddit.dr460nf1r3.org", + "https://rd.jae.su", + "https://libreddit.mha.fi", + "https://libreddit.foss.wtf", + "https://libreddit.encrypted-data.xyz", + "https://libreddit.eu.org", + "https://l.opnxng.com" + ], + "tor": [ + "http://spjmllawtheisznfs7uryhxumin26ssv2draj7oope3ok3wuhy43eoyd.onion", + "http://fwhhsbrbltmrct5hshrnqlqygqvcgmnek3cnka55zj4y7nuus5muwyyd.onion", + "http://kphht2jcflojtqte4b4kyx7p2ahagv4debjj32nre67dxz7y57seqwyd.onion", + "http://inytumdgnri7xsqtvpntjevaelxtgbjqkuqhtf6txxhwbll2fwqtakqd.onion", + "http://liredejj74h5xjqr2dylnl5howb2bpikfowqoveub55ru27x43357iid.onion", + "http://kzhfp3nvb4qp575vy23ccbrgfocezjtl5dx66uthgrhu7nscu6rcwjyd.onion", + "http://ecue64ybzvn6vjzl37kcsnwt4ycmbsyf74nbttyg7rkc3t3qwnj7mcyd.onion", + "http://ledditqo2mxfvlgobxnlhrkq4dh34jss6evfkdkb2thlvy6dn4f4gpyd.onion", + "http://libredoxhxwnmsb6dvzzd35hmgzmawsq5i764es7witwhddvpc2razid.onion", + "http://libreddit.2syis2nnyytz6jnusnjurva4swlaizlnleiks5mjp46phuwjbdjqwgqd.onion", + "http://ol5begilptoou34emq2sshf3may3hlblvipdjtybbovpb7c7zodxmtqd.onion", + "http://lbrdtjaj7567ptdd4rv74lv27qhxfkraabnyphgcvptl64ijx2tijwid.onion", + "http://libreddit.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion", + "http://reddit.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion", + "http://inz6tbezfwzexva6dize4cqraj2tjdhygxabmcgysccesvw2pybzhbyd.onion", + "http://libreddit.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion", + "http://lr.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion" + ] + }, + "teddit": { + "normal": [ + "https://teddit.net", + "https://teddit.ggc-project.de", + "https://teddit.zaggy.nl", + "https://teddit.namazso.eu", + "https://teddit.nautolan.racing", + "https://teddit.tinfoil-hat.net", + "https://teddit.domain.glass", + "https://snoo.ioens.is", + "https://teddit.httpjames.space", + "https://incogsnoo.com", + "https://teddit.pussthecat.org", + "https://reddit.lol", + "https://teddit.sethforprivacy.com", + "https://teddit.totaldarkness.net", + "https://teddit.adminforge.de", + "https://teddit.bus-hit.me", + "https://teddit.froth.zone", + "https://rdt.trom.tf", + "https://teddit.encrypted-data.xyz", + "https://i.opnxng.com", + "https://teddit.tokhmi.xyz", + "https://teddit.garudalinux.org", + "https://tedd.it" + ], + "tor": [ + "http://snoo.ioensistjs7wd746zluwixvojbbkxhr37lepdvwtdfeav673o64iflqd.onion", + "http://ibarajztopxnuhabfu7fg6gbudynxofbnmvis3ltj6lfx47b6fhrd5qd.onion", + "http://tedditfyn6idalzso5wam5qd3kdtxoljjhbrbbx34q2xkcisvshuytad.onion", + "http://dawtyi5e2cfyfmoht4izmczi42aa2zwh6wi34zwvc6rzf2acpxhrcrad.onion", + "http://qtpvyiaqhmwccxwzsqubd23xhmmrt75tdyw35kp43w4hvamsgl3x27ad.onion" + ] + }, + "wikiless": { + "normal": [ + "https://wikiless.org", + "https://wikiless.sethforprivacy.com", + "https://wiki.604kph.xyz", + "https://wikiless.lunar.icu", + "https://wiki.froth.zone", + "https://wikiless.northboot.xyz", + "https://wikiless.tiekoetter.com", + "https://wikiless.esmailelbob.xyz", + "https://wiki.slipfox.xyz", + "https://wikiless.funami.tech" + ], + "tor": [ + "http://dj2tbh2nqfxyfmvq33cjmhuw7nb6am7thzd3zsjvizeqf374fixbrxyd.onion", + "http://ybgg2evrcdz37y2qes23ff3wjqjdn33tthgoagi76vhxytu4mpxiz5qd.onion", + "http://wikiless.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion", + "http://c2pesewpalbi6lbfc5hf53q4g3ovnxe4s7tfa6k2aqkf7jd7a7dlz5ad.onion" + ], + "i2p": [ + "http://hflqp2ejxygpj6cdwo3ogfieqmxw3b56w7dblt7bor2ltwk6kcfa.b32.i2p", + "http://x33lx4h6d7h6xs4eiqwhvaxn3ea5gn2ifmu3jobnvuvn4k4aej7a.b32.i2p" + ] + }, + "scribe": { + "normal": [ + "https://scribe.rip", + "https://scribe.nixnet.services", + "https://scribe.citizen4.eu", + "https://scribe.bus-hit.me", + "https://scribe.froth.zone" + ], + "tor": [] + }, + "quetre": { + "normal": [ + "https://quetre.herokuapp.com", + "https://quora.vern.cc", + "https://quetre.pussthecat.org", + "https://wuetre.herokuapp.com", + "https://quetreus.herokuapp.com", + "https://quetre.tokhmi.xyz", + "https://quetre.projectsegfau.lt" + ], + "tor": [] + }, + "libremdb": { + "normal": [ + "https://libremdb.herokuapp.com", + "https://libremdb.pussthecat.org", + "https://libremdbeu.herokuapp.com", + "https://lmdb.tokhmi.xyz" + ], + "tor": [] + }, + "simplyTranslate": { + "normal": [ + "https://simplytranslate.org", + "https://st.tokhmi.xyz", + "https://translate.josias.dev", + "https://translate.namazso.eu", + "https://translate.riverside.rocks", + "https://st.manerakai.com", + "https://translate.bus-hit.me", + "https://simplytranslate.pussthecat.org", + "https://translate.northboot.xyz", + "https://translate.tiekoetter.com", + "https://simplytranslate.esmailelbob.xyz", + "https://tl.vern.cc", + "https://translate.slipfox.xyz", + "https://st.privacydev.net", + "https://translate.beparanoid.de", + "https://translate.priv.pw" + ], + "tor": [ + "http://fyng2tsmzmvxmojzbbwmfnsn2lrcyftf4cw6rk5j2v2huliazud3fjid.onion", + "http://xxtbwyb5z5bdvy2f6l2yquu5qilgkjeewno4qfknvb3lkg3nmoklitid.onion", + "http://translate.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion" + ], + "i2p": [ + "http://kmnkkp4v4ublygtnyq46oacy3qw75nrxxniriuaersumw7bfsm2a.b32.i2p" + ], + "loki": [ + "http://translate.priv.loki" + ] + }, + "lingva": { + "normal": [ + "https://lingva.ml", + "https://translate.igna.ooo", + "https://lingva.pussthecat.org", + "https://translate.plausibility.cloud", + "https://lingva.lunar.icu", + "https://lingva.opnxng.com" + ], + "tor": [] + }, + "searx": { + "tor": [ + "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion", + "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion", + "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion", + "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion", + "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion", + "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion", + "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion" + ], + "i2p": [ + "http://ransack.i2p", + "http://mqamk4cfykdvhw5kjez2gnvse56gmnqxn7vkvvbuor4k4j2lbbnq.b32.i2p" + ], + "normal": [ + "https://anon.sx", + "https://dynabyte.ca", + "https://jsearch.pw", + "https://search.ethibox.fr", + "https://search.snopyta.org", + "https://search.stinpriza.org", + "https://search.trom.tf", + "https://searx.bissisoft.com", + "https://searx.divided-by-zero.eu", + "https://searx.dresden.network", + "https://searx.fossencdi.org", + "https://searx.gnu.style", + "https://searx.mastodontech.de", + "https://searx.mxchange.org", + "https://searx.nakhan.net", + "https://searx.netzspielplatz.de", + "https://searx.nixnet.services", + "https://searx.org", + "https://searx.pwoss.org", + "https://searx.rasp.fr", + "https://searx.ru", + "https://searx.run", + "https://searx.semipvt.com", + "https://searx.sp-codes.de", + "https://searx.stuehieyr.com", + "https://searx.tuxcloud.net", + "https://searx.tyil.nl", + "https://searx.vanwa.tech", + "https://searx.webheberg.info", + "https://searx.xyz", + "https://searx.zapashcanon.fr", + "https://searxng.ir", + "https://spot.ecloud.global", + "https://suche.dasnetzundich.de", + "https://suche.tromdienste.de", + "https://suche.uferwerk.org", + "https://sx.catgirl.cloud", + "https://timdor.noip.me/searx", + "https://searx.roflcopter.fr" + ] + }, + "searxng": { + "tor": [ + "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion", + "http://x5gdjh6t7kb4yubpufhtc3l3df2acev3emxdasd5vyuyoon5rzf5zkyd.onion", + "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion", + "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion", + "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion", + "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion", + "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion", + "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion", + "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion", + "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx", + "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion" + ], + "i2p": [], + "normal": [ + "https://darmarit.org/searx", + "https://de.xcxc.ml", + "https://etsi.me", + "https://icanfindit.online", + "https://jackgoss.xyz", + "https://northboot.xyz", + "https://opnxng.com", + "https://paulgo.io", + "https://priv.au", + "https://private-searx.ml", + "https://privatus.live", + "https://s.frlt.one", + "https://s.zhaocloud.net", + "https://search.affusio.com", + "https://search.ashs.club", + "https://search.bingowaves.xyz", + "https://search.bus-hit.me", + "https://search.chemicals-in-the-water.eu", + "https://search.disroot.org", + "https://search.gcomm.ch", + "https://search.kiwitalk.de", + "https://search.mdosch.de", + "https://search.neet.works", + "https://search.ononoki.org", + "https://search.privacyguides.net", + "https://search.projectsegfau.lt", + "https://search.rabbit-company.com", + "https://search.sapti.me", + "https://search.teamriverbubbles.com", + "https://search.unlocked.link", + "https://search.zzls.xyz", + "https://searx.be", + "https://searx.becomesovran.com", + "https://searx.chocoflan.net", + "https://searx.ebnar.xyz", + "https://searx.ericaftereric.top", + "https://searx.esmailelbob.xyz", + "https://searx.fi", + "https://searx.fmac.xyz", + "https://searx.gnous.eu", + "https://searx.loafland.xyz", + "https://searx.mha.fi", + "https://searx.mistli.net", + "https://searx.namejeff.xyz", + "https://searx.orion-hub.fr", + "https://searx.priv.pw", + "https://searx.prvcy.eu", + "https://searx.rimkus.it", + "https://searx.sethforprivacy.com", + "https://searx.sev.monster", + "https://searx.slipfox.xyz/searx", + "https://searx.tiekoetter.com", + "https://searx.vimproved.me", + "https://searx.youshitsune.me", + "https://searx.zcyph.cc", + "https://searxng.au/searx", + "https://searxng.tordenskjold.de", + "https://searxng.zackptg5.com", + "https://serx.ml", + "https://srx.cosmohub.io", + "https://swag.pw", + "https://www.gruble.de", + "https://www.webrats.xyz", + "https://xcxc.ml" + ] + }, + "whoogle": { + "normal": [ + "https://gowogle.voring.me", + "https://s.tokhmi.xyz", + "https://search.albony.xyz", + "https://search.garudalinux.org", + "https://search.dr460nf1r3.org", + "https://search.sethforprivacy.com", + "https://whoogle.fossho.st", + "https://www.whooglesearch.ml", + "https://whoogle.dcs0.hu", + "https://whoogle.esmailelbob.xyz", + "https://whoogle.lunar.icu", + "https://whoogle.privacydev.net", + "https://search.wef.lol" + ], + "tor": [], + "i2p": [] + }, + "librex": { + "normal": [ + "https://librex.beparanoid.de", + "https://search.davidovski.xyz", + "https://search.funami.tech", + "https://librex.catalyst.sx" + ], + "tor": [ + "http://librex.prnoid54e44a4bduq5due64jkk7wcnkxcp5kv3juncm7veptjcqudgyd.onion", + "http://librex.so2mpiyfo4cje7bof5v52y3cvjyo2haxpqfvut4sr6gj2ul4mddx2jid.onion" + ], + "i2p": [ + "http://fboseyskrqpi6yjiifvz4ryuoiswjezkqsfxfkm2vmbuhehbpr7q.b32.i2p" + ] + }, + "rimgo": { + "normal": [ + "https://i.bcow.xyz", + "https://rimgo.pussthecat.org", + "https://rimgo.bus-hit.me", + "https://rimgo.esmailelbob.xyz", + "https://rimgo.lunar.icu", + "https://i.actionsack.com", + "https://rimgo.privacydev.net", + "https://imgur.artemislena.eu", + "https://rimgo.vern.cc", + "https://rimgo.encrypted-data.xyz", + "https://rimgo.mha.fi" + ], + "tor": [ + "http://rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion", + "http://rimgo.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion", + "http://rimgo.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion" + ], + "i2p": [] + }, + "librarian": { + "normal": [ + "https://lbry.bcow.xyz", + "https://odysee.076.ne.jp", + "https://librarian.pussthecat.org", + "https://lbry.mutahar.rocks", + "https://librarian.esmailelbob.xyz", + "https://lbry.vern.cc" + ], + "tor": [ + "http://librarian.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion", + "http://lbry.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion" + ], + "i2p": [] + }, + "peertube": [ + "https://pire.artisanlogiciel.net", + "https://trutube.xyz", + "https://tube-test.apps.education.fr", + "https://tube-sciences-technologies.apps.education.fr", + "https://stream.conesphere.cloud", + "https://tube-institutionnel.apps.education.fr", + "https://trutube.online", + "https://tube-cycle-3.apps.education.fr", + "https://video.manicphase.me", + "https://tube.emy.plus", + "https://v.bearvideo.win", + "https://tubulus.openlatin.org", + "https://peertube.securetown.top", + "https://tv.datamol.org", + "https://video.graine-pdl.org", + "https://tube.zee.li", + "https://tube-cycle-2.apps.education.fr", + "https://mikeclips.net", + "https://tube.s1gm4.eu", + "https://videos.keyedlimepie.org", + "https://video.cpn.so", + "https://video.davduf.net", + "https://tube.oldkid.digital", + "https://tube.fofoca.eu", + "https://tube-langues-vivantes.apps.education.fr", + "https://tube-arts-lettres-sciences-humaines.apps.education.fr", + "https://videos.scanlines.xyz", + "https://video.kicik.fr", + "https://media.theplattform.net", + "https://peertube.offerman.com", + "https://v.lastorder.xyz", + "https://video.eradicatinglove.xyz", + "https://peertube.thele.me", + "https://video.schnitzler.one", + "https://tube.cybershock.life", + "https://tube.reseau-canope.fr", + "https://frentube.myyouniverse.observer", + "https://tube-maternelle.apps.education.fr", + "https://peertube.onionstorm.net", + "https://dev.dollarvigilante.tv", + "https://video.trankil.info", + "https://video.uriopss-pdl.fr", + "https://pt.bolapara.mywire.org", + "https://ptube.ranranhome.info", + "https://vidid.pl", + "https://video.3cmr.fr", + "https://tube.die-rote-front.de", + "https://peertube.miguelcr.me", + "https://video.thinkof.name", + "https://nekofans.tv", + "https://video.comun.al", + "https://peertube.nrsk.no", + "https://video.occm.cc", + "https://peertube.viviers-fibre.net", + "https://tube-action-educative.apps.education.fr", + "https://themadlads.live", + "https://jahve.pl", + "https://videos.yesil.club", + "https://peertube.adjutor.xyz", + "https://peertube.terranout.mine.nu", + "https://tube.hunterjozwiak.com", + "https://tube-numerique-educatif.apps.education.fr", + "https://tube.itsg.host", + "https://tube.valinor.fr", + "https://lucarne.balsamine.be", + "https://peertube.suranyami.com", + "https://video.ados.accoord.fr", + "https://t.0x0.st", + "https://tube-education-physique-et-sportive.apps.education.fr", + "https://videos.lemouvementassociatif-pdl.org", + "https://videos.casually.cat", + "https://playroom.kitsunes.world", + "https://tube2.nous.media", + "https://peertube.freenet.ru", + "https://peertube.0x5e.eu", + "https://tube.darknight-coffee.org", + "https://play.mittdata.se", + "https://peertube.lhc.net.br", + "https://see.vtopia.live", + "https://peertube.letoine.fr", + "https://tube-enseignement-professionnel.apps.education.fr", + "https://socpeertube.ru", + "https://videos.laliguepaysdelaloire.org", + "https://videotube.duckdns.org", + "https://quantube.win", + "https://twctube.twc-zone.eu", + "https://vhs.absturztau.be", + "https://video.espr.moe", + "https://peertube.social.my-wan.de", + "https://phijkchu.com", + "https://video.lycee-experimental.org", + "https://galileo.news", + "https://peertube.otakufarms.com", + "https://tube.motuhake.xyz", + "https://pt.m0r016.net", + "https://hitchtube.fr", + "https://video.fox-romka.ru", + "https://peertube.ctrl-c.liu.se", + "https://peertube.live", + "https://video.slipfox.xyz", + "https://pt.vern.cc", + "https://vnop.org", + "https://videos.cassidypunchmachine.com", + "https://tv1.gomntu.space", + "https://dalek.zone", + "https://seka.pona.la", + "https://syop.tv", + "https://watch.thelema.social", + "https://tube.miegl.cz", + "https://mov.clov.fr", + "https://videomensoif.ynh.fr", + "https://videos.neongarden.life", + "https://video.vaku.org.ua", + "https://videos.trom.lt", + "https://videod.fr", + "https://vid.mkp.ca", + "https://jupiter.tube", + "https://tuvideo.encanarias.info", + "https://videos.squat.net", + "https://peertube.chaunchy.com", + "https://tube.vrpnet.org", + "https://video.tii.space", + "https://peertube.familleboisteau.fr", + "https://peertube.inubo.ch", + "https://nightshift.minnix.dev", + "https://tube.friloux.me", + "https://peertube.virtual-assembly.org", + "https://video.olos311.org", + "https://peertube.atilla.org", + "https://video.lapineige.fr", + "https://zapping.no-ip.info", + "https://tube.azkware.net", + "https://video.lunasqu.ee", + "https://v.mkp.ca", + "https://peertube.eus", + "https://infothema.net", + "https://tube.nilsu.org", + "https://podlibre.video", + "https://videos.tankernn.eu", + "https://watch.autonomous-zone.earth", + "https://pirtube.calut.fr", + "https://y.melonia.se", + "https://peertube.cirkau.art", + "https://peertube.2i2l.net", + "https://videos.martyn.berlin", + "https://turkum.me", + "https://video.colibris-outilslibres.org", + "https://invoice.peertube.biz", + "https://vnhup.com", + "https://peertube.chantierlibre.org", + "https://video.9wd.eu", + "https://video.niboe.info", + "https://peertuibe.fedsinfo.nohost.me", + "https://s9.gegenstimme.tv", + "https://pocketnetpeertube1.nohost.me", + "https://videos.alamaisondulibre.org", + "https://videos.tormentasolar.win", + "https://tube.nestor.coop", + "https://live.oldskool.fi", + "https://dytube.com", + "https://tube.thierrytalbert.fr", + "https://peertube.informaction.info", + "https://tube.ac-amiens.fr", + "https://tube.alado.space", + "https://tube.network.europa.eu", + "https://vnchich.com", + "https://pt.maciej.website", + "https://peertube.frontmediatique.fr", + "https://peertube.bgzashtita.es", + "https://tube.genb.de", + "https://cliptube.org", + "https://tube.tr4sk.me", + "https://videos.campdarling.com", + "https://video.mikka.md", + "https://www.aktion-nordost.tv", + "https://tube.rooty.fr", + "https://tube.dnet.one", + "https://peertube.io", + "https://peertube.echelon4.space", + "https://www.kotikoff.net", + "https://peertube.nz", + "https://videos.grafo.zone", + "https://tube.chocoflan.net", + "https://video.pthreat.co", + "https://peertube.egroc.de", + "https://pt.k2s.sk", + "https://video.cats-home.net", + "https://peertube.narrativerry.xyz", + "https://tube.9minuti.it", + "https://krdtube.org", + "https://peertube.elforcer.ru", + "https://tubocatodico.bida.im", + "https://linhtran.eu", + "https://torstenwitte.peertube-host.de", + "https://peertube.hackerfraternity.org", + "https://openmedia.edunova.it", + "https://ocfedtest.hosted.spacebear.ee", + "https://video.lono.space", + "https://mirrored.rocks", + "https://videopen.net", + "https://demo.lioncast.org", + "https://peertube.get-racing.de", + "https://pierre.tube", + "https://mirametube.fr", + "https://vidz.dou.bet", + "https://videos.redeyes.site", + "https://video.hostpath.de", + "https://free-streams.com", + "https://tube.pawelko.net", + "https://video.livecchi.cloud", + "https://anarchy.video", + "https://peertube.gsugambit.com", + "https://media.zat.im", + "https://videos.sadx.moe", + "https://pt.nospy.net", + "https://yhwh.tube", + "https://peerlook.ru", + "https://monero.wf", + "https://tube.kicou.info", + "https://video.aqr.af", + "https://videos-passages.huma-num.fr", + "https://video.linc.systems", + "https://video.sftblw.moe", + "https://peertube.dsmouse.net", + "https://ptube.horsentiers.fr", + "https://video.cnt.social", + "https://peertube.okko.io", + "https://video.mentality.rip", + "https://tube.03281.fspfc.org", + "https://tube.linc.systems", + "https://peertube.ketchup.noho.st", + "https://yt.x1337x.fr", + "https://videos.rabbit-company.com", + "https://video.paradigmthreat.net", + "https://video.lincolncyber.com", + "https://vid.twhtv.club", + "https://video.retroedge.tech", + "https://truvitv.com", + "https://pt.ilyamikcoder.com", + "https://peertube.sensin.eu", + "https://watch.riverside.rocks", + "https://sharetube.us", + "https://video.sadmin.io", + "https://stream.jurnalfm.md", + "https://video.asgardius.company", + "https://video.publicspaces.net", + "https://video.eientei.org", + "https://tv.suwerenni.org", + "https://tube.revertron.com", + "https://tube.erzbistum-hamburg.de", + "https://video.germanische-heilkunde.at", + "https://views.southfox.me", + "https://vide.oxel.me", + "https://video.mttv.it", + "https://peertube.cloud.nerdraum.de", + "https://vid.pretok.tv", + "https://videos.slownewsdayshow.com", + "https://videos.sarcasmstardust.com", + "https://videos.factsonthegroundshow.com", + "https://video.regenpfeifer.net", + "https://video.pe6.eu", + "https://tv.santic-zombie.ru", + "https://tube.sleeping.town", + "https://tube.globalfrens.com", + "https://peertube.hacknews.pmdcollab.org", + "https://freetubes.nohost.me", + "https://video.snug.moe", + "https://video.avant-le-strike.buzz", + "https://videos.ritimo.org", + "https://videos.ephphatha.church", + "https://video.cerclearistote.com", + "https://computerstuff.mooo.com", + "https://video.greenmycity.eu", + "https://przej.me", + "https://pt.mezzo.moe", + "https://tube.dsocialize.net", + "https://video.pourpenser.pro", + "https://videos.npo.city", + "https://live2.codinglab.ch", + "https://video.linux.it", + "https://bee-tube.fr", + "https://vid.prometheus.systems", + "https://tube.nx12.net", + "https://redundant2.peertube.support", + "https://peertube.ignifi.me", + "https://tv.based.quest", + "https://peertube.beardedtek.com", + "https://creemoseducacioninclusiva.uma.es", + "https://videos.yeswiki.net", + "https://tube.lrk.sh", + "https://peertube.autogestioncitoyenne.org", + "https://stream.dynacloud.ynh.fr", + "https://video.r3s.nrw", + "https://peertube.semweb.pro", + "https://poast.tv", + "https://testube.distrilab.fr", + "https://peertube.rse43.com", + "https://libremedia.video", + "https://vid.lelux.fi", + "https://v.wolfskaempf.de", + "https://peertube.chevro.fr", + "https://media.econoalchemist.com", + "https://video.qoto.org", + "https://peertube.maxweiss.io", + "https://peertube.chatinbit.com", + "https://peertube.ffs2play.fr", + "https://peertube.swarm.solvingmaz.es", + "https://film.node9.org", + "https://peertube.mi-site.net", + "https://tube.nowtech.io", + "https://raptube.antipub.org", + "https://video.cm-en-transition.fr", + "https://tube.koweb.fr", + "https://peertube.genma.fr", + "https://tv.generallyrubbish.net.au", + "https://video.travisshears.xyz", + "https://videos.codingotaku.com", + "https://foss.tube", + "https://peertube.satoshishop.de", + "https://ua.peertube.red", + "https://peertube.zwindler.fr", + "https://videos.fsci.in", + "https://swebbtube.se", + "https://video.dnfi.no", + "https://peertube.revelin.fr", + "https://armstube.com", + "https://peertube.ti-fr.com", + "https://video.turbo.chat", + "https://tube.toldi.eu", + "https://review.peertube.biz", + "https://peertube.am-networks.fr", + "https://video.chbmeyer.de", + "https://video.rs-einrich.de", + "https://p2ptv.ru", + "https://peertube.librenet.co.za", + "https://h3h3.club", + "https://watch.snoot.tube", + "https://tube.freepeople.fr", + "https://watch.rt4mn.org", + "https://video.lrose.de", + "https://video.chalec.org", + "https://dud175.inf.tu-dresden.de", + "https://peertube.fenarinarsa.com", + "https://peertube.gardion.de", + "https://ias-peertube.iosb.fraunhofer.de", + "https://visionon.tv", + "https://polskijutub.mkljczk.pl", + "https://peertube.noussommes.org", + "https://exode.me", + "https://megatube.lilomoino.fr", + "https://video.anartist.org", + "https://peertube.home.x0r.fr", + "https://peertube.marud.fr", + "https://freetubehub.live", + "https://peertube.librelabucm.org", + "https://tube4.apolut.net", + "https://mtube.mooo.com", + "https://skeptube.fr", + "https://tube.villejuif.fr", + "https://videos.hyphalfusion.network", + "https://videos.fromouter.space", + "https://pocketnetpeertube11.nohost.me", + "https://tube.1o1.io", + "https://peertube.aventer.biz", + "https://videos.rights.ninja", + "https://tube.pilgerweg-21.de", + "https://pocketnetpeertube2.nohost.me", + "https://peertube.bubbletea.dev", + "https://peertube.art3mis.de", + "https://open.movie", + "https://tube.rfc1149.net", + "https://tube.radiomercure.fr", + "https://medias.debrouillonet.org", + "https://peertube.1984.cz", + "https://tube.sp4ke.com", + "https://pt.nix.uno", + "https://videos.openmandriva.org", + "https://video.vanderwarker.photos", + "https://peertube.soykaf.org", + "https://tube.interhacker.space", + "https://video.firehawk-systems.com", + "https://tube.otter.sh", + "https://replay.jres.org", + "https://peertube.lagob.fr", + "https://peertube.gcaillaut.fr", + "https://peertube.hellsite.net", + "https://peertube.hosnet.fr", + "https://video.extremelycorporate.ca", + "https://video.zarchbox.ovh", + "https://video.sgiath.dev", + "https://videos.b4tech.org", + "https://video.off-investigation.fr", + "https://tube.source.news", + "https://tube.childrenshealthdefense.eu", + "https://stream.litera.tools", + "https://peertube.kriom.net", + "https://peertube.grosist.fr", + "https://peertube.gemlog.ca", + "https://nettube.uc-netcorsoft.de", + "https://live.solari.com", + "https://live.codinglab.ch", + "https://dud-video.inf.tu-dresden.de", + "https://media-test.interior.edu.uy", + "https://media.interior.edu.uy", + "https://peertube.la-scic.fr", + "https://phoenixproject.group", + "https://peertube.sebu77.com", + "https://www.orion-hub.fr", + "https://tv.orion-serv.fr", + "https://video.interru.io", + "https://tube.cnr.it", + "https://peertube.dtmf.ca", + "https://tube.ponsonaille.fr", + "https://tube.int5.net", + "https://peertube.jackbot.fr", + "https://stream.nuemedia.se", + "https://peertube.wiredentrypoint.xyz", + "https://videos.lemnoslife.com", + "https://peertube.arch-linux.cz", + "https://tube.digitalesozialearbeit.de", + "https://tube.spdns.org", + "https://tube.onlinekirche.net", + "https://tube.systerserver.net", + "https://peertube.redpill-insight.com", + "https://pt.sfunk1x.com", + "https://video.antopie.org", + "https://vtr.chikichiki.tube", + "https://fedimovie.com", + "https://videos.thinkerview.com", + "https://tube.doctors4covidethics.org", + "https://yoba.tv", + "https://tube.mediainformationcenter.de", + "https://peertube.communecter.org", + "https://peertube.librosphere.fr", + "https://queermotion.org", + "https://video.audiovisuel-participatif.org", + "https://peertube.vip", + "https://video.eutychia.org", + "https://video.liveitlive.show", + "https://vid.plantplotting.co.uk", + "https://video.telemillevaches.net", + "https://tv.pirati.cz", + "https://peertube.therealblue.de", + "https://tube.nuxnik.com", + "https://tube.froth.zone", + "https://peertube.ethibox.fr", + "https://www.freetubehub.live", + "https://tube.communia.org", + "https://peertube.dragonborn.app", + "https://ai-tube.ch", + "https://video.citizen4.eu", + "https://video.matomocamp.org", + "https://media.fsfe.org", + "https://flytandemeistring.space", + "https://video.windfluechter.org", + "https://pocketnetpeertube10.nohost.me", + "https://tube.io18.top", + "https://peertube.remerge.net", + "https://video.wuatek.is", + "https://tube.geekyboo.net", + "https://notretube.asselma.eu", + "https://canal.facil.services", + "https://ukva.li", + "https://pt.gordons.gen.nz", + "https://tube.misterbanal.net", + "https://peertube.fomin.site", + "https://peertube.kenjiyon.xyz", + "https://tube.g1zm0.de", + "https://video.ellijaymakerspace.org", + "https://videos.benpro.fr", + "https://tube.fait.ch", + "https://peertube.expi.studio", + "https://crank.recoil.org", + "https://tube.flokinet.is", + "https://peertube.education-forum.com", + "https://apathy.tv", + "https://pocketnetpeertube9.nohost.me", + "https://lfbu.nl", + "https://tube.benzo.online", + "https://peertube.paladyn.org", + "https://fightforinfo.com", + "https://tube.ulne.be", + "https://video.rubdos.be", + "https://tube.tuxfriend.fr", + "https://anarchy.tube", + "https://nsfw.vger.cloud", + "https://tube.elemac.fr", + "https://tube.nocturlab.fr", + "https://videos.optoutpod.com", + "https://videos.bik.opencloud.lu", + "https://videos.aadtp.be", + "https://videos.gunfreezone.net", + "https://videos.globenet.org", + "https://tube.klardenken.tv", + "https://serv2.wiki-tube.de", + "https://tube2.apolut.net", + "https://pt01.lehrerfortbildung-bw.de", + "https://videos.buceoluegoexisto.com", + "https://tube.exozy.me", + "https://video.benetou.fr", + "https://bideoak.argia.eus", + "https://video.hainry.fr", + "https://video.gresille.org", + "https://peertube.tangentfox.com", + "https://puffy.tube", + "https://tube.kher.nl", + "https://watch.ocaml.org", + "https://peertube.kleph.eu", + "https://tube.missbanal.net", + "https://pityu.flaki.hu", + "https://tv.catalpafestival.fr", + "https://pony.tube", + "https://peertube.umeahackerspace.se", + "https://tube.okcinfo.news", + "https://www.rocaguinarda.tv", + "https://videos.wirtube.de", + "https://tube.tinfoil-hat.net", + "https://livegram.net", + "https://video.ustim.ru", + "https://merci-la-police.fr", + "https://pocketnetpeertube7.nohost.me", + "https://video.rhizome.org", + "https://dnk.video", + "https://video.medienzentrum-harburg.de", + "https://video.metaccount.de", + "https://video.libreti.net", + "https://leopard.tube", + "https://peertube.skorpil.cz", + "https://peertube.scyldings.com", + "https://gade.o-k-i.net", + "https://peertube.mobilsicher.de", + "https://video.jigmedatse.com", + "https://video.amiga-ng.org", + "https://peertube.espace.si", + "https://videos.supertuxkart.net", + "https://pt.borgcube.eu", + "https://mp-tube.de", + "https://socialwebtube.com", + "https://kraut.zone", + "https://www.birkeundnymphe.de", + "https://birkeundnymphe.de", + "https://v.kisombrella.top", + "https://peertube.w.utnw.de", + "https://tube.sp-codes.de", + "https://tube.apolut.net", + "https://tube.mfraters.net", + "https://tube.pyngu.com", + "https://peertube.troback.com", + "https://peertube.ucy.de", + "https://peertube.aukfood.net", + "https://peertube.bridaahost.ynh.fr", + "https://peertube.myrasp.eu", + "https://watch.softinio.com", + "https://peertube.plataformess.org", + "https://tube.arthack.nz", + "https://tv.atmx.ca", + "https://kino.kompot.si", + "https://tube.kockatoo.org", + "https://peertube.cabaal.net", + "https://sovran.video", + "https://stream.k-prod.fr", + "https://tube.tylerdavis.xyz", + "https://video.marcorennmaus.de", + "https://peertube.ecologie.bzh", + "https://peertube.atsuchan.page", + "https://peertube.vlaki.cz", + "https://video-cave-v2.de", + "https://peertube.keazilla.net", + "https://vids.tekdmn.me", + "https://piraten.space", + "https://tube.bstly.de", + "https://web-fellow.de", + "https://peertube.alpharius.io", + "https://ptb.lunarviews.net", + "https://ovaltube.codinglab.ch", + "https://video.wilkie.how", + "https://videos.ahp-numerique.fr", + "https://auf1.eu", + "https://tube.toontoet.nl", + "https://video.gyt.is", + "https://peertube.jensdiemer.de", + "https://tube.futuretic.fr", + "https://libra.syntazia.org", + "https://peertube.beeldengeluid.nl", + "https://tv.lumbung.space", + "https://vid.dascoyote.xyz", + "https://peertube.cuatrolibertades.org", + "https://videos.hush.is", + "https://tube.ebin.club", + "https://tube.tpshd.de", + "https://video.ozgurkon.org", + "https://video.progressiv.dev", + "https://video.migennes.net", + "https://irrsinn.video", + "https://pocketnetpeertube4.nohost.me", + "https://comf.tube", + "https://pocketnetpeertube6.nohost.me", + "https://pocketnetpeertube5.nohost.me", + "https://peertube.radres.xyz", + "https://darkvapor.nohost.me", + "https://tube.chaoszone.tv", + "https://media.over-world.org", + "https://tube.avensio.de", + "https://peertube.klaewyss.fr", + "https://sender-fm.veezee.tube", + "https://peertube.takeko.cyou", + "https://hyperreal.tube", + "https://peertube.kalua.im", + "https://tv.undersco.re", + "https://video.selea.se", + "https://tv.neue.city", + "https://videos.shmalls.pw", + "https://peertube.iriseden.eu", + "https://video.shitposter.club", + "https://tv.mattchristiansenmedia.com", + "https://tube.hackerscop.org", + "https://peertube.kx.studio", + "https://videos.3d-wolf.com", + "https://tube.octaplex.net", + "https://video.076.ne.jp", + "https://stream.elven.pw", + "https://juggling.digital", + "https://videos.rampin.org", + "https://bitcointv.com", + "https://media.gzevd.de", + "https://video.resolutions.it", + "https://tube.cms.garden", + "https://peertube.luckow.org", + "https://video.linuxtrent.it", + "https://tube.bachaner.fr", + "https://video.comune.trento.it", + "https://tube.org.il", + "https://tv.pirateradio.social", + "https://peertube.eu.org", + "https://peertube.mxinfo.fr", + "https://tube.frischesicht.de", + "https://peertube1.zeteo.me", + "https://conspiracydistillery.com", + "https://peertube.chemnitz.freifunk.net", + "https://hpstube.fr", + "https://video.blast-info.fr", + "https://peertube.bubuit.net", + "https://tube.aerztefueraufklaerung.de", + "https://video.cybre.town", + "https://the.jokertv.eu", + "https://climatejustice.video", + "https://wikileaks.video", + "https://fair.tube", + "https://tube.lokad.com", + "https://videos.benjaminbrady.ie", + "https://video.binarydad.com", + "https://tube.pmj.rocks", + "https://gary.vger.cloud", + "https://video.guerredeclasse.fr", + "https://ptmir4.inter21.net", + "https://ptmir3.inter21.net", + "https://peertube.habets.house", + "https://tube.yapbreak.fr", + "https://peertube.ctseuro.com", + "https://spectra.video", + "https://live.nanao.moe", + "https://peertube.inapurna.org", + "https://watch.libertaria.space", + "https://video.triplea.fr", + "https://video.catgirl.biz", + "https://vulgarisation-informatique.fr", + "https://tube.kotur.org", + "https://peertube.euskarabildua.eus", + "https://video.veloma.org", + "https://regarder.sans.pub", + "https://tube.rhythms-of-resistance.org", + "https://tube-bordeaux.beta.education.fr", + "https://video.lespoesiesdheloise.fr", + "https://peertube.luga.at", + "https://peertube.roflcopter.fr", + "https://ptube.rousset.nom.fr", + "https://peertube.swrs.net", + "https://tube.shanti.cafe", + "https://videos.cloudron.io", + "https://tube.seditio.fr", + "https://video.p3x.de", + "https://video.codingfield.com", + "https://tv.adn.life", + "https://peertube.functional.cafe", + "https://peertube.br0.fr", + "https://video.bards.online", + "https://video.toot.pt", + "https://videos.archigny.net", + "https://videos.pzelawski.xyz", + "https://peertube.zoz-serv.org", + "https://videos.stadtfabrikanten.org", + "https://peertube.gargantia.fr", + "https://tube.melonbread.xyz", + "https://tube.grap.coop", + "https://webtv.vandoeuvre.net", + "https://peertube.european-pirates.eu", + "https://video.fhtagn.org", + "https://kirche.peertube-host.de", + "https://v.lor.sh", + "https://peertube.be", + "https://peertube.linuxrocks.online", + "https://grypstube.uni-greifswald.de", + "https://wiwi.video", + "https://video.soi.ch", + "https://peertube.newsocial.tech", + "https://peertube.cpge-brizeux.fr", + "https://tube.distrilab.fr", + "https://kinowolnosc.pl", + "https://videos.trom.tf", + "https://videos.john-livingston.fr", + "https://melsungen.peertube-host.de", + "https://evangelisch.video", + "https://tube.anufrij.de", + "https://videos.mastodont.cat", + "https://video.taboulisme.com", + "https://media.undeadnetwork.de", + "https://tube.dragonpsi.xyz", + "https://veezee.tube", + "https://peertube.nicolastissot.fr", + "https://s2.veezee.tube", + "https://tubes.jodh.us", + "https://tube.lucie-philou.com", + "https://video.odayacres.farm", + "https://tube.schule.social", + "https://unfilter.tube", + "https://tube.systest.eu", + "https://tube.xd0.de", + "https://tube.xy-space.de", + "https://studios.racer159.com", + "https://exo.tube", + "https://fediverse.tv", + "https://xxivproduction.video", + "https://digitalcourage.video", + "https://tvox.ru", + "https://video.kuba-orlik.name", + "https://peer.azurs.fr", + "https://video.ecole-89.com", + "https://tube.kai-stuht.com", + "https://video.fbxl.net", + "https://live.libratoi.org", + "https://video.p1ng0ut.social", + "https://watch.deranalyst.ch", + "https://video.discord-insoumis.fr", + "https://video.pcf.fr", + "https://kumi.tube", + "https://tube.rsi.cnr.it", + "https://peertube.dc.pini.fr", + "https://peertube.simounet.net", + "https://peertube.bilange.ca", + "https://watch.ignorance.eu", + "https://tube.schleuss.online", + "https://tube-corse.beta.education.fr", + "https://tube-creteil.beta.education.fr", + "https://tube.saumon.io", + "https://tube-paris.beta.education.fr", + "https://theater.ethernia.net", + "https://watch.tubelab.video", + "https://lastbreach.tv", + "https://tube.abolivier.bzh", + "https://video.coales.co", + "https://film.k-prod.fr", + "https://videos.danksquad.org", + "https://peertube.tweb.tv", + "https://peertube.lestutosdeprocessus.fr", + "https://video.mycrowd.ca", + "https://kodcast.com", + "https://video.altertek.org", + "https://ruraletv.ovh", + "https://videos.weblib.re", + "https://tube.oisux.org", + "https://peertube.louisematic.site", + "https://clap.nerv-project.eu", + "https://tube.lacaveatonton.ovh", + "https://peertube.tspu.edu.ru", + "https://p.lu", + "https://serv3.wiki-tube.de", + "https://serv1.wiki-tube.de", + "https://video.lavolte.net", + "https://peertube.public.cat", + "https://peertube.anduin.net", + "https://peertube.r5c3.fr", + "https://mountaintown.video", + "https://ptmir1.inter21.net", + "https://tube.foxden.party", + "https://fotogramas.politicaconciencia.org", + "https://peertube.pl", + "https://peertube.manalejandro.com", + "https://www4.mir.inter21.net", + "https://video.csc49.fr", + "https://tube.wolfe.casa", + "https://video.dresden.network", + "https://peertube.zapashcanon.fr", + "https://40two.tube", + "https://tube.amic37.fr", + "https://video.comptoir.net", + "https://kino.schuerz.at", + "https://peertube.tiennot.net", + "https://tututu.tube", + "https://tube.picasoft.net", + "https://www.wiki-tube.de", + "https://videos.pair2jeux.tube", + "https://video.internet-czas-dzialac.pl", + "https://thecool.tube", + "https://tube.troopers.agency", + "https://peertube.chtisurel.net", + "https://videos.testimonia.org", + "https://video.mass-trespass.uk", + "https://peertube.cipherbliss.com", + "https://peertube.stemy.me", + "https://daschauher.aksel.rocks", + "https://tube.cyano.at", + "https://tube.nox-rhea.org", + "https://peertube.securitymadein.lu", + "https://tube.rita.moe", + "https://tuktube.com", + "https://v.basspistol.org", + "https://mytube.kn-cloud.de", + "https://tube.nuagelibre.fr", + "https://video.nogafam.es", + "https://peertube.stream", + "https://videos.leslionsfloorball.fr", + "https://player.ojamajo.moe", + "https://ftsi.ru", + "https://video.cigliola.com", + "https://xxx.noho.st", + "https://peertube.stefofficiel.me", + "https://canard.tube", + "https://tube.jeena.net", + "https://tube.cloud-libre.eu", + "https://videos.coletivos.org", + "https://peertube.xwiki.com", + "https://cinema.yunohost.support", + "https://peertube.s2s.video", + "https://peertube.travelpandas.eu", + "https://video.sdm-tools.net", + "https://peertube.anzui.dev", + "https://video.up.edu.ph", + "https://video.igem.org", + "https://worldofvids.com", + "https://peertube.underworld.fr", + "https://peertube.pi2.dev", + "https://video.pony.gallery", + "https://tube.skrep.in", + "https://tube.others.social", + "https://videos.ubuntu-paris.org", + "https://tube-poitiers.beta.education.fr", + "https://vid.wildeboer.net", + "https://battlepenguin.video", + "https://peertube.cloud.sans.pub", + "https://refuznik.video", + "https://tube.shela.nu", + "https://video.1146.nohost.me", + "https://peertube.davigge.com", + "https://vod.ksite.de", + "https://tube.grin.hu", + "https://media.inno3.cricket", + "https://tube.cryptography.dog", + "https://peertube.zergy.net", + "https://vid.ncrypt.at", + "https://videos.tcit.fr", + "https://video.valme.io", + "https://peertube.patapouf.xyz", + "https://video.violoncello.ch", + "https://peertube.gidikroon.eu", + "https://tubedu.org", + "https://watch.breadtube.tv", + "https://video.exodus-privacy.eu.org", + "https://tilvids.com", + "https://peertube.devloprog.org", + "https://peertube.designersethiques.org", + "https://testtube.florimond.eu", + "https://tube-lille.beta.education.fr", + "https://peertube.monlycee.net", + "https://tube.plomlompom.com", + "https://tube-outremer.beta.education.fr", + "https://tube-dijon.beta.education.fr", + "https://tube-reims.beta.education.fr", + "https://tube-limoges.beta.education.fr", + "https://tube-versailles.beta.education.fr", + "https://peertube.r2.enst.fr", + "https://tube-orleans-tours.beta.education.fr", + "https://spacepub.space", + "https://peertube.devol.it", + "https://tube-clermont-ferrand.beta.education.fr", + "https://tube-nice.beta.education.fr", + "https://tube-montpellier.beta.education.fr", + "https://tube-nancy.beta.education.fr", + "https://tube-aix-marseille.beta.education.fr", + "https://tube-nantes.beta.education.fr", + "https://tube-grenoble.beta.education.fr", + "https://tube-amiens.beta.education.fr", + "https://media.privacyinternational.org", + "https://tube-normandie.beta.education.fr", + "https://tube.port0.xyz", + "https://tube1.it.tuwien.ac.at", + "https://tube.aquilenet.fr", + "https://peertube.lyceeconnecte.fr", + "https://tube-education.beta.education.fr", + "https://vids.roshless.me", + "https://tube-toulouse.beta.education.fr", + "https://peertube.netzbegruenung.de", + "https://plextube.nl", + "https://tube.opportunis.me", + "https://nanawel-peertube.dyndns.org", + "https://tube-strasbourg.beta.education.fr", + "https://tube.graz.social", + "https://tube-besancon.beta.education.fr", + "https://vid.garwood.io", + "https://kolektiva.media", + "https://peertube.ichigo.everydayimshuflin.com", + "https://video.lundi.am", + "https://tube.florimond.eu", + "https://peertube.taxinachtegel.de", + "https://peertube.scic-tetris.org", + "https://peertube.lagvoid.com", + "https://pt.diaspodon.fr", + "https://video.mugoreve.fr", + "https://tube.portes-imaginaire.org", + "https://peervideo.ru", + "https://p.eertu.be", + "https://video.hardlimit.com", + "https://peertube.debian.social", + "https://tube.piweb.be", + "https://peertube.su", + "https://video.hackers.town", + "https://tube.fdn.fr", + "https://peertube.demonix.fr", + "https://videos.hauspie.fr", + "https://lexx.impa.me", + "https://mplayer.demouliere.eu", + "https://video.liberta.vip", + "https://peertube.gcfamily.fr", + "https://video.ploud.fr", + "https://tube.plaf.fr", + "https://tube.nah.re", + "https://dreiecksnebel.alex-detsch.de", + "https://tube.hoga.fr", + "https://videos.festivalparminous.org", + "https://tube.thechangebook.org", + "https://lepetitmayennais.fr.nf", + "https://medias.pingbase.net", + "https://video.oh14.de", + "https://mytube.madzel.de", + "https://monplaisirtube.ddns.net", + "https://video.blender.org", + "https://peertube.020.pl", + "https://tube.azbyka.ru", + "https://greatview.video", + "https://media.krashboyz.org", + "https://toobnix.org", + "https://video.emergeheart.info", + "https://tube.kdy.ch", + "https://widemus.de", + "https://video.nesven.eu", + "https://tube.rebellion.global", + "https://videos.koumoul.com", + "https://tube.undernet.uy", + "https://peertube.opencloud.lu", + "https://peertube.ch", + "https://tube.tappret.fr", + "https://peertube.snargol.com", + "https://peertube.desmu.fr", + "https://peertube.rainbowswingers.net", + "https://tube.nx-pod.de", + "https://video.monsieurbidouille.fr", + "https://tube.crapaud-fou.org", + "https://lostpod.space", + "https://www.videos-libr.es", + "https://video.vny.fr", + "https://peervideo.club", + "https://tube.taker.fr", + "https://peertube.co.uk", + "https://video.fitchfamily.org", + "https://video.fdlibre.eu", + "https://peer.philoxweb.be", + "https://peertube.sl-network.fr", + "https://peertube.dynlinux.io", + "https://v.kretschmann.social", + "https://videos.funkwhale.audio", + "https://watch.44con.com", + "https://tube.danq.me", + "https://tube.calculate.social", + "https://peertube.laas.fr", + "https://video.ploud.jp", + "https://conf.tube", + "https://tube.extinctionrebellion.fr", + "https://peertube.f-si.org", + "https://video.subak.ovh", + "https://peertube.floss-marketing-school.com", + "https://peertube.slat.org", + "https://peertube.uno", + "https://tube.ksl-bmx.de", + "https://tube.tchncs.de", + "https://yunopeertube.myddns.me", + "https://peertube.anon-kenkai.com", + "https://tube.maiti.info", + "https://video.lemediatv.fr", + "https://peertube.artica.center", + "https://indymotion.fr", + "https://tube.fede.re", + "https://peertube.mygaia.org", + "https://peertube.livingutopia.org", + "https://tube.anjara.eu", + "https://video.latavernedejohnjohn.fr", + "https://peertube.pcservice46.fr", + "https://video.coop.tools", + "https://video.cabane-libre.org", + "https://peertube.openstreetmap.fr", + "https://videos.alolise.org", + "https://scitech.video", + "https://peertube.togart.de", + "https://tube.postblue.info", + "https://videos.domainepublic.net", + "https://repro.video", + "https://videos.side-ways.net", + "https://videos.pueseso.club", + "https://media.assassinate-you.net", + "https://peertube.makotoworkshop.org", + "https://peertube.serveur.slv-valbonne.fr", + "https://video.netsyms.com", + "https://video.writeas.org", + "https://videos.adhocmusic.com", + "https://vid.y-y.li", + "https://diode.zone", + "https://peertube.nomagic.uk", + "https://video.rastapuls.com", + "https://peertube.musicstudio.pro", + "https://peertube.we-keys.fr", + "https://artitube.artifaille.fr", + "https://peertube.fr", + "https://peertube.amicale.net", + "https://aperi.tube", + "https://tube.ac-lyon.fr", + "https://video.lw1.at", + "https://www.yiny.org", + "https://video.typica.us", + "https://videos.lescommuns.org", + "https://peertube.1312.media", + "https://skeptikon.fr", + "https://video.blueline.mg", + "https://tube.homecomputing.fr", + "https://video.tedomum.net", + "https://video.g3l.org", + "https://fontube.fr", + "https://peertube.gaialabs.ch" + ] +} \ No newline at end of file From 663c61e0f26ed4259b64ec574f833155df1ab8dc Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Sun, 24 Jul 2022 11:34:17 +0300 Subject: [PATCH 15/15] fix some typos --- src/assets/javascripts/imdb.js | 2 + src/assets/javascripts/imgur.js | 1 + src/assets/javascripts/instagram.js | 6 +- src/assets/javascripts/lbry.js | 8 +- src/assets/javascripts/maps.js | 3 + src/assets/javascripts/medium.js | 2 + src/assets/javascripts/peertube.js | 6 +- src/assets/javascripts/quora.js | 2 + src/assets/javascripts/reddit.js | 19 ++- src/assets/javascripts/reuters.js | 2 + src/assets/javascripts/search.js | 7 +- src/assets/javascripts/sendTargets.js | 2 + src/assets/javascripts/tiktok.js | 2 + src/assets/javascripts/translate/translate.js | 8 + src/assets/javascripts/twitter.js | 2 + src/assets/javascripts/utils.js | 6 +- src/assets/javascripts/wikipedia.js | 10 +- src/assets/javascripts/youtube/youtube.js | 26 +-- src/assets/javascripts/youtubeMusic.js | 3 + src/instances/blacklist.json | 1 - src/instances/data.json | 149 +++++++++++------- src/instances/get_instances.py | 35 +++- src/instances/piped.json | 6 +- src/pages/options/widgets/general.js | 6 +- 24 files changed, 223 insertions(+), 91 deletions(-) diff --git a/src/assets/javascripts/imdb.js b/src/assets/javascripts/imdb.js index 681f675..2a8ac2f 100644 --- a/src/assets/javascripts/imdb.js +++ b/src/assets/javascripts/imdb.js @@ -172,8 +172,10 @@ function initDefaults() { libremdbTorRedirectsChecks: [...redirects.libremdb.tor], libremdbTorCustomRedirects: [], + libremdbI2pRedirectsChecks: [], libremdbI2pCustomRedirects: [], + libremdbLokiRedirectsChecks: [], libremdbLokiCustomRedirects: [] }, () => resolve()); }); diff --git a/src/assets/javascripts/imgur.js b/src/assets/javascripts/imgur.js index f76679a..f373276 100644 --- a/src/assets/javascripts/imgur.js +++ b/src/assets/javascripts/imgur.js @@ -194,6 +194,7 @@ function initDefaults() { rimgoI2pRedirectsChecks: [...redirects.rimgo.i2p], rimgoI2pCustomRedirects: [], + rimgoLokiRedirectsChecks: [...redirects.rimgo.loki], rimgoLokiCustomRedirects: [] }, () => resolve()); }); diff --git a/src/assets/javascripts/instagram.js b/src/assets/javascripts/instagram.js index 7c816b4..182ff4d 100644 --- a/src/assets/javascripts/instagram.js +++ b/src/assets/javascripts/instagram.js @@ -173,13 +173,15 @@ function initDefaults() { instagramRedirects: redirects, bibliogramNormalRedirectsChecks: bibliogramNormalRedirectsChecks, - bibliogramTorRedirectsChecks: [], + bibliogramNormalCustomRedirects: [], - bibliogramNormalCustomRedirects: [...redirects.bibliogram.tor], + bibliogramTorRedirectsChecks: [...redirects.bibliogram.tor], bibliogramTorCustomRedirects: [], + bibliogramI2pRedirectsChecks: [...redirects.bibliogram.i2p], bibliogramI2pCustomRedirects: [], + bibliogramLokiRedirectsChecks: [...redirects.bibliogram.loki], bibliogramLokiCustomRedirects: [] }) resolve(); diff --git a/src/assets/javascripts/lbry.js b/src/assets/javascripts/lbry.js index 6e2bd35..cfdf1bb 100644 --- a/src/assets/javascripts/lbry.js +++ b/src/assets/javascripts/lbry.js @@ -40,6 +40,7 @@ let librarianNormalCustomRedirects, librarianTorRedirectsChecks, librarianTorCustomRedirects, + librarianI2pRedirectsChecks, librarianI2pCustomRedirects, librarianLokiCustomRedirects; @@ -55,6 +56,7 @@ function init() { "librarianNormalCustomRedirects", "librarianTorRedirectsChecks", "librarianTorCustomRedirects", + "librarianI2pRedirectsChecks", "librarianI2pCustomRedirects", "librarianLokiCustomRedirects" ], @@ -67,6 +69,7 @@ function init() { librarianNormalCustomRedirects = r.librarianNormalCustomRedirects; librarianTorRedirectsChecks = r.librarianTorRedirectsChecks; librarianTorCustomRedirects = r.librarianTorCustomRedirects; + librarianI2pRedirectsChecks = r.librarianI2pRedirectsChecks; librarianI2pCustomRedirects = r.librarianI2pCustomRedirects; librarianLokiCustomRedirects = r.librarianLokiCustomRedirects; resolve(); @@ -140,17 +143,18 @@ function initDefaults() { } browser.storage.local.set({ disableLbryTargets: true, - lbryTargetsRedirects: redirects, - librarianNormalRedirectsChecks: librarianNormalRedirectsChecks, + librarianNormalRedirectsChecks: [...redirects.librarian.normal], librarianNormalCustomRedirects: [], librarianTorRedirectsChecks: [...redirects.librarian.tor], librarianTorCustomRedirects: [], + librarianI2pRedirectsChecks: [...redirects.librarian.i2p], librarianI2pCustomRedirects: [], + librarianLokiRedirectsChecks: [...redirects.librarian.loki], librarianLokiCustomRedirects: [] }, () => resolve()); }); diff --git a/src/assets/javascripts/maps.js b/src/assets/javascripts/maps.js index 7714e17..fd65b1c 100644 --- a/src/assets/javascripts/maps.js +++ b/src/assets/javascripts/maps.js @@ -228,10 +228,13 @@ async function initDefaults() { facilNormalRedirectsChecks: [...redirects.facil.normal], facilNormalCustomRedirects: [], + facilTorRedirectsChecks: [...redirects.facil.tor], facilTorCustomRedirects: [], + facilI2pRedirectsChecks: [...redirects.facil.i2p], facilI2pCustomRedirects: [], + facilLokiRedirectsChecks: [...redirects.facil.loki], facilLokiCustomRedirects: [] }, () => resolve()) ) diff --git a/src/assets/javascripts/medium.js b/src/assets/javascripts/medium.js index d4c81ba..ddd955c 100644 --- a/src/assets/javascripts/medium.js +++ b/src/assets/javascripts/medium.js @@ -188,8 +188,10 @@ function initDefaults() { scribeTorRedirectsChecks: [...redirects.scribe.tor], scribeTorCustomRedirects: [], + scribeI2pRedirectsChecks: [...redirects.scribe.i2p], scribeI2pCustomRedirects: [], + scribeLokiRedirectsChecks: [...redirects.scribe.loki], scribeLokiCustomRedirects: [] }, () => resolve()) }) diff --git a/src/assets/javascripts/peertube.js b/src/assets/javascripts/peertube.js index 8299394..d05e4b2 100644 --- a/src/assets/javascripts/peertube.js +++ b/src/assets/javascripts/peertube.js @@ -11,7 +11,9 @@ let redirects = { "https://st.phreedom.club", "https://simpleertube.esmailelbob.xyz", ], - "tor": [] + "tor": [], + "i2p": [], + "loki": [] } } function setRedirects(val) { @@ -159,8 +161,10 @@ function initDefaults() { simpleertubeTorRedirectsChecks: [...redirects.simpleertube.tor], simpleertubeTorCustomRedirects: [], + simpleertubeI2pRedirectsChecks: [...redirects.simpleertube.i2p], simpleertubeI2pCustomRedirects: [], + simpleertubeLokiRedirectsChecks: [...redirects.simpleertube.loki], simpleertubeLokiCustomRedirects: [] }, () => resolve()); }) diff --git a/src/assets/javascripts/quora.js b/src/assets/javascripts/quora.js index db2cff8..fed321d 100644 --- a/src/assets/javascripts/quora.js +++ b/src/assets/javascripts/quora.js @@ -173,8 +173,10 @@ function initDefaults() { quetreTorRedirectsChecks: [...redirects.quetre.tor], quetreTorCustomRedirects: [], + quetreI2pRedirectsChecks: [...redirects.quetre.i2p], quetreI2pCustomRedirects: [], + quetreLokiRedirectsChecks: [...redirects.quetre.loki], quetreLokiCustomRedirects: [] }, () => resolve()); }); diff --git a/src/assets/javascripts/reddit.js b/src/assets/javascripts/reddit.js index 510ec46..bc7b687 100644 --- a/src/assets/javascripts/reddit.js +++ b/src/assets/javascripts/reddit.js @@ -12,10 +12,10 @@ const frontends = new Array("libreddit", "teddit") const protocols = new Array("normal", "tor", "i2p", "loki") for (let i = 0; i < frontends.length; i++) { - redirects[frontends[i]] = {} - for (let x = 0; x < protocols.length; x++) { - redirects[frontends[i]][protocols[x]] = [] - } + redirects[frontends[i]] = {} + for (let x = 0; x < protocols.length; x++) { + redirects[frontends[i]][protocols[x]] = [] + } } function setRedirects(val) { @@ -44,16 +44,23 @@ let redditRedirects, protocol, protocolFallback, + libredditNormalRedirectsChecks, libredditNormalCustomRedirects, + libredditTorRedirectsChecks, libredditTorCustomRedirects, + libredditI2pCustomRedirects, + libredditLokiCustomRedirects, + tedditNormalRedirectsChecks, tedditNormalCustomRedirects, + tedditTorRedirectsChecks, tedditTorCustomRedirects, + tedditI2pCustomRedirects, tedditLokiCustomRedirects; @@ -411,8 +418,10 @@ function initDefaults() { libredditTorRedirectsChecks: [...redirects.libreddit.tor], libredditTorCustomRedirects: [], + libredditI2pRedirectsChecks: [...redirects.libreddit.i2p], libredditI2pCustomRedirects: [], + libredditLokiRedirectsChecks: [...redirects.libreddit.loki], libredditLokiCustomRedirects: [], tedditNormalRedirectsChecks: tedditNormalRedirectsChecks, @@ -421,8 +430,10 @@ function initDefaults() { tedditTorRedirectsChecks: [...redirects.teddit.tor], tedditTorCustomRedirects: [], + tedditI2pRedirectsChecks: [...redirects.teddit.i2p], tedditI2pCustomRedirects: [], + tedditLokiRedirectsChecks: [...redirects.teddit.loki], tedditLokiCustomRedirects: [] }, () => resolve()); }); diff --git a/src/assets/javascripts/reuters.js b/src/assets/javascripts/reuters.js index 01e4701..e1d18a4 100644 --- a/src/assets/javascripts/reuters.js +++ b/src/assets/javascripts/reuters.js @@ -136,8 +136,10 @@ function initDefaults() { neutersTorRedirectsChecks: [...redirects.neuters.tor], neutersTorCustomRedirects: [], + neutersI2pRedirectsChecks: [...redirects.neuters.i2p], neutersI2pCustomRedirects: [], + neutersLokiRedirectsChecks: [...redirects.neuters.loki], neutersLokiCustomRedirects: [] }, () => resolve()); }); diff --git a/src/assets/javascripts/search.js b/src/assets/javascripts/search.js index 571df3c..7644ad4 100644 --- a/src/assets/javascripts/search.js +++ b/src/assets/javascripts/search.js @@ -613,9 +613,9 @@ function initDefaults() { whoogleI2pRedirectsChecks: [...redirects.whoogle.i2p], whoogleI2pCustomRedirects: [], + whoogleLokiRedirectsChecks: [...redirects.whoogle.loki], whoogleLokiCustomRedirects: [], - searxNormalRedirectsChecks: searxNormalRedirectsChecks, searxNormalCustomRedirects: [], @@ -625,9 +625,9 @@ function initDefaults() { searxI2pRedirectsChecks: [...redirects.searx.i2p], searxI2pCustomRedirects: [], + searxLokiRedirectsChecks: [...redirects.searx.loki], searxLokiCustomRedirects: [], - searxngNormalRedirectsChecks: searxngNormalRedirectsChecks, searxngNormalCustomRedirects: [], @@ -637,9 +637,9 @@ function initDefaults() { searxngI2pRedirectsChecks: [...redirects.searxng.i2p], searxngI2pCustomRedirects: [], + searxngLokiRedirectsChecks: [...redirects.searxng.loki], searxngLokiCustomRedirects: [], - librexNormalRedirectsChecks: librexNormalRedirectsChecks, librexNormalCustomRedirects: [], @@ -649,6 +649,7 @@ function initDefaults() { librexI2pRedirectsChecks: [...redirects.librex.i2p], librexI2pCustomRedirects: [], + librexLokiRedirectsChecks: [...redirects.librex.loki], librexLokiCustomRedirects: [] }, () => resolve()) }) diff --git a/src/assets/javascripts/sendTargets.js b/src/assets/javascripts/sendTargets.js index e414298..2ea95d2 100644 --- a/src/assets/javascripts/sendTargets.js +++ b/src/assets/javascripts/sendTargets.js @@ -161,8 +161,10 @@ function initDefaults() { sendTorRedirectsChecks: [...redirects.send.tor], sendTorCustomRedirects: [], + sendI2pRedirectsChecks: [...redirects.send.i2p], sendI2pCustomRedirects: [], + sendLokiRedirectsChecks: [...redirects.send.loki], sendLokiCustomRedirects: [] }, () => resolve()) }) diff --git a/src/assets/javascripts/tiktok.js b/src/assets/javascripts/tiktok.js index ac35910..a5c14a2 100644 --- a/src/assets/javascripts/tiktok.js +++ b/src/assets/javascripts/tiktok.js @@ -219,8 +219,10 @@ function initDefaults() { proxiTokTorRedirectsChecks: [...redirects.proxiTok.tor], proxiTokTorCustomRedirects: [], + proxiTokI2pRedirectsChecks: [...redirects.proxiTok.i2p], proxiTokI2pCustomRedirects: [], + proxiTokLokiRedirectsChecks: [...redirects.proxiTok.loki], proxiTokLokiCustomRedirects: [] }, () => resolve()); }); diff --git a/src/assets/javascripts/translate/translate.js b/src/assets/javascripts/translate/translate.js index 0dc0f73..75c5b5f 100644 --- a/src/assets/javascripts/translate/translate.js +++ b/src/assets/javascripts/translate/translate.js @@ -340,18 +340,26 @@ function initDefaults() { simplyTranslateNormalRedirectsChecks: [...redirects.simplyTranslate.normal], simplyTranslateNormalCustomRedirects: [], + simplyTranslateTorRedirectsChecks: [...redirects.simplyTranslate.tor], simplyTranslateTorCustomRedirects: [], + simplyTranslateI2pRedirectsChecks: [...redirects.simplyTranslate.i2p], simplyTranslateI2pCustomRedirects: [], + simplyTranslateLokiRedirectsChecks: [...redirects.simplyTranslate.loki], simplyTranslateLokiCustomRedirects: [], lingvaNormalRedirectsChecks: lingvaNormalRedirectsChecks, lingvaNormalCustomRedirects: [], + lingvaTorRedirectsChecks: [...redirects.lingva.tor], lingvaTorCustomRedirects: [], + + lingvaI2pRedirectsChecks: [...redirects.lingva.i2p], lingvaI2pCustomRedirects: [], + + lingvaLokiRedirectsChecks: [...redirects.lingva.loki], lingvaLokiCustomRedirects: [] }, () => resolve()) }) diff --git a/src/assets/javascripts/twitter.js b/src/assets/javascripts/twitter.js index 42243a6..0a85192 100644 --- a/src/assets/javascripts/twitter.js +++ b/src/assets/javascripts/twitter.js @@ -278,8 +278,10 @@ function initDefaults() { nitterTorRedirectsChecks: [...redirects.nitter.tor], nitterTorCustomRedirects: [], + nitterI2pRedirectsChecks: [...redirects.nitter.i2p], nitterI2pCustomRedirects: [], + nitterLokiRedirectsChecks: [...redirects.nitter.loki], nitterLokiCustomRedirects: [] }, () => resolve()); }) diff --git a/src/assets/javascripts/utils.js b/src/assets/javascripts/utils.js index b04024e..f922572 100644 --- a/src/assets/javascripts/utils.js +++ b/src/assets/javascripts/utils.js @@ -92,7 +92,7 @@ async function processDefaultCustomInstances(target, name, protocol, document) { let redirects; async function getFromStorage() { - return new Promise(async resolve => { + return new Promise(async resolve => browser.storage.local.get( [ redirectsChecks, @@ -108,9 +108,11 @@ async function processDefaultCustomInstances(target, name, protocol, document) { resolve(); } ) - }) + ) } + await getFromStorage(); + if (nameCustomInstances === undefined) console.log(customRedirects); function calcNameCheckBoxes() { let isTrue = true; diff --git a/src/assets/javascripts/wikipedia.js b/src/assets/javascripts/wikipedia.js index 2d9384f..d2ba7de 100644 --- a/src/assets/javascripts/wikipedia.js +++ b/src/assets/javascripts/wikipedia.js @@ -217,13 +217,19 @@ function initDefaults() { browser.storage.local.set({ disableWikipedia: true, wikipediaRedirects: redirects, + wikilessNormalRedirectsChecks: wikilessNormalRedirectsChecks, - wikilessTorRedirectsChecks: [...redirects.wikiless.tor], - wikilessI2pRedirectsChecks: [...redirects.wikiless.i2p], wikilessNormalCustomRedirects: [], + + wikilessTorRedirectsChecks: [...redirects.wikiless.tor], wikilessTorCustomRedirects: [], + + wikilessI2pRedirectsChecks: [...redirects.wikiless.i2p], wikilessI2pCustomRedirects: [], + + wikilessLokiRedirectsChecks: [...redirects.wikiless.loki], wikilessLokiCustomRedirects: [] + }, () => resolve()); }) }) diff --git a/src/assets/javascripts/youtube/youtube.js b/src/assets/javascripts/youtube/youtube.js index ffc08ed..669b26d 100644 --- a/src/assets/javascripts/youtube/youtube.js +++ b/src/assets/javascripts/youtube/youtube.js @@ -23,10 +23,10 @@ const protocols = new Array("normal", "tor", "i2p", "loki") let redirects = {}; for (let i = 0; i < frontends.length; i++) { - redirects[frontends[i]] = {} - for (let x = 0; x < protocols.length; x++) { - redirects[frontends[i]][protocols[x]] = [] - } + redirects[frontends[i]] = {} + for (let x = 0; x < protocols.length; x++) { + redirects[frontends[i]][protocols[x]] = [] + } } function setRedirects(val) { @@ -81,7 +81,7 @@ let pipedLokiCustomRedirects, pipedMaterialNormalRedirectsChecks, pipedMaterialNormalCustomRedirects, - // pipedMaterialTorRedirectsChecks, + pipedMaterialTorRedirectsChecks, pipedMaterialTorCustomRedirects, pipedMaterialI2pCustomRedirects, pipedMaterialLokiCustomRedirects; @@ -111,7 +111,7 @@ function init() { "pipedLokiCustomRedirects", "pipedMaterialNormalRedirectsChecks", "pipedMaterialNormalCustomRedirects", - // "pipedMaterialTorRedirectsChecks", + "pipedMaterialTorRedirectsChecks", "pipedMaterialTorCustomRedirects", "pipedMaterialI2pCustomRedirects", "pipedMaterialLokiCustomRedirects" @@ -138,7 +138,7 @@ function init() { pipedLokiCustomRedirects = r.pipedLokiCustomRedirects; pipedMaterialNormalRedirectsChecks = r.pipedMaterialNormalRedirectsChecks; pipedMaterialNormalCustomRedirects = r.pipedMaterialNormalCustomRedirects; - // pipedMaterialTorRedirectsChecks = r.pipedMaterialTorRedirectsChecks; + pipedMaterialTorRedirectsChecks = r.pipedMaterialTorRedirectsChecks; pipedMaterialTorCustomRedirects = r.pipedMaterialTorCustomRedirects; pipedMaterialI2pCustomRedirects - r.pipedMaterialI2pCustomRedirects; pipedMaterialLokiCustomRedirects = r.pipedMaterialLokiCustomRedirects; @@ -160,7 +160,7 @@ function all() { ...youtubeRedirects.piped.tor, ...youtubeRedirects.pipedMaterial.normal, - //...youtubeRedirects.pipedMaterial.tor, + ...youtubeRedirects.pipedMaterial.tor, ...invidiousNormalCustomRedirects, ...invidiousTorCustomRedirects, @@ -320,9 +320,7 @@ function initDefaults() { disableYoutube: false, enableYoutubeCustomSettings: false, onlyEmbeddedVideo: 'both', - youtubeRedirects: redirects, - youtubeFrontend: 'invidious', invidiousNormalRedirectsChecks: invidiousNormalRedirectsChecks, @@ -331,8 +329,10 @@ function initDefaults() { invidiousTorRedirectsChecks: [...redirects.invidious.tor], invidiousTorCustomRedirects: [], + invidiousI2pRedirectsChecks: [...redirects.invidious.i2p], invidiousI2pCustomRedirects: [], + invidiousLokiRedirectsChecks: [...redirects.invidious.loki], invidiousLokiCustomRedirects: [], pipedNormalRedirectsChecks: pipedNormalRedirectsChecks, @@ -341,18 +341,22 @@ function initDefaults() { pipedTorRedirectsChecks: [...redirects.piped.tor], pipedTorCustomRedirects: [], + pipedI2pRedirectsChecks: [...redirects.piped.i2p], pipedI2pCustomRedirects: [], + pipedLokiRedirectsChecks: [...redirects.piped.loki], pipedLokiCustomRedirects: [], pipedMaterialNormalRedirectsChecks: pipedMaterialNormalRedirectsChecks, pipedMaterialNormalCustomRedirects: [], - //pipedMaterialTorRedirectsChecks: [...redirects.pipedMaterial.tor], + pipedMaterialTorRedirectsChecks: [...redirects.pipedMaterial.tor], pipedMaterialTorCustomRedirects: [], + pipedMaterialI2pRedirectsChecks: [...redirects.pipedMaterial.i2p], pipedMaterialI2pCustomRedirects: [], + pipedMaterialLokiRedirectsChecks: [...redirects.pipedMaterial.loki], pipedMaterialLokiCustomRedirects: [], youtubeEmbedFrontend: 'invidious' diff --git a/src/assets/javascripts/youtubeMusic.js b/src/assets/javascripts/youtubeMusic.js index 4a63911..46caf60 100644 --- a/src/assets/javascripts/youtubeMusic.js +++ b/src/assets/javascripts/youtubeMusic.js @@ -117,10 +117,13 @@ async function initDefaults() { beatbumpNormalRedirectsChecks: [...redirects.beatbump.normal], beatbumpNormalCustomRedirects: [], + beatbumpTorRedirectsChecks: [...redirects.beatbump.tor], beatbumpTorCustomRedirects: [], + beatbumpI2pRedirectsChecks: [...redirects.beatbump.i2p], beatbumpI2pCustomRedirects: [], + beatbumpLokiRedirectsChecks: [...redirects.beatbump.loki], beatbumpLokiCustomRedirects: [] }, () => resolve()) ) diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json index 021c9e5..5819fb7 100644 --- a/src/instances/blacklist.json +++ b/src/instances/blacklist.json @@ -47,7 +47,6 @@ "https://search.garudalinux.org", "https://search.dr460nf1r3.org", "https://search.wef.lol", - "https://librex.catalyst.sx", "https://i.actionsack.com", "https://rimgo.encrypted-data.xyz" ], diff --git a/src/instances/data.json b/src/instances/data.json index ed734e6..a532260 100644 --- a/src/instances/data.json +++ b/src/instances/data.json @@ -17,9 +17,9 @@ "https://inv.vern.cc", "https://invidious.nerdvpn.de", "https://invidious.slipfox.xyz", - "https://invidious.weblibre.org", - "https://invidious.esmailelbob.xyz", "https://youtube.076.ne.jp", + "https://invidious.esmailelbob.xyz", + "https://invidious.weblibre.org", "https://invidious.namazso.eu" ], "tor": [ @@ -32,7 +32,9 @@ "http://euxxcnhsynwmfidvhjf6uzptsmh4dipkmgdmcmxxuo7tunp3ad2jrwyd.onion", "http://invidious.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion", "http://inv.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion" - ] + ], + "i2p": [], + "loki": [] }, "piped": { "normal": [ @@ -51,7 +53,9 @@ ], "tor": [ "http://piped2bbch4xslbl2ckr6k62q56kon56ffowxaqzy42ai22a4sash3ad.onion" - ] + ], + "i2p": [], + "loki": [] }, "pipedMaterial": { "normal": [ @@ -59,15 +63,21 @@ "https://piped-material.ftp.sh", "https://piped-staging.ftp.sh", "https://ui.piped.১.net" - ] + ], + "tor": [], + "i2p": [], + "loki": [] }, "proxiTok": { "normal": [ "https://proxitok.herokuapp.com", "https://proxitok.pussthecat.org", - "https://proxitok.privacydev.net" + "https://proxitok.privacydev.net", + "https://tok.habedieeh.re" ], - "tor": [] + "tor": [], + "i2p": [], + "loki": [] }, "send": { "normal": [ @@ -89,7 +99,9 @@ "https://bytefile.de", "https://transfer.acted.org" ], - "tor": [] + "tor": [], + "i2p": [], + "loki": [] }, "nitter": { "normal": [ @@ -160,7 +172,8 @@ "https://india.unofficialbird.com", "https://nederland.unofficialbird.com", "https://uk.unofficialbird.com", - "https://n.l5.ca" + "https://n.l5.ca", + "https://nitter.slipfox.xyz" ], "tor": [ "http://3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion", @@ -188,7 +201,9 @@ "http://nitter.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion", "http://aaaaaxx74hbzeibageieowryhsqvimbdiitfkfe47tvgawkwkjh3coqd.onion", "http://wiio4sgs4247brk7hj6qck2jxnvldwfdbguigc5ivpxrsegnliyfvuqd.onion" - ] + ], + "i2p": [], + "loki": [] }, "bibliogram": { "normal": [ @@ -206,7 +221,9 @@ "https://ig.funami.tech", "https://bib.actionsack.com" ], - "tor": [] + "tor": [], + "i2p": [], + "loki": [] }, "libreddit": { "normal": [ @@ -289,7 +306,9 @@ "http://inz6tbezfwzexva6dize4cqraj2tjdhygxabmcgysccesvw2pybzhbyd.onion", "http://libreddit.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion", "http://lr.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion" - ] + ], + "i2p": [], + "loki": [] }, "teddit": { "normal": [ @@ -323,7 +342,9 @@ "http://tedditfyn6idalzso5wam5qd3kdtxoljjhbrbbx34q2xkcisvshuytad.onion", "http://dawtyi5e2cfyfmoht4izmczi42aa2zwh6wi34zwvc6rzf2acpxhrcrad.onion", "http://qtpvyiaqhmwccxwzsqubd23xhmmrt75tdyw35kp43w4hvamsgl3x27ad.onion" - ] + ], + "i2p": [], + "loki": [] }, "wikiless": { "normal": [ @@ -347,7 +368,8 @@ "i2p": [ "http://hflqp2ejxygpj6cdwo3ogfieqmxw3b56w7dblt7bor2ltwk6kcfa.b32.i2p", "http://x33lx4h6d7h6xs4eiqwhvaxn3ea5gn2ifmu3jobnvuvn4k4aej7a.b32.i2p" - ] + ], + "loki": [] }, "scribe": { "normal": [ @@ -357,7 +379,9 @@ "https://scribe.bus-hit.me", "https://scribe.froth.zone" ], - "tor": [] + "tor": [], + "i2p": [], + "loki": [] }, "quetre": { "normal": [ @@ -369,7 +393,9 @@ "https://quetre.tokhmi.xyz", "https://quetre.projectsegfau.lt" ], - "tor": [] + "tor": [], + "i2p": [], + "loki": [] }, "libremdb": { "normal": [ @@ -378,7 +404,9 @@ "https://libremdbeu.herokuapp.com", "https://lmdb.tokhmi.xyz" ], - "tor": [] + "tor": [], + "i2p": [], + "loki": [] }, "simplyTranslate": { "normal": [ @@ -420,22 +448,11 @@ "https://lingva.lunar.icu", "https://lingva.opnxng.com" ], - "tor": [] + "tor": [], + "i2p": [], + "loki": [] }, "searx": { - "tor": [ - "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion", - "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion", - "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion", - "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion", - "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion", - "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion", - "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion" - ], - "i2p": [ - "http://ransack.i2p", - "http://mqamk4cfykdvhw5kjez2gnvse56gmnqxn7vkvvbuor4k4j2lbbnq.b32.i2p" - ], "normal": [ "https://anon.sx", "https://dynabyte.ca", @@ -476,23 +493,22 @@ "https://sx.catgirl.cloud", "https://timdor.noip.me/searx", "https://searx.roflcopter.fr" - ] + ], + "tor": [ + "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion", + "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion", + "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion", + "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion", + "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion", + "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion" + ], + "i2p": [ + "http://ransack.i2p", + "http://mqamk4cfykdvhw5kjez2gnvse56gmnqxn7vkvvbuor4k4j2lbbnq.b32.i2p" + ], + "loki": [] }, "searxng": { - "tor": [ - "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion", - "http://x5gdjh6t7kb4yubpufhtc3l3df2acev3emxdasd5vyuyoon5rzf5zkyd.onion", - "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion", - "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion", - "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion", - "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion", - "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion", - "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion", - "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion", - "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx", - "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion" - ], - "i2p": [], "normal": [ "https://darmarit.org/searx", "https://de.xcxc.ml", @@ -524,6 +540,7 @@ "https://search.sapti.me", "https://search.teamriverbubbles.com", "https://search.unlocked.link", + "https://search.vidhukant.xyz", "https://search.zzls.xyz", "https://searx.be", "https://searx.becomesovran.com", @@ -558,7 +575,23 @@ "https://www.gruble.de", "https://www.webrats.xyz", "https://xcxc.ml" - ] + ], + "tor": [ + "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion", + "http://x5gdjh6t7kb4yubpufhtc3l3df2acev3emxdasd5vyuyoon5rzf5zkyd.onion", + "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion", + "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion", + "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion", + "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion", + "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion", + "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion", + "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion", + "http://fub6vgedgeadlu3ctskrpkcqjruh76tckwtj5swfhyblgml2tzgzckqd.onion/searx", + "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion", + "http://4tz2vlnwk2apf2rpinkqv6uxvfgo5xjx6vl5vp7lxgaiooumetjpstqd.onion" + ], + "i2p": [], + "loki": [] }, "whoogle": { "normal": [ @@ -577,7 +610,8 @@ "https://search.wef.lol" ], "tor": [], - "i2p": [] + "i2p": [], + "loki": [] }, "librex": { "normal": [ @@ -592,7 +626,8 @@ ], "i2p": [ "http://fboseyskrqpi6yjiifvz4ryuoiswjezkqsfxfkm2vmbuhehbpr7q.b32.i2p" - ] + ], + "loki": [] }, "rimgo": { "normal": [ @@ -613,7 +648,8 @@ "http://rimgo.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion", "http://rimgo.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion" ], - "i2p": [] + "i2p": [], + "loki": [] }, "librarian": { "normal": [ @@ -628,7 +664,8 @@ "http://librarian.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion", "http://lbry.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion" ], - "i2p": [] + "i2p": [], + "loki": [] }, "peertube": [ "https://pire.artisanlogiciel.net", @@ -779,7 +816,6 @@ "https://turkum.me", "https://video.colibris-outilslibres.org", "https://invoice.peertube.biz", - "https://vnhup.com", "https://peertube.chantierlibre.org", "https://video.9wd.eu", "https://video.niboe.info", @@ -1116,7 +1152,6 @@ "https://video.rubdos.be", "https://tube.tuxfriend.fr", "https://anarchy.tube", - "https://nsfw.vger.cloud", "https://tube.elemac.fr", "https://tube.nocturlab.fr", "https://videos.optoutpod.com", @@ -1216,7 +1251,6 @@ "https://libra.syntazia.org", "https://peertube.beeldengeluid.nl", "https://tv.lumbung.space", - "https://vid.dascoyote.xyz", "https://peertube.cuatrolibertades.org", "https://videos.hush.is", "https://tube.ebin.club", @@ -1283,7 +1317,6 @@ "https://videos.benjaminbrady.ie", "https://video.binarydad.com", "https://tube.pmj.rocks", - "https://gary.vger.cloud", "https://video.guerredeclasse.fr", "https://ptmir4.inter21.net", "https://ptmir3.inter21.net", @@ -1675,6 +1708,10 @@ "https://video.tedomum.net", "https://video.g3l.org", "https://fontube.fr", - "https://peertube.gaialabs.ch" + "https://peertube.gaialabs.ch", + "https://peertube.qtg.fr", + "https://tube.p2p.legal", + "https://troll.tv", + "https://videos.iut-orsay.fr" ] } \ No newline at end of file diff --git a/src/instances/get_instances.py b/src/instances/get_instances.py index 1d1334a..b8970ee 100644 --- a/src/instances/get_instances.py +++ b/src/instances/get_instances.py @@ -87,6 +87,8 @@ def invidious(): invidiousList = {} invidiousList['normal'] = [] invidiousList['tor'] = [] + invidiousList['i2p'] = [] + invidiousList['loki'] = [] for instance in rJson: if instance[1]['type'] == 'https': invidiousList['normal'].append(instance[1]['uri']) @@ -112,6 +114,8 @@ def pipedMaterial(): pipedMaterialList = {} pipedMaterialList['normal'] = [] pipedMaterialList['tor'] = [] + pipedMaterialList['i2p'] = [] + pipedMaterialList['loki'] = [] for item in tmp: pipedMaterialList['normal'].append(item) mightyList['pipedMaterial'] = pipedMaterialList @@ -127,6 +131,8 @@ def proxitok(): proxiTokList = {} proxiTokList['normal'] = [] proxiTokList['tor'] = [] + proxiTokList['i2p'] = [] + proxiTokList['loki'] = [] for item in tmp: proxiTokList['normal'].append(re.sub(r'/$', '', item)) mightyList['proxiTok'] = proxiTokList @@ -141,6 +147,8 @@ def send(): sendList = {} sendList['normal'] = [] sendList['tor'] = [] + sendList['i2p'] = [] + sendList['loki'] = [] for item in tmp: sendList['normal'].append(item) mightyList['send'] = sendList @@ -157,6 +165,8 @@ def nitter(): nitterList = {} nitterList['normal'] = [] nitterList['tor'] = [] + nitterList['i2p'] = [] + nitterList['loki'] = [] for table in tables: tbody = table.find('tbody') trs = tbody.find_all('tr') @@ -180,6 +190,8 @@ def bibliogram(): bibliogramList = {} bibliogramList['normal'] = [] bibliogramList['tor'] = [] + bibliogramList['i2p'] = [] + bibliogramList['loki'] = [] for item in rJson['data']: bibliogramList['normal'].append(item['address']) mightyList['bibliogram'] = bibliogramList @@ -192,6 +204,8 @@ def libreddit(): libredditList = {} libredditList['normal'] = [] libredditList['tor'] = [] + libredditList['i2p'] = [] + libredditList['loki'] = [] tmp = re.findall( r"\| \[.*\]\(([-a-zA-Z0-9@:%_\+.~#?&//=]{2,}\.[a-z]{2,}\b(?:\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?)\)*\|*[A-Z]{0,}.*\|.*\|", r.text) @@ -212,6 +226,8 @@ def teddit(): tedditList = {} tedditList['normal'] = [] tedditList['tor'] = [] + tedditList['i2p'] = [] + tedditList['loki'] = [] for item in rJson: url = item['url'] if url != '': @@ -232,6 +248,7 @@ def wikiless(): wikilessList['normal'] = [] wikilessList['tor'] = [] wikilessList['i2p'] = [] + wikilessList['loki'] = [] for item in rJson: if 'url' in item: if item['url'].strip() != "": @@ -253,6 +270,8 @@ def scribe(): scribeList = {} scribeList['normal'] = [] scribeList['tor'] = [] + scribeList['i2p'] = [] + scribeList['loki'] = [] for item in rJson: scribeList['normal'].append(item) mightyList['scribe'] = scribeList @@ -265,6 +284,8 @@ def quetre(): _list = {} _list['normal'] = [] _list['tor'] = [] + _list['i2p'] = [] + _list['loki'] = [] tmp = re.findall( r"\| \[.*\]\(([-a-zA-Z0-9@:%_\+.~#?&//=]{2,}\.[a-z]{2,}\b(?:\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?)\)*\|*[A-Z]{0,}.*\|.*\|", r.text) @@ -285,6 +306,8 @@ def libremdb(): _list = {} _list['normal'] = [] _list['tor'] = [] + _list['i2p'] = [] + _list['loki'] = [] tmp = re.findall( r"\| ([-a-zA-Z0-9@:%_\+.~#?&//=]{2,}\.[a-z]{2,}\b(?:\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?)*\|*[A-Z]{0,}.*\|.*\|", r.text) @@ -335,6 +358,8 @@ def linvgatranslate(): lingvaList = {} lingvaList['normal'] = [] lingvaList['tor'] = [] + lingvaList['i2p'] = [] + lingvaList['loki'] = [] for item in rJson: lingvaList['normal'].append(item) @@ -346,13 +371,15 @@ def searx_searxng(): r = requests.get('https://searx.space/data/instances.json') rJson = json.loads(r.text) searxList = {} + searxList['normal'] = [] searxList['tor'] = [] searxList['i2p'] = [] - searxList['normal'] = [] + searxList['loki'] = [] searxngList = {} + searxngList['normal'] = [] searxngList['tor'] = [] searxngList['i2p'] = [] - searxngList['normal'] = [] + searxngList['loki'] = [] for item in rJson['instances']: if re.search("https?:\/{2}(?:[a-zA-Z0-9]+\.)+onion(?:\/[a-zA-Z0-9]+)*\/?", item[:-1]): if (rJson['instances'][item].get('generator') == 'searxng'): @@ -383,6 +410,7 @@ def whoogle(): whoogleList['normal'] = [] whoogleList['tor'] = [] whoogleList['i2p'] = [] + whoogleList['loki'] = [] for item in tmpList: if re.search("https?:\/{2}(?:[a-zA-Z0-9]+\.)+onion(?:\/[a-zA-Z0-9]+)*\/?", item): whoogleList['tor'].append(item) @@ -401,6 +429,7 @@ def librex(): _list['normal'] = [] _list['tor'] = [] _list['i2p'] = [] + _list['loki'] = [] tmp = re.findall( r"\| {1,2}\[(?:(?:[a-zA-Z0-9]+\.)+[a-zA-Z]{2,}|✅)\]\((https?:\/{2}(?:[a-zA-Z0-9]+\.)+[a-zA-Z0-9]{2,})", r.text) @@ -426,6 +455,7 @@ def rimgo(): rimgoList['normal'] = [] rimgoList['tor'] = [] rimgoList['i2p'] = [] + rimgoList['loki'] = [] for item in rJson: if 'url' in item: rimgoList['normal'].append(item['url']) @@ -445,6 +475,7 @@ def librarian(): librarianList['normal'] = [] librarianList['tor'] = [] librarianList['i2p'] = [] + librarianList['loki'] = [] instances = rJson['instances'] for item in instances: url = item['url'] diff --git a/src/instances/piped.json b/src/instances/piped.json index 49619bd..2f742ff 100644 --- a/src/instances/piped.json +++ b/src/instances/piped.json @@ -15,5 +15,7 @@ ], "tor": [ "http://piped2bbch4xslbl2ckr6k62q56kon56ffowxaqzy42ai22a4sash3ad.onion" - ] -} + ], + "i2p": [], + "loki": [] +} \ No newline at end of file diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js index 0f7a314..352e4b7 100644 --- a/src/pages/options/widgets/general.js +++ b/src/pages/options/widgets/general.js @@ -42,7 +42,7 @@ function exportSettings() { null, result => { let resultString = JSON.stringify(result, null, ' '); - exportSettingsElement.href = 'data:application/json;base64,' + btoa(resultString); + exportSettingsElement.href = 'data:application/json;base64,' + btoa(encodeURI(resultString)); exportSettingsElement.download = 'libredirect-settings.json'; } ); @@ -171,7 +171,7 @@ protocolElement.addEventListener("change", event => { let protocolFallbackCheckbox = document.getElementById("protocol-fallback-checkbox") protocolFallbackCheckbox.addEventListener("change", event => { - browser.storage.local.set({ protocolFallback: event.target.checked}); + browser.storage.local.set({ protocolFallback: event.target.checked }); }) let nameCustomInstanceInput = document.getElementById("exceptions-custom-instance"); @@ -210,7 +210,7 @@ browser.storage.local.get( protocolElement.value = r.protocol; protocolFallbackCheckbox.checked = r.protocolFallback; // firstPartyIsolate.checked = r.firstPartyIsolate; - + let protocolFallbackElement = document.getElementById('protocol-fallback') if (protocolElement.value == "normal") { protocolFallbackElement.style.display = 'none';