From f8e47718a8ce211c24fbd78d9a9cf1812f3def45 Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Wed, 8 Nov 2023 17:31:49 +0900
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20'=EB=AA=A8=EB=93=A0=20?=
 =?UTF-8?q?=EB=AF=B8=EB=94=94=EC=96=B4=20=EB=85=B8=ED=8A=B8=20=EA=B0=84?=
 =?UTF-8?q?=EB=9E=B5=ED=99=94=ED=95=98=EA=B8=B0'=20=EC=98=B5=EC=85=98?=
 =?UTF-8?q?=EC=9D=84=20=ED=99=9C=EC=84=B1=ED=99=94=ED=95=98=EB=A9=B4=20?=
 =?UTF-8?q?=EB=AF=B8=EB=94=94=EC=96=B4=EA=B0=80=20=EC=95=84=EB=8B=8C=20?=
 =?UTF-8?q?=EB=85=B8=ED=8A=B8=EC=97=90=EB=8F=84=20'=EB=8B=AB=EA=B8=B0'=20?=
 =?UTF-8?q?=EB=B2=84=ED=8A=BC=EC=9D=B4=20=ED=91=9C=EC=8B=9C=EB=90=A0=20?=
 =?UTF-8?q?=EC=88=98=20=EC=9E=88=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/MkNote.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index 90001d7be1..dcd3894d99 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -59,6 +59,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2023xx](CHANGE
   - 일부 페이지에서 액션 항목이 존재해도 버튼이 표시되지 않을 수 있음
 - Fix: 네비게이션 메뉴의 하단 프로필 영역이 잘못된 디자인으로 표시됨
 - Fix: 노트를 인용할 때 입력란에 자동으로 포커스가 맞춰지지 않음
+- Fix: '모든 미디어 노트 간략화하기' 옵션을 활성화하면 미디어가 아닌 노트에도 '닫기' 버튼이 표시될 수 있음
 
 ### Server
 - Feat: 연합에서 노트 수정이 반영됨 (libnare/cp-castella#1)
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 3146bd746e..4bf889b9ca 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -114,7 +114,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<span v-if="appearNote.files.length > 0" :class="$style.label">({{ collapseLabel }})</span>
 					</span>
 				</button>
-				<button v-else-if="(isLong || (isMFM && defaultStore.state.collapseDefault) || defaultStore.state.allMediaNoteCollapse) && !collapsed" v-vibrate="ColdDeviceStorage.get('vibrateSystem') ? 5 : ''" :class="$style.showLess" class="_button" @click="collapsed = true">
+				<button v-else-if="(isLong || (isMFM && defaultStore.state.collapseDefault) || (appearNote.files.length > 0 && defaultStore.state.allMediaNoteCollapse)) && !collapsed" v-vibrate="ColdDeviceStorage.get('vibrateSystem') ? 5 : ''" :class="$style.showLess" class="_button" @click="collapsed = true">
 					<span :class="$style.showLessLabel">{{ i18n.ts.showLess }}</span>
 				</button>
 			</div>