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, 31 insertions, 21 deletions

diff --git a/src/assets/javascripts/maps.js b/src/assets/javascripts/maps.js
index 9fb10b9d..6e3c9af0 100644
--- a/src/assets/javascripts/maps.js
+++ b/src/assets/javascripts/maps.js
@@ -21,16 +21,19 @@ redirects.osm = {}
 redirects.osm.normal = ["https://www.openstreetmap.org"]
 
 function setRedirects(val) {
-	browser.storage.local.get("cloudflareBlackList", r => {
+	browser.storage.local.get(["cloudflareBlackList", "offlineBlackList"], r => {
 		redirects.facil = val
 		facilNormalRedirectsChecks = [...redirects.facil.normal]
-		for (const instance of r.cloudflareBlackList) {
+		for (const instance of [...r.cloudflareBlackList, ...r.offlineBlackList]) {
 			const a = facilNormalRedirectsChecks.indexOf(instance)
 			if (a > -1) facilNormalRedirectsChecks.splice(a, 1)
 		}
 		browser.storage.local.set({
 			mapsRedirects: redirects,
 			facilNormalRedirectsChecks,
+			facilTorRedirectsChecks: [...redirects.facil.tor],
+			facilI2pRedirectsChecks: [...redirects.facil.i2p],
+			facilLokiRedirectsChecks: [...redirects.facil.loki],
 		})
 	})
 }
@@ -264,25 +267,32 @@ function initDefaults() {
 				for (let i = 0; i < frontends.length; i++) {
 					redirects[frontends[i]] = dataJson[frontends[i]]
 				}
-				browser.storage.local.set(
-					{
-						disableMaps: false,
-						mapsFrontend: "osm",
-						mapsRedirects: redirects,
-						facilNormalRedirectsChecks: [...redirects.facil.normal],
-						facilNormalCustomRedirects: [],
-
-						facilTorRedirectsChecks: [...redirects.facil.tor],
-						facilTorCustomRedirects: [],
-
-						facilI2pRedirectsChecks: [...redirects.facil.i2p],
-						facilI2pCustomRedirects: [],
-
-						facilLokiRedirectsChecks: [...redirects.facil.loki],
-						facilLokiCustomRedirects: [],
-					},
-					() => resolve()
-				)
+				browser.storage.local.get(["cloudflareBlackList", "offlineBlackList"], async r => {
+					facilNormalRedirectsChecks = [...redirects.facil.normal]
+					for (const instance of [...r.cloudflareBlackList, ...r.offlineBlackList]) {
+						const a = facilNormalRedirectsChecks.indexOf(instance)
+						if (a > -1) facilNormalRedirectsChecks.splice(a, 1)
+					}
+					browser.storage.local.set(
+						{
+							disableMaps: false,
+							mapsFrontend: "osm",
+							mapsRedirects: redirects,
+							facilNormalRedirectsChecks,
+							facilNormalCustomRedirects: [],
+
+							facilTorRedirectsChecks: [...redirects.facil.tor],
+							facilTorCustomRedirects: [],
+
+							facilI2pRedirectsChecks: [...redirects.facil.i2p],
+							facilI2pCustomRedirects: [],
+
+							facilLokiRedirectsChecks: [...redirects.facil.loki],
+							facilLokiCustomRedirects: [],
+						},
+						() => resolve()
+					)
+				})
 			})
 	})
 }