krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix regex for chat highlighting (#9411)

Browse Source 
* Fix regex for chat highlighting

* Fix lint errors
This commit is contained in:
MathWhiz
2017-11-15 10:39:29 -06:00
committed by Matteo Pagliazzi
parent 229fd06ee3
commit 22b683b1d9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/client/components/chat/chatMessages.vue
View File

@@ -246,6 +246,7 @@ import moment from 'moment';
import cloneDeep from 'lodash/cloneDeep'; import cloneDeep from 'lodash/cloneDeep';
import { mapState } from 'client/libs/store'; import { mapState } from 'client/libs/store';
import debounce from 'lodash/debounce'; import debounce from 'lodash/debounce';
import escapeRegExp from 'lodash/escapeRegExp';
import markdownDirective from 'client/directives/markdown'; import markdownDirective from 'client/directives/markdown';
import Avatar from '../avatar'; import Avatar from '../avatar';
import styleHelper from 'client/mixins/styleHelper'; import styleHelper from 'client/mixins/styleHelper';
@@ -352,7 +353,8 @@ export default {
let messagetext = message.text.toLowerCase(); let messagetext = message.text.toLowerCase();
let username = user.profile.name; let username = user.profile.name;
let mentioned = messagetext.indexOf(username.toLowerCase()); 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; if (mentioned === -1) return message.highlight;