From 2bd41a955212bd0cdb50b23454c14883aa329547 Mon Sep 17 00:00:00 2001
From: wearrrrr <contact@wearr.dev>
Date: Sun, 7 Apr 2024 22:57:51 -0500
Subject: [PATCH] Fix misc bugs with cloaking, empty localStorage values, and
 remove redundant transportManager code.

---
 src/components/CloakLoader.astro      | 3 +++
 src/components/SettingsTablist.astro  | 4 ++--
 src/components/ts/TransportManager.ts | 5 +----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/CloakLoader.astro b/src/components/CloakLoader.astro
index 8ff81e6..f6f2d64 100644
--- a/src/components/CloakLoader.astro
+++ b/src/components/CloakLoader.astro
@@ -11,6 +11,9 @@
             link = document.createElement("link");
             link.rel = "icon";
           }
+          if (!parsedCloak.icon.startsWith("http")) {
+            parsedCloak.icon = window.location.origin + parsedCloak.icon;
+          }
           link.href = `/custom-favicon?url=${parsedCloak.icon}`;
           document.getElementsByTagName("head")[0].appendChild(link);
         }
diff --git a/src/components/SettingsTablist.astro b/src/components/SettingsTablist.astro
index 5428ae0..eb63a6b 100644
--- a/src/components/SettingsTablist.astro
+++ b/src/components/SettingsTablist.astro
@@ -311,10 +311,10 @@ const t = i18n.useTranslations(lang);
         const useWss = location.protocol == "https:";
         const webSocketProtocol = useWss ? "wss://" : "ws://";
         let savedWispUrl = localStorage.getItem("alu__wispUrl");
-        if (savedWispUrl == null)
+        if (savedWispUrl == null || savedWispUrl == "")
           localStorage.setItem("alu__wispUrl", webSocketProtocol + location.host + "/wisp/");
         let savedBareUrl = localStorage.getItem("alu__bareUrl");
-        if (savedBareUrl == null) localStorage.setItem("alu__bareUrl", location.origin + "/bare/");
+        if (savedBareUrl == null || savedBareUrl == "") localStorage.setItem("alu__bareUrl", location.origin + "/bare/");
         wispURLInput.value = localStorage.getItem("alu__wispUrl");
         bareURLInput.value = localStorage.getItem("alu__bareUrl");
         // Proxy settings
diff --git a/src/components/ts/TransportManager.ts b/src/components/ts/TransportManager.ts
index 67a3701..9e3ab76 100644
--- a/src/components/ts/TransportManager.ts
+++ b/src/components/ts/TransportManager.ts
@@ -28,9 +28,6 @@ export default class TransportManager {
     if (transport) {
       this.transport = transport;
     }
-    if (navigator.userAgent.includes("Firefox")) {
-      this.transport = "BareMod.BareClient";
-    }
     if (localStorage.getItem("alu__selectedTransport") != null && !transport) {
       this.transport = JSON.parse(localStorage.getItem("alu__selectedTransport")!).value;
     }
@@ -58,7 +55,7 @@ export default class TransportManager {
     let transportConfig: transportConfig = { wisp: wispURL };
 
     if (this.transport == "BareMod.BareClient") {
-      transportConfig = localStorage.getItem("alu__bareURL") || window.location.origin + "/bare/";
+      transportConfig = localStorage.getItem("alu__bareUrl") || window.location.origin + "/bare/";
     }
 
     SetTransport(this.transport, transportConfig);