From ab396c71295f76e62739c01bc8e6a29f1896ba8c Mon Sep 17 00:00:00 2001 From: David Skoland Date: Mon, 13 Nov 2023 00:11:21 +0100 Subject: Use URLSearchParams and set default directly --- webAO/utils/queryParser.ts | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'webAO/utils') 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; -- cgit