Merge remote-tracking branch 'upstream/main' into develop

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;
       }
     }

lib/mastodon/version.rb

@@ -25,7 +25,7 @@ module Mastodon
     end
 
     def suffix_version
-      '+1.0.2'
+      '+1.0.3'
     end
 
     def to_a