From e888ee414b19729144cbe351fed7a767b435ee1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Mon, 31 Mar 2025 12:07:19 +0900
Subject: [PATCH] fix: MSKY-77 (MisskeyIO#956)

---
 .../src/components/MkDateSeparatedList.vue    | 35 ++++++++-----------
 .../frontend/src/scripts/get-note-menu.ts     |  4 +--
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/packages/frontend/src/components/MkDateSeparatedList.vue b/packages/frontend/src/components/MkDateSeparatedList.vue
index 8345f1b51..454272279 100644
--- a/packages/frontend/src/components/MkDateSeparatedList.vue
+++ b/packages/frontend/src/components/MkDateSeparatedList.vue
@@ -120,16 +120,12 @@ export default defineComponent({
 		};
 
 		function onBeforeLeave(element: Element) {
-			if (isAprilFoolsDay()) return;
-
 			const el = element as HTMLElement;
 			el.style.top = `${el.offsetTop}px`;
 			el.style.left = `${el.offsetLeft}px`;
 		}
 
 		function onLeaveCancelled(element: Element) {
-			if (isAprilFoolsDay()) return;
-
 			const el = element as HTMLElement;
 			el.style.top = '';
 			el.style.left = '';
@@ -141,15 +137,15 @@ export default defineComponent({
 			[$style['date-separated-list-nogap']]: props.noGap,
 			[$style['direction-down']]: props.direction === 'down',
 			[$style['direction-up']]: props.direction === 'up',
-			[$style['april-fool']]: isAprilFoolsDay(),
+			[$style['april-fool']]: defaultStore.state.animation ? isAprilFoolsDay() : false,
 		};
 
 		return () => defaultStore.state.animation ? h(TransitionGroup, {
 			class: classes,
 			name: 'list',
 			tag: 'div',
-			onBeforeLeave,
-			onLeaveCancelled,
+			onBeforeLeave: !isAprilFoolsDay() ? onBeforeLeave : undefined,
+			onLeaveCancelled: !isAprilFoolsDay() ? onLeaveCancelled : undefined,
 		}, { default: renderChildren }) : h('div', {
 			class: classes,
 		}, { default: renderChildren });
@@ -216,8 +212,18 @@ export default defineComponent({
 	}
 }
 
-.direction-up.april-fool ,
-.direction-down.april-fool {
+@keyframes spin-shrink {
+	0% {
+		transform: rotate(0deg) scale(1);
+		opacity: 1;
+	}
+	100% {
+		transform: rotate(2160deg) scale(0);
+		opacity: 0;
+	}
+}
+
+.april-fool {
 	&:global > .list-enter-from,
 	&:global > .list-leave-to {
 		animation: components-MkDateSeparatedList-spin-shrink 3s ease-in forwards;
@@ -254,16 +260,5 @@ export default defineComponent({
 .date-2-icon {
 	margin-left: 8px;
 }
-
-@keyframes spin-shrink {
-	0% {
-		transform: rotate(0deg) scale(1);
-		opacity: 1;
-	}
-	100% {
-		transform: rotate(2160deg) scale(0);
-		opacity: 0;
-	}
-}
 </style>
 
diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
index 3d3f40b29..e6655004e 100644
--- a/packages/frontend/src/scripts/get-note-menu.ts
+++ b/packages/frontend/src/scripts/get-note-menu.ts
@@ -186,8 +186,8 @@ export function getNoteMenu(props: {
 		}).then(({ canceled }) => {
 			if (canceled) return;
 
-			if (isAprilFoolsDay()) {
-				if (!isMute()) playUrl('/client-assets/sounds/flush.mp3', {});
+			if (isAprilFoolsDay() && !isMute()) {
+				playUrl('/client-assets/sounds/flush.mp3', { volume: defaultStore.state.sound_masterVolume });
 			}
 
 			misskeyApi('notes/delete', {