From 046eab7496534977ca1a4a9ff285c766b8684a14 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: Sun, 20 Oct 2024 12:41:36 +0900
Subject: [PATCH] =?UTF-8?q?fix(frontend/reactions):=20=E3=83=AD=E3=83=BC?=
 =?UTF-8?q?=E3=82=AB=E3=83=AB=E3=81=AE=E3=82=AB=E3=82=B9=E3=82=BF=E3=83=A0?=
 =?UTF-8?q?=E7=B5=B5=E6=96=87=E5=AD=97=E3=81=AE=E3=83=9F=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E3=81=8C=E6=AD=A3=E5=B8=B8=E3=81=AB=E6=A9=9F=E8=83=BD?=
 =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20(MisskeyIO#765)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

MisskeyIO#762
---
 .../frontend/src/components/MkNoteDetailed.vue   | 16 +++++++++++-----
 .../frontend/src/pages/settings/mute-block.vue   |  1 -
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index c43b56604..f2f26c04a 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -171,7 +171,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<span style="margin-left: 4px;">{{ appearNote.reactions[reaction] }}</span>
 				</button>
 			</div>
-			<MkButton v-if="reactionTabType" :class="$style.reactionMuteButton" @click="reactionMuteToggle(reactionTabType)"> <i :class="!mutedReactions.includes(reactionTabType) ? 'ti ti-mood-happy' : 'ti ti-mood-off'"></i> {{ !mutedReactions.includes(reactionTabType) ? i18n.ts.muteThisReaction : i18n.ts.unmuteThisReaction }} </MkButton>
+			<MkButton v-if="reactionTabType" :class="$style.reactionMuteButton" @click="reactionMuteToggle(reactionTabTypeTrimLocal)">
+				<i :class="!mutedReactions.includes(reactionTabTypeTrimLocal) ? 'ti ti-mood-happy' : 'ti ti-mood-off'"/>
+				{{ !mutedReactions.includes(reactionTabTypeTrimLocal) ? i18n.ts.muteThisReaction : i18n.ts.unmuteThisReaction }}
+			</MkButton>
 			<MkPagination v-if="reactionTabType" :key="reactionTabType" :pagination="reactionsPagination" :disableAutoLoad="true">
 				<template #default="{ items }">
 					<div style="display: grid; grid-template-columns: repeat(auto-fill, minmax(270px, 1fr)); grid-gap: 12px;">
@@ -314,6 +317,7 @@ provide('react', (reaction: string) => {
 
 const tab = ref(props.initialTab);
 const reactionTabType = ref<string | null>(null);
+const reactionTabTypeTrimLocal = computed(() => reactionTabType.value?.replace('@.', '') ?? null);
 
 const renotesPagination = computed<Paging>(() => ({
 	endpoint: 'notes/renotes',
@@ -484,12 +488,14 @@ async function clip() {
 	os.popupMenu(await getNoteClipMenu({ note: note.value, isDeleted }), clipButton.value).then(focus);
 }
 
-async function reactionMuteToggle(emojiName: string) {
-	if (!mutedReactions.value.includes(emojiName)) {
-		mutedReactions.value.push(emojiName);
+async function reactionMuteToggle(reactionName: string | null) {
+	if (reactionName == null) return;
+
+	if (!mutedReactions.value.includes(reactionName)) {
+		mutedReactions.value.push(reactionName);
 		defaultStore.set('mutedReactions', mutedReactions.value);
 	} else {
-		mutedReactions.value = mutedReactions.value.filter(x => x !== emojiName);
+		mutedReactions.value = mutedReactions.value.filter(x => x !== reactionName);
 		defaultStore.set('mutedReactions', mutedReactions.value);
 	}
 }
diff --git a/packages/frontend/src/pages/settings/mute-block.vue b/packages/frontend/src/pages/settings/mute-block.vue
index 2445a14d5..855e9594b 100644
--- a/packages/frontend/src/pages/settings/mute-block.vue
+++ b/packages/frontend/src/pages/settings/mute-block.vue
@@ -197,7 +197,6 @@ function remove(itemsRef: Ref<string[]>, reaction: string, ev: MouseEvent) {
 async function pickEmoji(itemsRef: Ref<string[]>, ev: MouseEvent) {
 	os.pickEmoji(ev.currentTarget ?? ev.target, {
 		showPinned: false,
-		manualReactionInput: true,
 	}).then(it => {
 		const emoji = it;
 		if (!itemsRef.value.includes(emoji)) {