Merge pull request #2 from BalaM314/patch-1

Sanitize incoming messages

scripts/main.js

@@ -36,6 +36,20 @@ const sendMessage = (msg) => {
   }
 };
 
+const cleanMessage = message => {
+  const lastCharCode = message.codePointAt(message.length - 1);
+  const secondLastCharCode = message.codePointAt(message.length - 2);
+
+  if (lastCharCode >= 0xf80 && lastCharCode <= 0x107f && secondLastCharCode >= 0xf80 && secondLastCharCode <= 0x107f) {
+    //If the last two characters are both in the range U+0F80 to U+0x107F, then they were generated by foo's client and should not be displayed
+    message = message.slice(0, -2);//Remove them
+  }
+
+	//If the message contains any of the characters \, <, @, or >, escape the character and put a zero width space after it to avoid pings
+  //also remove newlines
+  return message.replace(/([\\<@>])/g, "\\$1\u200B").replace(/[\r\n]/g, "");
+}
+
 Colors.put("accent", Color.white);
 Colors.put("unlaunched", Color.white);
 Colors.put("stat", Color.white);
@@ -64,13 +78,10 @@ Events.on(PlayerChatEvent, (e) => {
   if (text[0] === '/') return;
 
   const formattedName = Strings.stripColors(player.name);
-  const lastChar1 = text[text.length - 1];
-
-  if (lastChar1 >= 0xf80 && lastChar1 <= 0x107f) {
-    text = text.slice(0, -2);
-  }
+
+  const cleanedMessage = cleanMessage(text);
 
-  const msg = '**' + formattedName + '**' + ': ' + text;
+  const msg = '**' + formattedName + '**' + ': ' + cleanedMessage;
 
   sendMessage(msg);
 });