From e2f1a3e85d33dde69cdf2ba466a5307afe1593f6 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Tue, 12 Nov 2019 17:06:04 -0300
Subject: [PATCH] Fix mentions before blockquote (#15774)

---
 app/mentions/lib/MentionsParser.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/mentions/lib/MentionsParser.js b/app/mentions/lib/MentionsParser.js
index f82ec3f0aef..6fd1a6c6dc8 100644
--- 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