gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-10-05 00:22:42 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

remove cache
Some checks failed
Chromatic / Run Chromatic (push) Has been cancelled
Details

Browse Source
This commit is contained in:
ChaosExAnima 2025-09-23 11:52:05 +02:00
parent 1d9a5e4abd
commit df52e59a5c
No known key found for this signature in database
GPG Key ID: 8F2B333100FB6117
1 changed files with 4 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/javascript/mastodon/features/emoji/render.ts
View File

@ -41,22 +41,8 @@ export function emojifyElement<Element extends HTMLElement>(
appState: EmojiAppState,
extraEmojis: ExtraCustomEmojiMap = {},
): Element | null {
const finish = timingMeasurementHelper('emojifyElement');
// Check the cache and return it if we get a hit.
const cacheKey = createTextCacheKey(element, appState, extraEmojis);
const cached = textCache.get(cacheKey);
if (cached !== undefined) {
log('Cache hit on %s', element.outerHTML);
if (cached === null) {
// return null;
}
// element.innerHTML = cached;
// return element;
}
// Exit if there are no emoji in the string.
if (!stringHasAnyEmoji(element.innerHTML)) {
textCache.set(cacheKey, null);
return null;
}
@ -96,8 +82,6 @@ export function emojifyElement<Element extends HTMLElement>(
}
}
}
textCache.set(cacheKey, element.innerHTML);
finish();
return element;
}
@ -106,46 +90,20 @@ export function emojifyText(
appState: EmojiAppState,
extraEmojis: ExtraCustomEmojiMap = {},
): string | null {
const cacheKey = createTextCacheKey(text, appState, extraEmojis);
const cached = textCache.get(cacheKey);
if (cached !== undefined) {
log('Cache hit on %s', text);
return cached ?? text;
}
if (!stringHasAnyEmoji(text)) {
textCache.set(cacheKey, null);
return text;
}
const tokens = tokenizeText(text, appState.mode);
const eleArray = tokensToElementArray(tokens, appState, extraEmojis);
if (!eleArray) {
textCache.set(cacheKey, null);
return text;
}
const rendered = renderedToHTML(eleArray, document.createElement('div'));
textCache.set(cacheKey, rendered.innerHTML);
return rendered.innerHTML;
}
// Private functions
// This is the text cache. It contains full HTML strings or null to indicate there is no emoji here.
const textCache = createLimitedCache<string | null>({
log: log.extend('text'),
});
function createTextCacheKey(
input: HTMLElement | string,
appState: EmojiAppState,
extraEmojis: ExtraCustomEmojiMap,
) {
return JSON.stringify([
input instanceof HTMLElement ? input.outerHTML : input,
appState,
extraEmojis,
]);
}
// These are the unicode/custom emoji data caches.
const unicodeEmojiCache = createLimitedCache<
Required<EmojiStateUnicode> | EmojiStateMissing
@ -230,7 +188,10 @@ export function tokenizeText(text: string, mode: EmojiMode): TokenizedText {
return tokens;
}
function shouldRenderUnicodeImage(code: string, mode: EmojiMode): boolean {
export function shouldRenderUnicodeImage(
code: string,
mode: EmojiMode,
): boolean {
// If the mode is native or native with flags for non-flag emoji
// we can just append the text node directly.
if (mode === EMOJI_MODE_NATIVE) {
@ -424,7 +385,6 @@ function timingMeasurementHelper(name: string) {
// Testing helpers
export const testCacheClear = () => {
textCache.clear();
unicodeEmojiCache.clear();
customEmojiCache.clear();
};