Toggle current instance in popup

Fixed bug where testing latency of multiple frontends at the same time wouldn't save all of the timings

3 files changed, 15 insertions, 9 deletions

diff --git a/src/assets/images/instance-icon.svg b/src/assets/images/instance-icon.svg
new file mode 100644
index 00000000..6b034c6f
--- /dev/null
+++ b/src/assets/images/instance-icon.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor">
+  <path d="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zm6.93 6h-2.95c-.32-1.25-.78-2.45-1.38-3.56 1.84.63 3.37 1.91 4.33 3.56zM12 4.04c.83 1.2 1.48 2.53 1.91 3.96h-3.82c.43-1.43 1.08-2.76 1.91-3.96zM4.26 14C4.1 13.36 4 12.69 4 12s.1-1.36.26-2h3.38c-.08.66-.14 1.32-.14 2 0 .68.06 1.34.14 2H4.26zm.82 2h2.95c.32 1.25.78 2.45 1.38 3.56-1.84-.63-3.37-1.9-4.33-3.56zm2.95-8H5.08c.96-1.66 2.49-2.93 4.33-3.56C8.81 5.55 8.35 6.75 8.03 8zM12 19.96c-.83-1.2-1.48-2.53-1.91-3.96h3.82c-.43 1.43-1.08 2.76-1.91 3.96zM14.34 14H9.66c-.09-.66-.16-1.32-.16-2 0-.68.07-1.35.16-2h4.68c.09.65.16 1.32.16 2 0 .68-.07 1.34-.16 2zm.25 5.56c.6-1.11 1.06-2.31 1.38-3.56h2.95c-.96 1.65-2.49 2.93-4.33 3.56zM16.36 14c.08-.66.14-1.32.14-2 0-.68-.06-1.34-.14-2h3.38c.16.64.26 1.31.26 2s-.1 1.36-.26 2h-3.38z"></path>
+</svg>
diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js
index 80a1ac45..806624d7 100644
--- a/src/assets/javascripts/services.js
+++ b/src/assets/javascripts/services.js
@@ -422,7 +422,7 @@ function computeService(url, returnFrontend) {
 						} else {

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

 								if (all(service, frontend, options, config, redirects).includes(utils.protocolHost(url))) {

-									if (returnFrontend) resolve([service, frontend, url.hostname])

+									if (returnFrontend) resolve([service, frontend, utils.protocolHost(url)])

 									else resolve(service)

 									return

 								}

@@ -520,7 +520,7 @@ function unifyPreferences(url, tabId) {
 					const frontendObject = config.services[service].frontends[frontend]

 					if ("cookies" in frontendObject.preferences) {

 						for (const cookie of frontendObject.preferences.cookies) {

-							utils.copyCookie(frontendObject, url, instancesList, cookie)

+							await utils.copyCookie(frontendObject, url, instancesList, cookie)

 						}

 					}

 					if ("localstorage" in frontendObject.preferences) {

diff --git a/src/assets/javascripts/utils.js b/src/assets/javascripts/utils.js
index 9ae9123f..62041690 100644
--- a/src/assets/javascripts/utils.js
+++ b/src/assets/javascripts/utils.js
@@ -424,17 +424,20 @@ function latency(service, frontend, document, location) {
 	latencyElement.addEventListener("click", async () => {
 		let reloadWindow = () => location.reload()
 		latencyElement.addEventListener("click", reloadWindow)
-		browser.storage.local.get(["redirects", "latency"], r => {
+		browser.storage.local.get("redirects", r => {
 			let redirects = r.redirects
-			let latency = r.latency
 			const oldHtml = latencyLabel.innerHTML
 			latencyLabel.innerHTML = "..."
 			testLatency(latencyLabel, redirects[frontend].clearnet, frontend).then(r => {
-				latency[frontend] = r
-				browser.storage.local.set({ latency })
-				latencyLabel.innerHTML = oldHtml
-				processDefaultCustomInstances(service, frontend, "clearnet", document)
-				latencyElement.removeEventListener("click", reloadWindow)
+				const frontendLatency = r
+				browser.storage.local.get("latency", r => {
+					let latency = r.latency
+					latency[frontend] = frontendLatency
+					browser.storage.local.set({ latency })
+					latencyLabel.innerHTML = oldHtml
+					processDefaultCustomInstances(service, frontend, "clearnet", document)
+					latencyElement.removeEventListener("click", reloadWindow)
+				})
 			})
 		})
 	})