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

Keep trying to load emojis if data isn't available yet (#38892)

Browse Source
This commit is contained in:
Echo 2026-05-04 11:50:24 +02:00 committed by GitHub
parent 00c2089e81
commit 708fe31908
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/features/emoji/database.ts
View File

@ -269,6 +269,10 @@ export async function searchCustomEmojisByShortcodes(shortcodes: string[]) {
export async function loadAllCustomEmoji() { export async function loadAllCustomEmoji() {
const db = await loadDB(); const db = await loadDB();
const cacheValue = await db.get('etags', 'custom');
if (!cacheValue) {
return null;
}
return db.getAll('custom'); return db.getAll('custom');
} }

7
app/javascript/mastodon/features/emoji/picker.ts
View File

@ -28,6 +28,13 @@ export async function fetchCustomEmojiData() {
const { loadAllCustomEmoji } = await import('./database'); const { loadAllCustomEmoji } = await import('./database');
const emojisRaw = await loadAllCustomEmoji(); const emojisRaw = await loadAllCustomEmoji();
// If it returns null then custom emojis aren't even loaded yet.
if (emojisRaw === null) {
return [];
}
// If it's empty, then they are loaded but there aren't any.
if (emojisRaw.length === 0) { if (emojisRaw.length === 0) {
customEmojis = []; customEmojis = [];
return customEmojis; return customEmojis;

2
app/javascript/mastodon/hooks/useCustomEmojis.ts
View File

@ -20,7 +20,7 @@ export function useCustomEmojis() {
async function loadEmojisIntoCache() { async function loadEmojisIntoCache() {
const { loadAllCustomEmoji } = await import('../features/emoji/database'); const { loadAllCustomEmoji } = await import('../features/emoji/database');
const emojisRaw = await loadAllCustomEmoji(); const emojisRaw = await loadAllCustomEmoji();
if (emojisRaw.length === 0) { if (emojisRaw === null) {
return; return;
} }