fix
This commit is contained in:
		
							parent
							
								
									1bc145678b
								
							
						
					
					
						commit
						c05efb8cd8
					
				
					 3 changed files with 4 additions and 3 deletions
				
			
		|  | @ -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.publicUrl : `${config.url}/proxy/image.png?${query({ url: emoji.publicUrl })}`; | ||||
| 	const emojiUrl = emoji.publicUrl || emoji.originalUrl; // || emoji.originalUrl してるのは後方互換性のため
 | ||||
| 	const url = isLocal ? emojiUrl : `${config.url}/proxy/image.png?${query({ url: emojiUrl })}`; | ||||
| 
 | ||||
| 	return { | ||||
| 		name: emojiName, | ||||
|  |  | |||
|  | @ -9,6 +9,6 @@ export default (emoji: Emoji) => ({ | |||
| 	icon: { | ||||
| 		type: 'Image', | ||||
| 		mediaType: emoji.type || 'image/png', | ||||
| 		url: emoji.publicUrl, | ||||
| 		url: emoji.publicUrl || emoji.originalUrl, // || emoji.originalUrl してるのは後方互換性のため
 | ||||
| 	}, | ||||
| }); | ||||
|  |  | |||
|  | @ -88,7 +88,7 @@ export default async (user: { id: User['id']; host: User['host']; }, note: Note, | |||
| 		reaction: decodedReaction.reaction, | ||||
| 		emoji: emoji != null ? { | ||||
| 			name: emoji.host ? `${emoji.name}@${emoji.host}` : `${emoji.name}@.`, | ||||
| 			url: emoji.publicUrl ?? emoji.originalUrl, | ||||
| 			url: emoji.publicUrl || emoji.originalUrl, // || emoji.originalUrl してるのは後方互換性のため
 | ||||
| 		} : null, | ||||
| 		userId: user.id, | ||||
| 	}); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue