Match mentions when the username is wrapped in quotes

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Oct 15, 2018 · 650c53f · 650c53f
1 parent 8177fdb
commit 650c53f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/private/Comments/Comment.php b/lib/private/Comments/Comment.php
@@ -225,14 +225,14 @@ public function setMessage($message) {
 	 *
 	 */
 	public function getMentions() {
-		$ok = preg_match_all("/\B(?<![^a-z0-9_\-@\.\'\s])@[a-z0-9_\-@\.\']+/i", $this->getMessage(), $mentions);
+		$ok = preg_match_all("/\B(?<![^a-z0-9_\-@\.\'\s])@(\"[a-z0-9_\-@\.\' ]+\"|[a-z0-9_\-@\.\']+)/i", $this->getMessage(), $mentions);
 		if(!$ok || !isset($mentions[0]) || !is_array($mentions[0])) {
 			return [];
 		}
 		$uids = array_unique($mentions[0]);
 		$result = [];
 		foreach ($uids as $uid) {
-			$result[] = ['type' => 'user', 'id' => substr($uid, 1)];
+			$result[] = ['type' => 'user', 'id' => trim(substr($uid, 1), '"')];
 		}
 		return $result;
 	}