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/imdb.js b/src/assets/javascripts/imdb.js
index 9981f1b9..57368557 100644
--- a/src/assets/javascripts/imdb.js
+++ b/src/assets/javascripts/imdb.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.libremdb = val
 		libremdbNormalRedirectsChecks = [...redirects.libremdb.normal]
-		for (const instance of r.cloudflareBlackList) {
+		for (const instance of [...r.cloudflareBlackList, ...r.offlineBlackList]) {
 			const a = libremdbNormalRedirectsChecks.indexOf(instance)
 			if (a > -1) libremdbNormalRedirectsChecks.splice(a, 1)
 		}
 		browser.storage.local.set({
 			imdbRedirects: redirects,
 			libremdbNormalRedirectsChecks,
+			libremdbTorRedirectsChecks: [...redirects.libremdb.tor],
+			libremdbI2pRedirectsChecks: [...redirects.libremdb.i2p],
+			libremdbLokiRedirectsChecks: [...redirects.libremdb.loki],
 		})
 	})
 }
@@ -172,25 +175,32 @@ function initDefaults() {
 				for (let i = 0; i < frontends.length; i++) {
 					redirects[frontends[i]] = dataJson[frontends[i]]
 				}
-				browser.storage.local.set(
-					{
-						disableImdb: true,
-						imdbRedirects: redirects,
-
-						libremdbNormalRedirectsChecks: [...redirects.libremdb.normal],
-						libremdbNormalCustomRedirects: [],
-
-						libremdbTorRedirectsChecks: [...redirects.libremdb.tor],
-						libremdbTorCustomRedirects: [],
-
-						libremdbI2pRedirectsChecks: [],
-						libremdbI2pCustomRedirects: [],
-
-						libremdbLokiRedirectsChecks: [],
-						libremdbLokiCustomRedirects: [],
-					},
-					() => resolve()
-				)
+				browser.storage.local.get(["cloudflareBlackList", "offlineBlackList"], async r => {
+					libremdbNormalRedirectsChecks = [...redirects.libremdb.normal]
+					for (const instance of [...r.cloudflareBlackList, ...r.offlineBlackList]) {
+						const a = libremdbNormalRedirectsChecks.indexOf(instance)
+						if (a > -1) libremdbNormalRedirectsChecks.splice(a, 1)
+					}
+					browser.storage.local.set(
+						{
+							disableImdb: true,
+							imdbRedirects: redirects,
+
+							libremdbNormalRedirectsChecks,
+							libremdbNormalCustomRedirects: [],
+
+							libremdbTorRedirectsChecks: [...redirects.libremdb.tor],
+							libremdbTorCustomRedirects: [],
+
+							libremdbI2pRedirectsChecks: [],
+							libremdbI2pCustomRedirects: [],
+
+							libremdbLokiRedirectsChecks: [],
+							libremdbLokiCustomRedirects: [],
+						},
+						() => resolve()
+					)
+				})
 			})
 	})
 }