From 06faf6c6a60eb774e7875f7e152b0ec7a2b4dd2f Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Thu, 3 Oct 2024 23:04:50 +0900
Subject: [PATCH] =?UTF-8?q?fix(backend):=20=EC=9D=B4=EB=AA=A8=EC=A7=80?=
 =?UTF-8?q?=EB=A5=BC=20=EB=93=B1=EB=A1=9D=ED=95=98=EA=B1=B0=EB=82=98=20?=
 =?UTF-8?q?=EA=B0=80=EC=A0=B8=EC=98=A4=EB=A0=A4=EA=B3=A0=20=ED=95=A0=20?=
 =?UTF-8?q?=EB=95=8C=20=EC=98=A4=EB=A5=98=EA=B0=80=20=EB=B0=9C=EC=83=9D?=
 =?UTF-8?q?=ED=95=A0=20=EC=88=98=20=EC=9E=88=EC=9D=8C=20(kokonect-link/che?=
 =?UTF-8?q?rrypick#508)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_CHERRYPICK.md                         | 3 +++
 packages/backend/src/core/CustomEmojiService.ts | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index 0b9a8f708f..efe09cbc4d 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -77,6 +77,9 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE
 - Fix: 이미지 자르기를 할 때 이미지 크기 전체를 표시하지 못할 수 있음
 - Fix: 페이지에서 페이지 생성 버튼이 본문에 중복으로 표시됨
 
+### Server
+- Fix: 이모지를 등록하거나 가져오려고 할 때 오류가 발생할 수 있음 (kokonect-link/cherrypick#508)
+
 ---
 
 ## 4.11.1
diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts
index 41aebde7cb..e453b99aad 100644
--- a/packages/backend/src/core/CustomEmojiService.ts
+++ b/packages/backend/src/core/CustomEmojiService.ts
@@ -88,7 +88,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 			this.localEmojisCache.refresh();
 
 			//this.prefetchEmojis([{name: data.name, host: null}]);
-			this.cache.set(`${data.name} ${data.host}`, emoji);
+			this.emojisCache.set(`${data.name} ${data.host}`, emoji);
 
 			this.globalEventService.publishBroadcastStream('emojiAdded', {
 				emoji: await this.emojiEntityService.packDetailed(emoji.id),