From 72491fca66ed60a911f1ddee4c89c0e7678e9979 Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Fri, 30 Aug 2024 14:31:19 +0900
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=EB=85=B8=ED=8A=B8=EC=9D=98=20?=
 =?UTF-8?q?=EC=84=B8=EB=B6=80=20=EC=98=B5=EC=85=98=EC=9D=84=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=ED=95=98=EB=8A=94=20`=EB=8D=94=20=EB=B3=B4=EA=B8=B0!`?=
 =?UTF-8?q?=20=EB=B2=84=ED=8A=BC=EC=9D=84=20=EB=88=84=EB=A5=BC=20=EC=88=98?=
 =?UTF-8?q?=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                       | 10 ++++++++
 .../frontend/src/scripts/get-note-menu.ts     | 23 ++++---------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index ff41bc8af8..0d9d7c5c78 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -23,6 +23,16 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGE
 # 릴리즈 노트
 이 문서는 CherryPick의 변경 사항만 포함합니다.
 
+## 4.x.x
+출시일: unreleased<br>
+기반 Misskey 버전: 2024.x.x<br>
+Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2024xx](CHANGELOG.md#2024xx) 문서를 참고하십시오.
+
+### Client
+- Fix: 노트의 세부 옵션을 표시하는 `더 보기!` 버튼을 누를 수 없음
+
+---
+
 ## 4.11.0
 출시일: 2024/8/28<br>
 기반 Misskey 버전: 2024.8.0<br>
diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
index bbfebba4cb..2093193e81 100644
--- a/packages/frontend/src/scripts/get-note-menu.ts
+++ b/packages/frontend/src/scripts/get-note-menu.ts
@@ -490,10 +490,10 @@ export function getNoteMenu(props: {
 			}]
 			: []
 		),*/
-			...(appearNote.userId !== $i.id || (isRenote && props.note.userId !== $i.id) ? [
+			...(appearNote.userId !== $i.id || props.note.userId !== $i.id ? [
 				{ type: 'divider' },
 				appearNote.userId !== $i.id ? getAbuseNoteMenu(appearNote, i18n.ts.reportAbuse) : undefined,
-				isRenote && props.note.userId !== $i.id ? getAbuseNoteMenu(props.note, i18n.ts.reportAbuseRenote) : undefined,
+				props.note.userId !== $i.id ? getAbuseNoteMenu(props.note, i18n.ts.reportAbuseRenote) : undefined,
 			]
 			: []
 			),
@@ -622,15 +622,8 @@ export function getQuoteMenu(props: {
 	note: Misskey.entities.Note,
 	mock?: boolean;
 }) {
-	const isRenote = (
-		props.note.renote != null &&
-		props.note.text == null &&
-		props.note.fileIds &&
-		props.note.fileIds.length === 0 &&
-		props.note.poll == null
-	);
 	const menu: MenuItem[] = [];
-	const appearNote = isRenote ? props.note.renote as Misskey.entities.Note : props.note;
+	const appearNote = getAppearNote(props.note);
 
 	if (!appearNote.channel || appearNote.channel.allowRenoteToExternal) {
 		menu.push({
@@ -882,15 +875,7 @@ export async function getRenoteOnly(props: {
 	renoteButton: ShallowRef<HTMLElement | undefined>;
 	mock?: boolean;
 }) {
-	const isRenote = (
-		props.note.renote != null &&
-		props.note.text == null &&
-		props.note.fileIds &&
-		props.note.fileIds.length === 0 &&
-		props.note.poll == null
-	);
-
-	const appearNote = isRenote ? props.note.renote as Misskey.entities.Note : props.note;
+	const appearNote = getAppearNote(props.note);
 
 	if (defaultStore.state.showRenoteConfirmPopup) {
 		const { canceled } = await os.confirm({