imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use a more correct test for emoji (#7685)

Browse source
This commit is contained in:
Robin 2022-02-01 04:45:22 -05:00 • committed by GitHub
parent 18995363d0
commit bfab09e977
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/HtmlUtils.tsx
View file

@ -90,7 +90,7 @@ const MEDIA_API_MXC_REGEX = /\/_matrix\/media\/r0\/(?:download|thumbnail)\/(.+?)
* positives, but useful for fast-path testing strings to see if they
* need emojification.
*/
export function mightContainEmoji(str: string): boolean {
function mightContainEmoji(str: string): boolean {
return SURROGATE_PAIR_PATTERN.test(str) || SYMBOL_PATTERN.test(str);
}
@ -432,7 +432,7 @@ function formatEmojis(message: string, isHtmlMessage: boolean): (JSX.Element | s
// We use lodash's grapheme splitter to avoid breaking apart compound emojis
for (const char of split(message, '')) {
if (mightContainEmoji(char)) {
if (EMOJIBASE_REGEX.test(char)) {
if (text) {
result.push(text);
text = '';