From 8fd669ff7ddd793442597adff6386661e944d089 Mon Sep 17 00:00:00 2001
From: Mar0xy <marie@kaifa.ch>
Date: Sun, 29 Oct 2023 03:30:35 +0100
Subject: [PATCH] fix: statuses using wrong emojis

---
 packages/backend/src/server/api/mastodon/converters.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/converters.ts b/packages/backend/src/server/api/mastodon/converters.ts
index e2c9a2d34c..22bc3cf6fe 100644
--- a/packages/backend/src/server/api/mastodon/converters.ts
+++ b/packages/backend/src/server/api/mastodon/converters.ts
@@ -123,11 +123,7 @@ export class MastoConverters {
 		const note = await this.getterService.getNote(status.id);
 		const noteUser = await this.getUser(status.account.id);
 
-		const reactionEmojiNames = Object.keys(note.reactions)
-			.filter(x => x.startsWith(':') && x.includes('@') && !x.includes('@.'))
-			.map(x => this.reactionService.decodeReaction(x).reaction.replaceAll(':', ''));
-
-		const emojis = await this.customEmojiService.populateEmojis(reactionEmojiNames, noteUser.host ? noteUser.host : this.config.host);
+		const emojis = await this.customEmojiService.populateEmojis(note.emojis, noteUser.host ? noteUser.host : this.config.host);
 		const emoji: Entity.Emoji[] = [];
 		Object.entries(emojis).forEach(entry => {
 			const [key, value] = entry;