fix(message-parser): Expand emoji detection (#753)

RocketChat · Jun 24, 2022 · 005e135 · 005e135
1 parent dab7d28
commit 005e135
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/packages/message-parser/src/grammar.pegjs b/packages/message-parser/src/grammar.pegjs
@@ -625,7 +625,13 @@ emoticonPattern
 // Note: it's just a subset of unicode emoticons
 unicodeEmoji
   = unicodeEmojiEmoticon
-  / unicodeEmojiSupplementalSymbolsAndPictographs
+  / $(
+    unicodeEmojiSupplementalSymbolsAndPictographs
+      (
+        unicodeEmojiMiscellaneousSymbolsAndPictographs
+          ([\u200D] unicodeEmojiMiscellaneousSymbolsAndPictographs)*
+      )?
+  )
   / $(
     (unicodeEmojiMiscellaneousSymbolsAndPictographs [\u200D])*
       unicodeEmojiMiscellaneousSymbolsAndPictographs

diff --git a/packages/message-parser/tests/emoji.test.ts b/packages/message-parser/tests/emoji.test.ts
@@ -60,6 +60,7 @@ test.each([
   ['⌚️', [bigEmoji([emojiUnicode('⌚️')])]],
   ['❤️', [bigEmoji([emojiUnicode('❤️')])]],
   ['🏳️', [bigEmoji([emojiUnicode('🏳️')])]],
+  ['🧑🏾‍💻', [bigEmoji([emojiUnicode('🧑🏾‍💻')])]],
 ])('parses %p', (input, output) => {
   expect(parser(input)).toMatchObject(output);
 });