From 22b683b1d94d07a48059d99b0fd813a6c3851256 Mon Sep 17 00:00:00 2001
From: MathWhiz <MathWhiz@users.noreply.github.com>
Date: Wed, 15 Nov 2017 10:39:29 -0600
Subject: [PATCH] Fix regex for chat highlighting (#9411)

* Fix regex for chat highlighting

* Fix lint errors
---
 website/client/components/chat/chatMessages.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/website/client/components/chat/chatMessages.vue b/website/client/components/chat/chatMessages.vue
index 2c437eca9a..fdeac8789c 100644
--- a/website/client/components/chat/chatMessages.vue
+++ b/website/client/components/chat/chatMessages.vue
@@ -246,6 +246,7 @@ import moment from 'moment';
 import cloneDeep from 'lodash/cloneDeep';
 import { mapState } from 'client/libs/store';
 import debounce from 'lodash/debounce';
+import escapeRegExp from 'lodash/escapeRegExp';
 import markdownDirective from 'client/directives/markdown';
 import Avatar from '../avatar';
 import styleHelper from 'client/mixins/styleHelper';
@@ -352,7 +353,8 @@ export default {
       let messagetext = message.text.toLowerCase();
       let username = user.profile.name;
       let mentioned = messagetext.indexOf(username.toLowerCase());
-      let pattern = `${username}([^\w]|$){1}`;
+      let escapedUsername = escapeRegExp(username);
+      let pattern = `${escapedUsername}([^\w]|$){1}`;
 
       if (mentioned === -1) return message.highlight;