aboutsummaryrefslogtreecommitdiff
path: root/webAO
diff options
context:
space:
mode:
authorstonedDiscord <Tukz@gmx.de>2024-12-12 23:07:35 +0100
committerstonedDiscord <Tukz@gmx.de>2024-12-12 23:07:58 +0100
commit3bc921a08fc7b3306563e8a86a7efd4db1036995 (patch)
tree03424c4432bb56e1f49fb4ae839109f1a6da1ab9 /webAO
parentbd588174157e39342b05a882466233ddcd26aebc (diff)
get rid of sageTags in a few places
plan is to migrate to createTextNode
Diffstat (limited to 'webAO')
-rw-r--r--webAO/client/createArea.ts4
-rw-r--r--webAO/client/handleBans.ts4
-rw-r--r--webAO/master.ts4
-rw-r--r--webAO/packets/handlers/handleBB.ts4
-rw-r--r--webAO/packets/handlers/handleBD.ts3
-rw-r--r--webAO/packets/handlers/handleEI.ts4
-rw-r--r--webAO/packets/handlers/handleEM.ts1
-rw-r--r--webAO/packets/handlers/handleFA.ts3
-rw-r--r--webAO/packets/handlers/handleFM.ts1
-rw-r--r--webAO/packets/handlers/handleKB.ts3
-rw-r--r--webAO/packets/handlers/handleLE.ts2
-rw-r--r--webAO/viewport/viewport.ts3
12 files changed, 16 insertions, 20 deletions
diff --git a/webAO/client/createArea.ts b/webAO/client/createArea.ts
index 68406d9..9a40bef 100644
--- a/webAO/client/createArea.ts
+++ b/webAO/client/createArea.ts
@@ -1,7 +1,9 @@
import { client } from "../client";
import { area_click } from "../dom/areaClick";
+import { safeTags } from "../encoding";
-export const createArea = (id: number, name: string) => {
+export const createArea = (id: number, aname: string) => {
+ const name = safeTags(aname);
const thisarea = {
name,
players: 0,
diff --git a/webAO/client/handleBans.ts b/webAO/client/handleBans.ts
index a2e56f4..9eec9be 100644
--- a/webAO/client/handleBans.ts
+++ b/webAO/client/handleBans.ts
@@ -1,3 +1,5 @@
+import { safeTags } from "../encoding";
+
/**
* Handles the kicked packet
* @param {string} type is it a kick or a ban
@@ -6,7 +8,7 @@
export const handleBans = (type: string, reason: string) => {
document.getElementById("client_error")!.style.display = "flex";
document.getElementById("client_errortext")!.innerHTML =
- `${type}:<br>${reason.replace(/\n/g, "<br />")}`;
+ `${type}:<br>${safeTags(reason).replace(/\n/g, "<br />")}`;
(<HTMLElement>document.getElementById("client_reconnect")).style.display =
"none";
alert(type + ":\r" + reason);
diff --git a/webAO/master.ts b/webAO/master.ts
index 23b5c04..eeecec5 100644
--- a/webAO/master.ts
+++ b/webAO/master.ts
@@ -62,9 +62,9 @@ main();
export function setServ(ID: number) {
const server = servers[ID];
const onlineStr = server.online;
- const serverDesc = safeTags(server.description);
document.getElementById("serverdescription_content").innerHTML =
- `<b>${onlineStr}</b><br>${serverDesc}`;
+ `<b>${onlineStr}</b><br>`;
+ document.getElementById("serverdescription_content").appendChild(document.createTextNode(server.description));
}
window.setServ = setServ;
diff --git a/webAO/packets/handlers/handleBB.ts b/webAO/packets/handlers/handleBB.ts
index b2895c8..0e973bc 100644
--- a/webAO/packets/handlers/handleBB.ts
+++ b/webAO/packets/handlers/handleBB.ts
@@ -1,10 +1,8 @@
-import { safeTags } from "../../encoding";
-
/**
* Handles the warning packet
* on client this spawns a message box you can't close for 2 seconds
* @param {Array} args ban reason
*/
export const handleBB = (args: string[]) => {
- alert(safeTags(args[1]));
+ alert(args[1]);
};
diff --git a/webAO/packets/handlers/handleBD.ts b/webAO/packets/handlers/handleBD.ts
index befda6a..47c191d 100644
--- a/webAO/packets/handlers/handleBD.ts
+++ b/webAO/packets/handlers/handleBD.ts
@@ -1,5 +1,4 @@
import { setBanned } from "../../client";
-import { safeTags } from "../../encoding";
import { handleBans } from "../../client/handleBans";
/**
@@ -8,6 +7,6 @@ import { handleBans } from "../../client/handleBans";
* @param {Array} args ban reason
*/
export const handleBD = (args: string[]) => {
- handleBans("Banned", safeTags(args[1]));
+ handleBans("Banned", args[1]);
setBanned(true);
};
diff --git a/webAO/packets/handlers/handleEI.ts b/webAO/packets/handlers/handleEI.ts
index d134466..3d15766 100644
--- a/webAO/packets/handlers/handleEI.ts
+++ b/webAO/packets/handlers/handleEI.ts
@@ -1,6 +1,6 @@
import { client } from "../../client";
import { AO_HOST } from "../../client/aoHost";
-import { prepChat, safeTags } from "../../encoding";
+import { prepChat } from "../../encoding";
/**
* Handles incoming evidence information, containing only one evidence
@@ -18,7 +18,7 @@ export const handleEI = (args: string[]) => {
client.evidences[evidenceID] = {
name: prepChat(arg[0]),
desc: prepChat(arg[1]),
- filename: safeTags(arg[3]),
+ filename: arg[3],
icon: `${AO_HOST}evidence/${encodeURI(arg[3].toLowerCase())}`,
};
diff --git a/webAO/packets/handlers/handleEM.ts b/webAO/packets/handlers/handleEM.ts
index 9f236e3..b3947dd 100644
--- a/webAO/packets/handlers/handleEM.ts
+++ b/webAO/packets/handlers/handleEM.ts
@@ -3,7 +3,6 @@ import { addTrack } from "../../client/addTrack";
import { createArea } from "../../client/createArea";
import { fix_last_area } from "../../client/fixLastArea";
import { isAudio } from "../../client/isAudio";
-import { safeTags } from "../../encoding";
/**
* Handles incoming music information, containing multiple entries
diff --git a/webAO/packets/handlers/handleFA.ts b/webAO/packets/handlers/handleFA.ts
index f6a7ed0..40baf72 100644
--- a/webAO/packets/handlers/handleFA.ts
+++ b/webAO/packets/handlers/handleFA.ts
@@ -1,6 +1,5 @@
import { client } from "../../client";
import { createArea } from "../../client/createArea";
-import { safeTags } from "../../encoding";
/**
* Handles updated area list
@@ -10,6 +9,6 @@ export const handleFA = (args: string[]) => {
client.resetAreaList();
for (let i = 1; i < args.length; i++) {
- createArea(i - 1, safeTags(args[i]));
+ createArea(i - 1, args[i]);
}
};
diff --git a/webAO/packets/handlers/handleFM.ts b/webAO/packets/handlers/handleFM.ts
index 4bf10fe..5c09bfc 100644
--- a/webAO/packets/handlers/handleFM.ts
+++ b/webAO/packets/handlers/handleFM.ts
@@ -1,6 +1,5 @@
import { client } from "../../client";
import { addTrack } from "../../client/addTrack";
-import { safeTags } from "../../encoding";
/**
* Handles updated music list
diff --git a/webAO/packets/handlers/handleKB.ts b/webAO/packets/handlers/handleKB.ts
index 3192cb1..78f5721 100644
--- a/webAO/packets/handlers/handleKB.ts
+++ b/webAO/packets/handlers/handleKB.ts
@@ -1,5 +1,4 @@
import { setBanned } from "../../client";
-import { safeTags } from "../../encoding";
import { handleBans } from "../../client/handleBans";
/**
@@ -8,6 +7,6 @@ import { handleBans } from "../../client/handleBans";
* @param {Array} args ban reason
*/
export const handleKB = (args: string[]) => {
- handleBans("Banned", safeTags(args[1]));
+ handleBans("Banned", args[1]);
setBanned(true);
};
diff --git a/webAO/packets/handlers/handleLE.ts b/webAO/packets/handlers/handleLE.ts
index 720df2c..fe8691c 100644
--- a/webAO/packets/handlers/handleLE.ts
+++ b/webAO/packets/handlers/handleLE.ts
@@ -16,7 +16,7 @@ export const handleLE = (args: string[]) => {
client.evidences[i - 1] = {
name: prepChat(arg[0]),
desc: prepChat(arg[1]),
- filename: safeTags(arg[2]),
+ filename: arg[2],
icon: `${AO_HOST}evidence/${encodeURI(arg[2].toLowerCase())}`,
};
}
diff --git a/webAO/viewport/viewport.ts b/webAO/viewport/viewport.ts
index c2613b3..b5a96a0 100644
--- a/webAO/viewport/viewport.ts
+++ b/webAO/viewport/viewport.ts
@@ -3,7 +3,6 @@
import { client, delay } from "../client";
import { UPDATE_INTERVAL } from "../client";
import setEmote from "../client/setEmote";
-import { safeTags } from "../encoding";
import { AO_HOST } from "../client/aoHost";
import { Viewport } from "./interfaces/Viewport";
import { createBlipsChannels } from "./utils/createBlipChannels";
@@ -350,7 +349,7 @@ const viewport = (): Viewport => {
// Evidence Bullshit
if (chatmsg.evidence > 0) {
// Prepare evidence
- eviBox.src = safeTags(client.evidences[chatmsg.evidence - 1].icon);
+ eviBox.src = client.evidences[chatmsg.evidence - 1].icon;
eviBox.style.width = "auto";
eviBox.style.height = "36.5%";