about summary refs log tree commit diff stats
path: root/src/assets/javascripts/services.js
diff options
context:
space:
mode:
authorHygna <hygna@proton.me>2022-09-29 18:32:03 +0100
committerHygna <hygna@proton.me>2022-09-29 18:32:03 +0100
commitf1b8b64c48fede90ee9c828c1b82e641c0fe653d (patch)
tree44b55dfde203a223d57e6dcfd717dad7614e3b54 /src/assets/javascripts/services.js
parentUnify cookies (diff)
downloadlibredirect-f1b8b64c48fede90ee9c828c1b82e641c0fe653d.zip
Changes:
Improved instance fetcher

Added instance updating

Fix a few bugs
Diffstat (limited to 'src/assets/javascripts/services.js')
-rw-r--r--src/assets/javascripts/services.js39
1 files changed, 20 insertions, 19 deletions
diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js
index 3db12595..49af6d1f 100644
--- a/src/assets/javascripts/services.js
+++ b/src/assets/javascripts/services.js
@@ -550,29 +550,30 @@ function unifyPreferences(url) {
 }

 

 function setRedirects(redirects) {

-	browser.storage.local.get(["options", "blacklists"], async r => {

-		let options = r.options

-		let targets = {}

-		for (const service in config.services) {

-			if (config.services[service].targets == "datajson") {

-				targets[service] = redirects[service]

-			}

-			for (const frontend in config.services[service].frontends) {

-				if (config.services[service].frontends[frontend].instanceList) {

-					for (const network in config.networks) {

-						options[frontend][network].enabled = redirects[frontend][network]

-					}

-					for (const blacklist in r.blacklists) {

-						for (const instance of blacklist) {

-							let i = options[frontend].clearnet.enabled.indexOf(instance)

-							if (i > -1) options[frontend].clearnet.enabled.splice(i, 1)

-						}

+	//browser.storage.local.get(["options", "blacklists"], async r => {

+	//let options = r.options

+	let targets = {}

+	for (const service in config.services) {

+		if (config.services[service].targets == "datajson") {

+			targets[service] = redirects[service]

+		}

+		for (const frontend in config.services[service].frontends) {

+			if (config.services[service].frontends[frontend].instanceList) {

+				for (const network in config.networks) {

+					options[frontend][network].enabled = redirects[frontend][network]

+				}

+				for (const blacklist in blacklists) {

+					for (const instance of blacklist) {

+						let i = options[frontend].clearnet.enabled.indexOf(instance)

+						if (i > -1) options[frontend].clearnet.enabled.splice(i, 1)

 					}

 				}

 			}

 		}

-		browser.storage.local.set({ redirects, targets, options })

-	})

+	}

+	console.log(redirects)

+	browser.storage.local.set({ redirects, targets, options })

+	//})

 }

 

 export default {