3 files changed, 17 insertions, 18 deletions
diff --git a/webAO/client.ts b/webAO/client.ts
index f7b8ebb..ca3b816 100644
--- a/webAO/client.ts
+++ b/webAO/client.ts
@@ -19,7 +19,6 @@ import { fetchBackgroundList, fetchEvidenceList, fetchCharacterList, fetchManife
 const version = process.env.npm_package_version;
 const { ip: serverIP, mode, theme } = queryParser();
 
-const THEME: string = theme || "default";
 export let CHATBOX: string;
 export const setCHATBOX = (val: string) => {
     CHATBOX = val
@@ -69,6 +68,11 @@ fpPromise
     .then((result) => {
         hdid = result.visitorId;
 
+        if (!serverIP) {
+            alert("No server IP specified!");
+            return;
+        }
+
         client = new Client(serverIP);
         client.connect()
         isLowMemory();
@@ -146,7 +150,7 @@ class Client extends EventEmitter {
         this.musics_time = false;
         this.callwords = [];
         this.manifest = [];
-        this.resources = getResources(AO_HOST, THEME);
+        this.resources = getResources(AO_HOST, theme);
         this.selectedEmote = -1;
         this.selectedEvidence = 0;
         this.checkUpdater = null;
diff --git a/webAO/client/aoHost.ts b/webAO/client/aoHost.ts
index fa13e79..6cad62a 100644
--- a/webAO/client/aoHost.ts
+++ b/webAO/client/aoHost.ts
@@ -1,7 +1,7 @@
 import queryParser from '../utils/queryParser'
+
 const { asset } = queryParser();
-const DEFAULT_HOST = 'http://attorneyoffline.de/base/';
-export let AO_HOST = asset || DEFAULT_HOST 
+export let AO_HOST = asset;
 export const setAOhost = (val: string) => {
-    AO_HOST = val
+    AO_HOST = val;
 }
diff --git a/webAO/utils/queryParser.ts b/webAO/utils/queryParser.ts
index 20863ca..c9c13cc 100644
--- a/webAO/utils/queryParser.ts
+++ b/webAO/utils/queryParser.ts
@@ -2,24 +2,19 @@
 
 interface QueryParams {
     ip: string;
-    serverIP: string;
     mode: string;
     asset: string;
     theme: string;
 }
 
-interface StringMap {
-    [key: string]: any;
-}
-
 const queryParser = (): QueryParams => {
-    const queryDict: StringMap = {};
-    location.search
-        .substr(1)
-        .split("&")
-        .forEach((item) => {
-            queryDict[item.split("=")[0]] = item.split("=")[1];
-        });
-    return queryDict as QueryParams;
+    const urlParams = new URLSearchParams(window.location.search);
+    const queryParams = {
+        ip: urlParams.get("ip") || "",
+        mode: urlParams.get("mode") || "join",
+        asset: urlParams.get("asset") || "http://attorneyoffline.de/base/",
+        theme: urlParams.get("theme") || "default",
+    }
+    return queryParams as QueryParams;
 };
 export default queryParser;