Merge pull request 'Latency threshold and offline instances' (https://codeberg.org/LibRedirect/libredirect/pulls/14) from latency into master

Reviewed-on: https://codeberg.org/LibRedirect/libredirect/pulls/14

1 files changed, 10 insertions, 7 deletions

diff --git a/src/assets/javascripts/wikipedia.js b/src/assets/javascripts/wikipedia.js
index 04191d1a..2d0f75a1 100644
--- a/src/assets/javascripts/wikipedia.js
+++ b/src/assets/javascripts/wikipedia.js
@@ -17,16 +17,19 @@ for (let i = 0; i < frontends.length; i++) {
 }
 
 function setRedirects(val) {
-	browser.storage.local.get("cloudflareBlackList", r => {
+	browser.storage.local.get(["cloudflareBlackList", "offlineBlackList"], r => {
 		redirects.wikiless = val
 		wikilessNormalRedirectsChecks = [...redirects.wikiless.normal]
-		for (const instance of r.cloudflareBlackList) {
+		for (const instance of [...r.cloudflareBlackList, ...r.offlineBlackList]) {
 			const a = wikilessNormalRedirectsChecks.indexOf(instance)
 			if (a > -1) wikilessNormalRedirectsChecks.splice(a, 1)
 		}
 		browser.storage.local.set({
 			wikipediaRedirects: redirects,
 			wikilessNormalRedirectsChecks,
+			wikilessTorRedirectsChecks: [...redirects.wikiless.tor],
+			wikilessI2pRedirectsChecks: [...redirects.wikiless.i2p],
+			wikilessLokiRedirectsChecks: [...redirects.wikiless.loki],
 		})
 	})
 }
@@ -200,18 +203,18 @@ function initDefaults() {
 				for (let i = 0; i < frontends.length; i++) {
 					redirects[frontends[i]] = dataJson[frontends[i]]
 				}
-				browser.storage.local.get("cloudflareBlackList", async r => {
+				browser.storage.local.get(["cloudflareBlackList", "offlineBlackList"], async r => {
 					wikilessNormalRedirectsChecks = [...redirects.wikiless.normal]
-					for (const instance of r.cloudflareBlackList) {
-						let i = wikilessNormalRedirectsChecks.indexOf(instance)
-						if (i > -1) wikilessNormalRedirectsChecks.splice(i, 1)
+					for (const instance of [...r.cloudflareBlackList, ...r.offlineBlackList]) {
+						const a = wikilessNormalRedirectsChecks.indexOf(instance)
+						if (a > -1) wikilessNormalRedirectsChecks.splice(a, 1)
 					}
 					browser.storage.local.set(
 						{
 							disableWikipedia: true,
 							wikipediaRedirects: redirects,
 
-							wikilessNormalRedirectsChecks: wikilessNormalRedirectsChecks,
+							wikilessNormalRedirectsChecks,
 							wikilessNormalCustomRedirects: [],
 
 							wikilessTorRedirectsChecks: [...redirects.wikiless.tor],