tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug with how Emojibase wasn't stripping characters (#37442)

Browse Source
This commit is contained in:
Echo 2026-01-09 19:38:22 +01:00 committed by GitHub
parent b55982cc1a
commit a4b8b9fe98
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/javascript/mastodon/features/emoji/utils.ts
View File

@ -1,8 +1,9 @@
import debug from 'debug';
import { fromUnicodeToHexcode } from 'emojibase';
import { emojiRegexPolyfill } from '@/mastodon/polyfills';
import { VARIATION_SELECTOR_CODE } from './constants';
export function emojiLogger(segment: string) {
return debug(`emojis:${segment}`);
}
@ -46,7 +47,24 @@ export function anyEmojiRegex() {
}
export function emojiToUnicodeHex(emoji: string): string {
return fromUnicodeToHexcode(emoji, false);
const codes: string[] = [];
for (const char of emoji) {
const code = char.codePointAt(0);
if (code !== undefined) {
codes.push(code.toString(16).toUpperCase().padStart(4, '0'));
}
}
// Handles how Emojibase removes the variation selector for single code emojis.
// See: https://emojibase.dev/docs/spec/#merged-variation-selectors
if (
codes.at(1) === VARIATION_SELECTOR_CODE.toString(16).toUpperCase() &&
codes.length === 2
) {
codes.pop();
}
return codes.join('-');
}
function supportsRegExpSets() {