feat(message-parser): Add Matrix Protocol username pattern to User Me…

…ntion (#847)
RocketChat · Sep 15, 2022 · 702c1ee · 702c1ee
1 parent 24ea801
commit 702c1ee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/packages/message-parser/src/grammar.pegjs b/packages/message-parser/src/grammar.pegjs
@@ -186,10 +186,15 @@ SectionText
 
 utf8_names_validation = $[0-9a-zA-Z-_.]+
 
+matrix_server_validation = ":" utf8_names_validation
+
 UserMention
   = t:Text "@"+ user:utf8_names_validation {
       return reducePlainTexts([t, plain('@' + user)])[0];
     }
+  / "@"+ user:$(utf8_names_validation matrix_server_validation) {
+      return mentionUser(user);
+    }
   / "@"+ user:utf8_names_validation { return mentionUser(user); }
 
 ChannelMention

diff --git a/packages/message-parser/tests/mention.test.ts b/packages/message-parser/tests/mention.test.ts
@@ -8,6 +8,11 @@ test.each([
     [paragraph([mentionUser('guilherme.gazzo.'), plain(' ')])],
   ],
   ['#GENERAL', [paragraph([mentionChannel('GENERAL')])]],
+  ['@user:server.com', [paragraph([mentionUser('user:server.com')])]],
+  [
+    '@marcos.defendi:matrix.org',
+    [paragraph([mentionUser('marcos.defendi:matrix.org')])],
+  ],
 ])('parses %p', (input, output) => {
   expect(parse(input)).toMatchObject(output);
 });