fix: bug in emoji detection for jumbomoji #3508

deltachat · Nov 16, 2023 · b341ba8 · b341ba8
1 parent 2ac3deb
commit b341ba8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 ### Fixed
 - fix: files search not case-insensitive
+- fix: bug in emoji detection for jumbomoji #3508
 
 <a id="1_41_2"></a>
 

diff --git a/src/renderer/components/conversations/emoji.ts b/src/renderer/components/conversations/emoji.ts
@@ -58,14 +58,16 @@ if (typeof Intl.Segmenter === 'function') {
 }
 
 const variantSelectors = '[\ufe00-\ufe0f]'
+const ZeroWidthJoiner = '\u200d'
 // thanks to https://medium.com/reactnative/emojis-in-javascript-f693d0eb79fb for figuring this out.
 const emojiRegEx = `(?:(?:[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff]|[\u0023-\u0039]\ufe0f?\u20e3|\u3299|\u3297|\u303d|\u3030|\u24c2|\ud83c[\udd70-\udd71]|\ud83c[\udd7e-\udd7f]|\ud83c\udd8e|\ud83c[\udd91-\udd9a]|\ud83c[\udde6-\uddff]|[\ud83c[\ude01-\ude02]|\ud83c\ude1a|\ud83c\ude2f|[\ud83c[\ude32-\ude3a]|[\ud83c[\ude50-\ude51]|\u203c|\u2049|[\u25aa-\u25ab]|\u25b6|\u25c0|[\u25fb-\u25fe]|\u00a9|\u00ae|\u2122|\u2139|\ud83c\udc04|[\u2600-\u26FF]|\u2b05|\u2b06|\u2b07|\u2b1b|\u2b1c|\u2b50|\u2b55|\u231a|\u231b|\u2328|\u23cf|[\u23e9-\u23f3]|[\u23f8-\u23fa]|\ud83c\udccf|\u2934|\u2935|[\u2190-\u21ff])${variantSelectors}?)`
+const compositeEmojiRegEx = `(?:${emojiRegEx}(:?${ZeroWidthJoiner}${emojiRegEx})?)`
 const MAX_BIG_EMOJI_COUNT = 6
 const MAX_BYTE_SIZE_OF_EMOJI = 10 /* 10 is maybe already to generous? */
 const MAX_STRING_LENGTH_FOR_BIG_EMOJI =
   MAX_BIG_EMOJI_COUNT * MAX_BYTE_SIZE_OF_EMOJI
 const emojiRegExTestLine = new RegExp(
-  `^${emojiRegEx}{1,${MAX_STRING_LENGTH_FOR_BIG_EMOJI}}$`
+  `^${compositeEmojiRegEx}{1,${MAX_STRING_LENGTH_FOR_BIG_EMOJI}}$`
 )
 
 export function getSizeClass(str: string) {