From 34c1b4e5b072e92265a88bca133fad3bb0c5731e Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Tue, 26 Nov 2024 16:29:25 +0900
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=EC=BB=A4=EC=8A=A4=ED=85=80=20?=
 =?UTF-8?q?=EC=9D=B4=EB=AA=A8=EC=A7=80=20=EA=B4=80=EB=A6=AC=20=EC=97=AD?=
 =?UTF-8?q?=ED=95=A0=EC=9D=B4=20=EC=9E=88=EB=8A=94=20=EC=82=AC=EC=9A=A9?=
 =?UTF-8?q?=EC=9E=90=EA=B0=80=20=EC=9B=90=EA=B2=A9=20=EC=84=9C=EB=B2=84?=
 =?UTF-8?q?=EC=9D=98=20=EC=9D=B4=EB=AA=A8=EC=A7=80=EB=A5=BC=20=EA=B0=80?=
 =?UTF-8?q?=EC=A0=B8=EC=98=AC=20=EC=88=98=20=EC=97=86=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_CHERRYPICK.md                                         | 1 +
 packages/frontend/src/components/MkReactionsViewer.reaction.vue | 2 +-
 packages/frontend/src/components/global/MkCustomEmoji.vue       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index 8043a403ec..413d2689c0 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -30,6 +30,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE
 
 ### Client
 - Fix: 노트 상세 페이지에서 사용자 이름이 중복으로 표시될 수 있음
+- Fix: 커스텀 이모지 관리 역할이 있는 사용자가 원격 서버의 이모지를 가져올 수 없음
 
 ---
 
diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index 1b0571744a..77ddeb8098 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -120,7 +120,7 @@ async function toggleReaction(ev: MouseEvent) {
 }
 
 function stealReaction(ev: MouseEvent) {
-	if (!props.note.user.host && $i && !($i.isAdmin ?? $i.policies.canManageCustomEmojis)) return;
+	if (!props.note.user.host && $i && !($i.isAdmin || $i.policies.canManageCustomEmojis)) return;
 
 	os.popupMenu([{
 		type: 'label',
diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue
index 75782f1da0..6015a254db 100644
--- a/packages/frontend/src/components/global/MkCustomEmoji.vue
+++ b/packages/frontend/src/components/global/MkCustomEmoji.vue
@@ -109,7 +109,7 @@ function onClick(ev: MouseEvent) {
 		}] : []),
 		);
 
-		if (props.host && $i && ($i.isAdmin ?? $i.policies.canManageCustomEmojis)) {
+		if (props.host && $i && ($i.isAdmin || $i.policies.canManageCustomEmojis)) {
 			menuItems.push({
 				text: i18n.ts.import,
 				icon: 'ti ti-plus',