mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-08 19:35:11 +01:00
Code Issues Projects Releases Wiki Activity

fix matching of multi-skin-tones emojis

Browse Source
This commit is contained in:
Damien Erambert 2024-12-25 15:58:57 +01:00
parent 9ce7340fb3
commit 7120dceb97
No known key found for this signature in database
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/javascript/mastodon/features/emoji/emoji_compressed.js
View File

@ -30,10 +30,6 @@ function unifiedToNative(unified) {
return String.fromCodePoint(...codePoints);
}
const SKINS = [
'1F3FB', '1F3FC', '1F3FD', '1F3FE', '1F3FF',
];
let data = {
compressed: true,
categories: emojiMart5Data.categories.map(cat => {
@ -53,16 +49,24 @@ let data = {
}
if (emoji.skins.length > 1) {
SKINS.forEach(skinToneCode => {
const matchingVariation = emojiFromRawData.skin_variations[skinToneCode];
if (matchingVariation) {
const [, ...nonDefaultSkins] = emoji.skins;
nonDefaultSkins.forEach(skin => {
const [matchingRawCodePoints,matchingRawEmoji] = Object.entries(emojiFromRawData.skin_variations).find((pair) => {
const [, value] = pair;
return value.unified.toLowerCase() === skin.unified;
});
if (matchingRawEmoji && matchingRawCodePoints) {
// At the time of writing, the json from `@emoji-mart/data` doesn't have data
// for emoji like `woman-heart-woman` with different skin tones.
const skinToneCode = matchingRawCodePoints.split('-')[0];
skin_variations[skinToneCode] = {
unified: matchingVariation.unified.toUpperCase(),
unified: matchingRawEmoji.unified.toUpperCase(),
non_qualified: null,
sheet_x: matchingVariation.sheet_x,
sheet_y: matchingVariation.sheet_y,
sheet_x: matchingRawEmoji.sheet_x,
sheet_y: matchingRawEmoji.sheet_y,
has_img_twitter: true,
native: unifiedToNative(matchingVariation.unified.toUpperCase())
native: unifiedToNative(matchingRawEmoji.unified.toUpperCase())
};
}
});