bgme/mastodon
1
0
Fork 0
mirror of https://github.com/yingziwu/mastodon.git synced 2026-02-04 03:25:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Remove trailing variation selector code for legacy emojis (#37320)

Browse source
This commit is contained in:
Echo 2025-12-19 14:43:27 +01:00 • committed by Claire
parent 53437c4653
commit f354bbe8aa
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/javascript/mastodon/features/emoji/normalize.test.ts
View file

@ -33,6 +33,7 @@ describe('emojiToUnicodeHex', () => {
['⚫', '26AB'],
['🖤', '1F5A4'],
['💀', '1F480'],
['❤️', '2764'], // Checks for trailing variation selector removal.
['💂‍♂️', '1F482-200D-2642-FE0F'],
] as const)(
'emojiToUnicodeHex converts %s to %s',

6
app/javascript/mastodon/features/emoji/normalize.ts
View file

@ -30,6 +30,12 @@ export function emojiToUnicodeHex(emoji: string): string {
codes.push(code);
}
}
// 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 && codes.length === 2) {
codes.pop();
}
return hexNumbersToString(codes);
}