Fix infinite loop when system emoji font is enabled (#1931)

Fixes #1930
1 year ago · ceafd1f68f
parent e589afa0ef
commit ceafd1f68f
1 changed files with 2 additions and 2 deletions
--- a/app/javascript/flavours/glitch/features/emoji/emoji.js
+++ b/app/javascript/flavours/glitch/features/emoji/emoji.js
@ -30,11 +30,11 @@ const emojifyTextNode = (node, customEmojis) => {
    let match, i = 0;

    if (customEmojis === null) {
-      while (i < str.length && !(match = trie.search(str.slice(i)))) {
+      while (i < str.length && (useSystemEmojiFont || !(match = trie.search(str.slice(i))))) {
        i += str.codePointAt(i) < 65536 ? 1 : 2;
      }
    } else {
-      while (i < str.length && str[i] !== ':' && !(match = trie.search(str.slice(i)))) {
+      while (i < str.length && str[i] !== ':' && (useSystemEmojiFont || !(match = trie.search(str.slice(i))))) {
        i += str.codePointAt(i) < 65536 ? 1 : 2;
      }
    }