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, 16 insertions, 12 deletions

diff --git a/src/assets/javascripts/reddit.js b/src/assets/javascripts/reddit.js
index d1bf7b99..ca1993b5 100644
--- a/src/assets/javascripts/reddit.js
+++ b/src/assets/javascripts/reddit.js
@@ -16,11 +16,11 @@ 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 = val
 		libredditNormalRedirectsChecks = [...redirects.libreddit.normal]
 		tedditNormalRedirectsChecks = [...redirects.teddit.normal]
-		for (const instance of r.cloudflareBlackList) {
+		for (const instance of [...r.cloudflareBlackList, ...r.offlineBlackList]) {
 			const a = libredditNormalRedirectsChecks.indexOf(instance)
 			if (a > -1) libredditNormalRedirectsChecks.splice(a, 1)
 
@@ -30,7 +30,13 @@ function setRedirects(val) {
 		browser.storage.local.set({
 			redditRedirects: redirects,
 			libredditNormalRedirectsChecks,
+			libredditTorRedirectsChecks: [...redirects.libreddit.tor],
+			libredditI2pRedirectsChecks: [...redirects.libreddit.i2p],
+			libredditLokiRedirectsChecks: [...redirects.libreddit.loki],
 			tedditNormalRedirectsChecks,
+			tedditTorRedirectsChecks: [...redirects.teddit.tor],
+			tedditI2pRedirectsChecks: [...redirects.teddit.i2p],
+			tedditLokiRedirectsChecks: [...redirects.teddit.loki],
 		})
 	})
 }
@@ -330,17 +336,15 @@ 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 => {
 					libredditNormalRedirectsChecks = [...redirects.libreddit.normal]
 					tedditNormalRedirectsChecks = [...redirects.teddit.normal]
-					for (const instance of r.cloudflareBlackList) {
-						let i
+					for (const instance of [...r.cloudflareBlackList, ...r.offlineBlackList]) {
+						const a = libredditNormalRedirectsChecks.indexOf(instance)
+						if (a > -1) libredditNormalRedirectsChecks.splice(a, 1)
 
-						i = libredditNormalRedirectsChecks.indexOf(instance)
-						if (i > -1) libredditNormalRedirectsChecks.splice(i, 1)
-
-						i = tedditNormalRedirectsChecks.indexOf(instance)
-						if (i > -1) tedditNormalRedirectsChecks.splice(i, 1)
+						const b = tedditNormalRedirectsChecks.indexOf(instance)
+						if (b > -1) tedditNormalRedirectsChecks.splice(b, 1)
 					}
 					browser.storage.local.set(
 						{
@@ -348,7 +352,7 @@ function initDefaults() {
 							redditFrontend: "libreddit",
 							redditRedirects: redirects,
 
-							libredditNormalRedirectsChecks: libredditNormalRedirectsChecks,
+							libredditNormalRedirectsChecks,
 							libredditNormalCustomRedirects: [],
 
 							libredditTorRedirectsChecks: [...redirects.libreddit.tor],
@@ -360,7 +364,7 @@ function initDefaults() {
 							libredditLokiRedirectsChecks: [...redirects.libreddit.loki],
 							libredditLokiCustomRedirects: [],
 
-							tedditNormalRedirectsChecks: tedditNormalRedirectsChecks,
+							tedditNormalRedirectsChecks,
 							tedditNormalCustomRedirects: [],
 
 							tedditTorRedirectsChecks: [...redirects.teddit.tor],