From b2dc21b5226b0b4636cd0e1992671326f9537ed3 Mon Sep 17 00:00:00 2001 From: Miodec Date: Wed, 3 Mar 2021 22:05:58 +0000 Subject: [PATCH] fixed name ping regexp --- src/js/tribe.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/js/tribe.js b/src/js/tribe.js index 9634ffc9a..8877fd63e 100644 --- a/src/js/tribe.js +++ b/src/js/tribe.js @@ -1127,11 +1127,24 @@ MP.socket.on("mp_room_config_update", (data) => { }); MP.socket.on("mp_chat_message", async (data) => { + data.message = data.message.trim(); let nameregex; if (data.isLeader) { - nameregex = new RegExp("@" + MP.name + "|ready|@everyone", "i"); + nameregex = new RegExp( + ` @${MP.name.replace(/[.()]/g, "\\$&")} |^@${MP.name.replace( + /[.()]/g, + "\\$&" + )}$|ready|@everyone`, + "i" + ); } else { - nameregex = new RegExp("@" + MP.name, "i"); + nameregex = new RegExp( + ` @${MP.name.replace(/[.()]/g, "\\$&")} |^@${MP.name.replace( + /[.()]/g, + "\\$&" + )}$`, + "i" + ); } if (!data.isSystem && data.from.name != MP.name) { if (nameregex.test(data.message)) {