diff options
| author | Joas Schilling <coding@schilljs.com> | 2024-10-17 12:34:18 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2024-10-17 14:27:42 +0200 |
| commit | 9d6c0afad60fbdcaaa0a58fec3775f1291f8a44c (patch) | |
| tree | b804d95f43aeb4d86fb3d19a4de3ea632d2ab38c | |
| parent | 40fd76f69e601ab5579e8ce9b81318d3924dd463 (diff) | |
| download | nextcloud-server-9d6c0afad60fbdcaaa0a58fec3775f1291f8a44c.tar.gz nextcloud-server-9d6c0afad60fbdcaaa0a58fec3775f1291f8a44c.zip | |
feat(comments): Support mentioning emails
Signed-off-by: Joas Schilling <coding@schilljs.com>
| -rw-r--r-- | lib/private/Comments/Comment.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/Comments/Comment.php b/lib/private/Comments/Comment.php index 0308d01ab9a..46912720a3c 100644 --- a/lib/private/Comments/Comment.php +++ b/lib/private/Comments/Comment.php @@ -202,7 +202,7 @@ class Comment implements IComment { * */ public function getMentions(): array { - $ok = preg_match_all("/\B(?<![^a-z0-9_\-@\.\'\s])@(\"guest\/[a-f0-9]+\"|\"(?:federated_)?(?:group|team|user){1}\/[a-z0-9_\-@\.\' \/:]+\"|\"[a-z0-9_\-@\.\' ]+\"|[a-z0-9_\-@\.\']+)/i", $this->getMessage(), $mentions); + $ok = preg_match_all("/\B(?<![^a-z0-9_\-@\.\'\s])@(\"(guest|email)\/[a-f0-9]+\"|\"(?:federated_)?(?:group|team|user){1}\/[a-z0-9_\-@\.\' \/:]+\"|\"[a-z0-9_\-@\.\' ]+\"|[a-z0-9_\-@\.\']+)/i", $this->getMessage(), $mentions); if (!$ok || !isset($mentions[0])) { return []; } @@ -217,6 +217,10 @@ class Comment implements IComment { if (str_starts_with($cleanId, 'guest/')) { $result[] = ['type' => 'guest', 'id' => $cleanId]; + } elseif (str_starts_with($cleanId, 'email/')) { + /** @var non-empty-lowercase-string $cleanId */ + $cleanId = substr($cleanId, 6); + $result[] = ['type' => 'email', 'id' => $cleanId]; } elseif (str_starts_with($cleanId, 'federated_group/')) { $result[] = ['type' => 'federated_group', 'id' => substr($cleanId, 16)]; } elseif (str_starts_with($cleanId, 'group/')) { |