fef/nyastodon
1
1
Fork 0
forked from mirrors/catstodon
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Jeremy Kescher 2022-11-15 00:33:48 +01:00
commit 4b56353f13
No known key found for this signature in database
GPG key ID: 48DFE4BB15BA5940
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/flavours/glitch/features/emoji/emoji.js
View file

@ -30,11 +30,11 @@ const emojifyTextNode = (node, customEmojis) => {
let match, i = 0; let match, i = 0;
if (customEmojis === null) { 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; i += str.codePointAt(i) < 65536 ? 1 : 2;
} }
} else { } 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; i += str.codePointAt(i) < 65536 ? 1 : 2;
} }
} }

2
lib/mastodon/version.rb
View file

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