techhub/mastodon
2
0
Fork 0
Code Activity

Emoji: Load emoji with hash in URL (#36808)

Browse Source
This commit is contained in:
Echo
2025-11-11 11:03:06 +01:00
committed by Claire
parent 9eea4479e1
commit 9ae0464e8f
4 changed files with 24 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
import { flattenEmojiData } from 'emojibase';
import type { CompactEmoji, FlatCompactEmoji } from 'emojibase';
import type { CompactEmoji, FlatCompactEmoji, Locale } from 'emojibase';
import {
putEmojiData,
@@ -43,9 +43,8 @@ async function fetchAndCheckEtag<ResultType extends object[]>(
if (locale === 'custom') {
url.pathname = '/api/v1/custom_emojis';
} else {
// This doesn't use isDevelopment() as that module loads initial state
// which breaks workers, as they cannot access the DOM.
url.pathname = `/packs${import.meta.env.DEV ? '-dev' : ''}/emoji/${locale}.json`;
const modulePath = await localeToPath(locale);
url.pathname = modulePath;
}
const oldEtag = await loadLatestEtag(locale);
@@ -80,3 +79,18 @@ async function fetchAndCheckEtag<ResultType extends object[]>(
return data;
}
const modules = import.meta.glob(
'../../../../../node_modules/emojibase-data/**/compact.json',
{
as: 'url',
},
);
function localeToPath(locale: Locale) {
const key = `../../../../../node_modules/emojibase-data/${locale}/compact.json`;
if (!modules[key] || typeof modules[key] !== 'function') {
throw new Error(`Unsupported locale: ${locale}`);
}
return modules[key]();
}