laoxong/misskey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

emoji fallback

Browse Source
This commit is contained in:
tamaina 2022-01-21 00:37:06 +09:00
parent 1bc145678b
commit e1ab3206a6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/src/misc/populate-emojis.ts
View File

@ -62,7 +62,7 @@ export async function populateEmoji(emojiName: string, noteUserHost: string | nu
if (emoji == null) return null; if (emoji == null) return null;
const isLocal = emoji.host == null; const isLocal = emoji.host == null;
const url = isLocal ? emoji.publicUrl : `${config.url}/proxy/image.png?${query({ url: emoji.publicUrl })}`; const url = isLocal ? emoji.publicUrl || emoji.originalUrl : `${config.url}/proxy/image.png?${query({ url: emoji.publicUrl || emoji.originalUrl })}`;
return { return {
name: emojiName, name: emojiName,

2
packages/backend/src/remote/activitypub/renderer/emoji.ts
View File

@ -9,6 +9,6 @@ export default (emoji: Emoji) => ({
icon: { icon: {
type: 'Image', type: 'Image',
mediaType: emoji.type || 'image/png', mediaType: emoji.type || 'image/png',
url: emoji.publicUrl, url: emoji.publicUrl || emoji.originalUrl,
}, },
}); });

2
packages/backend/src/services/note/reaction/create.ts
View File

@ -88,7 +88,7 @@ export default async (user: { id: User['id']; host: User['host']; }, note: Note,
reaction: decodedReaction.reaction, reaction: decodedReaction.reaction,
emoji: emoji != null ? { emoji: emoji != null ? {
name: emoji.host ? `${emoji.name}@${emoji.host}` : `${emoji.name}@.`, name: emoji.host ? `${emoji.name}@${emoji.host}` : `${emoji.name}@.`,
url: emoji.publicUrl ?? emoji.originalUrl, url: emoji.publicUrl || emoji.originalUrl,
} : null, } : null,
userId: user.id, userId: user.id,
}); });