Fix mentions before blockquote (#15774)

6 years ago · e2f1a3e85d
parent a8ad42b34f
commit e2f1a3e85d
1 changed files with 2 additions and 2 deletions
--- a/app/mentions/lib/MentionsParser.js
+++ b/app/mentions/lib/MentionsParser.js
@ -32,11 +32,11 @@ export class MentionsParser {
 	}

 	get userMentionRegex() {
-		return new RegExp(`(^|\\s|<p>|<br> ?)@(${ this.pattern }(@(${ this.pattern }))?)`, 'gm');
+		return new RegExp(`(^|\\s|> ?)@(${ this.pattern }(@(${ this.pattern }))?)`, 'gm');
 	}

 	get channelMentionRegex() {
-		return new RegExp(`(^|\\s|<p>)#(${ this.pattern }(@(${ this.pattern }))?)`, 'gm');
+		return new RegExp(`(^|\\s|>)#(${ this.pattern }(@(${ this.pattern }))?)`, 'gm');
 	}

 	replaceUsers = (msg, { mentions, temp }, me) => msg