Merge pull request #6237 from nextcloud-libraries/backport/6233/next

[next] fix(NcRichContenteditable): support email mentions
nextcloud-libraries · Nov 19, 2024 · ed5f78d · ed5f78d
2 parents 512f628 + 03e2de0
commit ed5f78d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/mixins/richEditor/index.js b/src/mixins/richEditor/index.js
@@ -15,7 +15,7 @@ import { createApp } from 'vue'
 const MENTION_START = /(?=[a-z0-9_\-@.'])\B/.source
 // Capturing groups like: @user-id, @"guest/abc16def", @"federated_user/user-id", @"user-id with space"
 const MENTION_SIMPLE = /(@[a-z0-9_\-@.']+)/.source
-const MENTION_GUEST = /@&quot;guest\/[a-f0-9]+&quot;/.source
+const MENTION_GUEST = /@&quot;(?:guest|email){1}\/[a-f0-9]+&quot;/.source
 const MENTION_PREFIXED = /@&quot;(?:federated_)?(?:group|team|user){1}\/[a-z0-9_\-@.' /:]+&quot;/.source
 const MENTION_WITH_SPACE = /@&quot;[a-z0-9_\-@.' ]+&quot;/.source
 const MENTION_COMPLEX = `(${MENTION_GUEST}|${MENTION_PREFIXED}|${MENTION_WITH_SPACE})`

diff --git a/tests/unit/mixins/richEditor.spec.js b/tests/unit/mixins/richEditor.spec.js
@@ -77,6 +77,7 @@ describe('richEditor.js', () => {
 				'hello foo@bar - hello @@foobar',
 				'@foobar no space - \n\n@foobar  @foobar',
 				'hello @"guest/47e0a7cf"',
+				'hello @"email/47e0a7cf"',
 				'hello @"group/group-id" @"federated_user/user-id"',
 				'hello @"federated_user/[email protected]:8080"',
 			]
@@ -86,6 +87,7 @@ describe('richEditor.js', () => {
 				'hello foo@bar - hello @@foobar',
 				'@foobar no space - <br><br>@foobar  @foobar',
 				'hello @"guest/47e0a7cf"',
+				'hello @"email/47e0a7cf"',
 				'hello @"group/group-id" @"federated_user/user-id"',
 				'hello @"federated_user/[email protected]:8080"',
 			]