Merge branch 'release' into develop

2018-12-03 22:54:08 +00:00
parent 757160d6b7 757959529b
commit bb01475e02
48 changed files with 238 additions and 155 deletions
@@ -298,7 +298,9 @@ export default {
      this.$emit('show-member-modal', memberId);
    },
    atHighlight (text) {
-      const userRegex = new RegExp(`@(${this.user.auth.local.username}|${this.user.profile.name})(?:\\b)`, 'gi');
+      const escapedDisplayName = escapeRegExp(this.user.profile.name);
+      const escapedUsername = escapeRegExp(this.user.auth.local.username);
+      const userRegex = new RegExp(`@(${escapedDisplayName}|${escapedUsername})(?:\\b)`, 'gi');
      const atRegex = new RegExp(/(?!\b)@[\w-]+/g);

      if (userRegex.test(text)) {