diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2022-01-21 18:47:02 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2022-01-21 18:47:02 +0900 |
| commit | eec7e6500ed7f56a3b545adbb45420b3e1c7b0a9 (patch) | |
| tree | a2d7fa54272590ce0a54abe51f4106f1134e2716 /packages/backend/src/misc | |
| parent | Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff) | |
| download | misskey-eec7e6500ed7f56a3b545adbb45420b3e1c7b0a9.tar.gz misskey-eec7e6500ed7f56a3b545adbb45420b3e1c7b0a9.tar.bz2 misskey-eec7e6500ed7f56a3b545adbb45420b3e1c7b0a9.zip | |
enhance: convert svg to png of custom emojis
Diffstat (limited to 'packages/backend/src/misc')
| -rw-r--r-- | packages/backend/src/misc/populate-emojis.ts | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/backend/src/misc/populate-emojis.ts b/packages/backend/src/misc/populate-emojis.ts index b021ec46eb..26c05e5fa6 100644 --- a/packages/backend/src/misc/populate-emojis.ts +++ b/packages/backend/src/misc/populate-emojis.ts @@ -62,7 +62,8 @@ export async function populateEmoji(emojiName: string, noteUserHost: string | nu if (emoji == null) return null; const isLocal = emoji.host == null; - const url = isLocal ? emoji.url : `${config.url}/proxy/image.png?${query({ url: emoji.url })}`; + const emojiUrl = emoji.publicUrl || emoji.originalUrl; // || emoji.originalUrl してるのは後方互換性のため + const url = isLocal ? emojiUrl : `${config.url}/proxy/image.png?${query({ url: emojiUrl })}`; return { name: emojiName, @@ -116,7 +117,7 @@ export async function prefetchEmojis(emojis: { name: string; host: string | null } const _emojis = emojisQuery.length > 0 ? await Emojis.find({ where: emojisQuery, - select: ['name', 'host', 'url'], + select: ['name', 'host', 'originalUrl', 'publicUrl'], }) : []; for (const emoji of _emojis) { cache.set(`${emoji.name} ${emoji.host}`, emoji); |