Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
This commit is contained in:
		
						commit
						198123ff5f
					
				
					 2 changed files with 3 additions and 3 deletions
				
			
		|  | @ -232,7 +232,8 @@ export class ClientServerService { | |||
| 			const host = path.split('@')[1]?.replace('.webp', ''); | ||||
| 
 | ||||
| 			const emoji = await this.emojisRepository.findOneBy({ | ||||
| 				host: host == null ? IsNull() : host, | ||||
| 				// `@.` is the spec of ReactionService.decodeReaction
 | ||||
| 				host: (host == null || host === '.') ? IsNull() : host, | ||||
| 				name: name, | ||||
| 			}); | ||||
| 
 | ||||
|  |  | |||
|  | @ -12,8 +12,7 @@ | |||
| 					tabindex="0" | ||||
| 					@click="chosen(emoji, $event)" | ||||
| 				> | ||||
| 					<!--<MkEmoji v-if="emoji.char != null" :emoji="emoji.char"/>--> | ||||
| 					<img class="emoji" :src="disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url"/> | ||||
| 					<MkEmoji class="emoji" :emoji="`:${emoji.name}:`" /> | ||||
| 				</button> | ||||
| 			</div> | ||||
| 			<div v-if="searchResultUnicode.length > 0" class="body"> | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue