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, 32 insertions, 22 deletions

diff --git a/src/assets/javascripts/reuters.js b/src/assets/javascripts/reuters.js
index e4afa19c..51d16329 100644
--- a/src/assets/javascripts/reuters.js
+++ b/src/assets/javascripts/reuters.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.neuters = val
 		neutersNormalRedirectsChecks = [...redirects.neuters.normal]
-		for (const instance of r.cloudflareBlackList) {
+		for (const instance of [...r.cloudflareBlackList, ...r.offlineBlackList]) {
 			const a = neutersNormalRedirectsChecks.indexOf(instance)
 			if (a > -1) neutersNormalRedirectsChecks.splice(a, 1)
 		}
 		browser.storage.local.set({
 			neutersRedirects: redirects,
 			neutersNormalRedirectsChecks,
+			neutersTorRedirectsChecks: [...redirects.neuters.tor],
+			neutersI2pRedirectsChecks: [...redirects.neuters.i2p],
+			neutersLokiRedirectsChecks: [...redirects.neuters.loki],
 		})
 	})
 }
@@ -109,26 +112,33 @@ function initDefaults() {
 				for (let i = 0; i < frontends.length; i++) {
 					redirects[frontends[i]] = dataJson[frontends[i]]
 				}
-				browser.storage.local.set(
-					{
-						disableReuters: true,
-
-						reutersRedirects: redirects,
-
-						neutersNormalRedirectsChecks: [...redirects.neuters.normal],
-						neutersNormalCustomRedirects: [],
-
-						neutersTorRedirectsChecks: [...redirects.neuters.tor],
-						neutersTorCustomRedirects: [],
-
-						neutersI2pRedirectsChecks: [...redirects.neuters.i2p],
-						neutersI2pCustomRedirects: [],
-
-						neutersLokiRedirectsChecks: [...redirects.neuters.loki],
-						neutersLokiCustomRedirects: [],
-					},
-					() => resolve()
-				)
+				browser.storage.local.get(["cloudflareBlackList", "offlineBlackList"], async r => {
+					neutersNormalRedirectsChecks = [...redirects.neuters.normal]
+					for (const instance of [...r.cloudflareBlackList, ...r.offlineBlackList]) {
+						const a = neutersNormalRedirectsChecks.indexOf(instance)
+						if (a > -1) neutersNormalRedirectsChecks.splice(a, 1)
+					}
+					browser.storage.local.set(
+						{
+							disableReuters: true,
+
+							reutersRedirects: redirects,
+
+							neutersNormalRedirectsChecks,
+							neutersNormalCustomRedirects: [],
+
+							neutersTorRedirectsChecks: [...redirects.neuters.tor],
+							neutersTorCustomRedirects: [],
+
+							neutersI2pRedirectsChecks: [...redirects.neuters.i2p],
+							neutersI2pCustomRedirects: [],
+
+							neutersLokiRedirectsChecks: [...redirects.neuters.loki],
+							neutersLokiCustomRedirects: [],
+						},
+						() => resolve()
+					)
+				})
 			})
 	})
 }