Changed Update Instances selection mechanism. https://github.com/libredirect/libredirect/issues/334 Removed Peertube (maybe will readd it later). Optimized code

1 files changed, 24 insertions, 30 deletions

diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index 33f0d40b..77128612 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -6,40 +6,34 @@ import servicesHelper from "../../assets/javascripts/services.js"
 
 window.browser = window.browser || window.chrome
 
-browser.runtime.onInstalled.addListener(details => {
+browser.runtime.onInstalled.addListener(async details => {
 	if (details.previousVersion != browser.runtime.getManifest().version) {
 		// ^Used to prevent this running when debugging with auto-reload
-		fetch("/instances/blacklist.json")
-			.then(response => response.text())
-			.then(async data => {
-				browser.storage.local.set({ blacklists: JSON.parse(data) }, async () => {
-					switch (details.reason) {
-						case "install":
-							browser.storage.local.get("options", async r => {
-								if (!r.options) {
-									await generalHelper.initDefaults()
-									await servicesHelper.initDefaults()
-								}
-							})
-							break
-						case "update":
-							switch (details.previousVersion) {
-								case "2.2.0":
-								case "2.2.1":
-									browser.storage.local.get("options", async r => {
-										if (!r.options) {
-											await generalHelper.initDefaults()
-											await servicesHelper.initDefaults()
-											await servicesHelper.upgradeOptions()
-										}
-									})
-									break
-								default:
-									await servicesHelper.processUpdate()
-							}
+		switch (details.reason) {
+			case "install":
+				browser.storage.local.get("options", async r => {
+					if (!r.options) {
+						await generalHelper.initDefaults()
+						await servicesHelper.initDefaults()
 					}
 				})
-			})
+				break
+			case "update":
+				switch (details.previousVersion) {
+					case "2.2.0":
+					case "2.2.1":
+						browser.storage.local.get("options", async r => {
+							if (!r.options) {
+								await generalHelper.initDefaults()
+								await servicesHelper.initDefaults()
+								await servicesHelper.upgradeOptions()
+							}
+						})
+						break
+					default:
+						await servicesHelper.processUpdate()
+				}
+		}
 	}
 })