From 53acf388a4834b502970f18492f1dae55ff297e3 Mon Sep 17 00:00:00 2001 From: HF Date: Fri, 15 May 2020 08:23:10 +0200 Subject: [PATCH] fix ping regexp --- src/components/Chat.jsx | 2 +- src/core/chatMessageFilter.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Chat.jsx b/src/components/Chat.jsx index 6fdbe79..4a17914 100644 --- a/src/components/Chat.jsx +++ b/src/components/Chat.jsx @@ -53,7 +53,7 @@ const Chat = ({ useEffect(() => { const regExp = (ownName) - ? new RegExp(`(^|\\s+)(@${escapeRegExp(ownName)})(\\s+|$)`, 'g') + ? new RegExp(`(^|\\s)(@${escapeRegExp(ownName)})(\\s|$)`, 'g') : null; setNameRegExp(regExp); }, [ownName]); diff --git a/src/core/chatMessageFilter.js b/src/core/chatMessageFilter.js index 4275bc2..26707c3 100644 --- a/src/core/chatMessageFilter.js +++ b/src/core/chatMessageFilter.js @@ -17,7 +17,7 @@ */ const linkRegExp = /(#[a-z]*,-?[0-9]*,-?[0-9]*(,-?[0-9]+)?)/gi; const linkRegExpFilter = (val, ind) => ((ind % 3) !== 2); -const mentionRegExp = /(^|\s+)(@\S+)/g; +const mentionRegExp = /(^|\s)(@\S+)/g; const spaceFilter = (val, ind) => (val !== ' ' && (ind !== 0 | val !== '')); function splitChatMessageRegexp(