Made networks mixed https://github.com/libredirect/libredirect/issues/486

4 files changed, 11 insertions, 37 deletions

diff --git a/src/assets/javascripts/general.js b/src/assets/javascripts/general.js
index 7b8f9dac..7fc9d1ba 100644
--- a/src/assets/javascripts/general.js
+++ b/src/assets/javascripts/general.js
@@ -32,8 +32,6 @@ async function initDefaults() {
 					},
 					theme: "detect",
 					popupServices: ["youtube", "twitter", "instagram", "tiktok", "imgur", "reddit", "quora", "translate", "maps"],
-					network: "clearnet",
-					networkFallback: true,
 				},
 			},
 			() => resolve()
diff --git a/src/assets/javascripts/get-localstorage.js b/src/assets/javascripts/get-localstorage.js
deleted file mode 100644
index 66740408..00000000
--- a/src/assets/javascripts/get-localstorage.js
+++ /dev/null
@@ -1,15 +0,0 @@
-window.browser = window.browser || window.chrome
-
-browser.storage.local.get(["localstorage", "tmp"], r => {
-	let localstorageJson = r.localstorage
-	const frontend = r.tmp[0]
-	const items = r.tmp[1]
-	localstorageJson[frontend] = {}
-
-	for (const item of items) {
-		let tmp = localStorage.getItem(item)
-		if (tmp) localstorageJson[frontend][item] = tmp
-	}
-
-	browser.storage.local.set({ localstorage: localstorageJson })
-})
diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js
index d763bf6a..3b58f711 100644
--- a/src/assets/javascripts/services.js
+++ b/src/assets/javascripts/services.js
@@ -89,8 +89,10 @@ function redirect(url, type, initiator, forceRedirection) {
 		if (initiator && all(service, null, options, config, redirects).includes(initiator.origin)) return "BYPASSTAB"
 
 		if (config.services[service].frontends[frontend].instanceList) {
-			let instanceList = [...options[frontend][options.network].enabled, ...options[frontend][options.network].custom]
-			if (instanceList.length === 0 && options.networkFallback) instanceList = [...options[frontend].clearnet.enabled, ...options[frontend].clearnet.custom]
+			let instanceList = []
+			for (const network in options[frontend]) {
+				instanceList.push(...[...options[frontend][network].enabled, ...options[frontend][network].custom])
+			}
 			if (instanceList.length === 0) return
 			randomInstance = utils.getRandomInstance(instanceList)
 		} else if (config.services[service].frontends[frontend].singleInstance) randomInstance = config.services[service].frontends[frontend].singleInstance
@@ -489,15 +491,17 @@ function switchInstance(url) {
 		for (const service in config.services) {
 			if (!all(service, null, options, config, redirects).includes(protocolHost)) continue
 
-			let instancesList
+			let instancesList = []
 			if (Object.keys(config.services[service].frontends).length == 1) {
 				const frontend = Object.keys(config.services[service].frontends)[0]
-				instancesList = [...options[frontend][options.network].enabled, ...options[frontend][options.network].custom]
-				if (instancesList.length === 0 && options.networkFallback) instancesList = [...options[frontend].clearnet.enabled, ...options[frontend].clearnet.custom]
+				for (const network in options[frontend]) {
+					instancesList.push(...[...options[frontend][network].enabled, ...options[frontend][network].custom])
+				}
 			} else {
 				const frontend = options[service].frontend
-				instancesList = [...options[frontend][options.network].enabled, ...options[frontend][options.network].custom]
-				if (instancesList.length === 0 && options.networkFallback) instancesList = [...options[frontend].clearnet.enabled, ...options[frontend].clearnet.custom]
+				for (const network in options[frontend]) {
+					instancesList.push(...[...options[frontend][network].enabled, ...options[frontend][network].custom])
+				}
 			}
 
 			let oldInstance
diff --git a/src/assets/javascripts/set-localstorage.js b/src/assets/javascripts/set-localstorage.js
deleted file mode 100644
index 8dbfcad7..00000000
--- a/src/assets/javascripts/set-localstorage.js
+++ /dev/null
@@ -1,13 +0,0 @@
-window.browser = window.browser || window.chrome
-
-browser.storage.local.get(["localstorage", "tmp"], r => {
-	const localstorageJson = r.localstorage
-	const frontend = r.tmp[0]
-	const items = localstorageJson[frontend]
-
-	for (const item in items) {
-		localStorage.setItem(item, items[item])
-	}
-
-	window.close()
-})