merge: Resolve "Show Muted Words doesn't work" - fixes #1079 (!1057)

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1057

Closes #1079

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>

2 files changed, 13 insertions, 13 deletions

diff --git a/packages/frontend/src/components/SkMutedNote.vue b/packages/frontend/src/components/SkMutedNote.vue
index 3c072fab3f..c9b3d768de 100644
--- a/packages/frontend/src/components/SkMutedNote.vue
+++ b/packages/frontend/src/components/SkMutedNote.vue
@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkUserName :user="note.user"/>
 	</template>
 </I18n>
-<I18n v-else-if="prefer.s.showSoftWordMutedWord" :src="i18n.ts.userSaysSomething" tag="small">
+<I18n v-else-if="!prefer.s.showSoftWordMutedWord" :src="i18n.ts.userSaysSomething" tag="small">
 	<template #name>
 		<MkUserName :user="note.user"/>
 	</template>
diff --git a/packages/frontend/src/pages/settings/mute-block.vue b/packages/frontend/src/pages/settings/mute-block.vue
index 8cc3945df8..e19d7eff85 100644
--- a/packages/frontend/src/pages/settings/mute-block.vue
+++ b/packages/frontend/src/pages/settings/mute-block.vue
@@ -12,10 +12,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 		<div class="_gaps_s">
 			<SearchMarker
+				v-slot="slotProps"
 				:label="i18n.ts.wordMute"
 				:keywords="['note', 'word', 'soft', 'mute', 'hide']"
 			>
-				<MkFolder>
+				<MkFolder :defaultOpen="slotProps.isParentOfTarget">
 					<template #icon><i class="ph-envelope ph-bold ph-lg"></i></template>
 					<template #label>{{ i18n.ts.wordMute }}</template>
 
@@ -37,10 +38,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</SearchMarker>
 
 			<SearchMarker
+				v-slot="slotProps"
 				:label="i18n.ts.hardWordMute"
 				:keywords="['note', 'word', 'hard', 'mute', 'hide']"
 			>
-				<MkFolder>
+				<MkFolder :defaultOpen="slotProps.isParentOfTarget">
 					<template #icon><i class="ph-x-square ph-bold ph-lg"></i></template>
 					<template #label>{{ i18n.ts.hardWordMute }}</template>
 
@@ -55,10 +57,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</SearchMarker>
 
 			<SearchMarker
+				v-slot="slotProps"
 				:label="i18n.ts.instanceMute"
 				:keywords="['note', 'server', 'instance', 'host', 'federation', 'mute', 'hide']"
 			>
-				<MkFolder v-if="instance.federation !== 'none'">
+				<MkFolder v-if="instance.federation !== 'none'" :defaultOpen="slotProps.isParentOfTarget">
 					<template #icon><i class="ti ti-planet-off"></i></template>
 					<template #label>{{ i18n.ts.instanceMute }}</template>
 
@@ -67,9 +70,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</SearchMarker>
 
 			<SearchMarker
+				v-slot="slotProps"
 				:keywords="['renote', 'mute', 'hide', 'user']"
 			>
-				<MkFolder>
+				<MkFolder :defaultOpen="slotProps.isParentOfTarget">
 					<template #icon><i class="ti ti-repeat-off"></i></template>
 					<template #label><SearchLabel>{{ i18n.ts.mutedUsers }} ({{ i18n.ts.renote }})</SearchLabel></template>
 
@@ -102,10 +106,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</SearchMarker>
 
 			<SearchMarker
+				v-slot="slotProps"
 				:label="i18n.ts.mutedUsers"
 				:keywords="['note', 'mute', 'hide', 'user']"
 			>
-				<MkFolder>
+				<MkFolder :defaultOpen="slotProps.isParentOfTarget">
 					<template #icon><i class="ti ti-eye-off"></i></template>
 					<template #label>{{ i18n.ts.mutedUsers }}</template>
 
@@ -140,10 +145,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</SearchMarker>
 
 			<SearchMarker
+				v-slot="slotProps"
 				:label="i18n.ts.blockedUsers"
 				:keywords="['block', 'user']"
 			>
-				<MkFolder>
+				<MkFolder :defaultOpen="slotProps.isParentOfTarget">
 					<template #icon><i class="ti ti-ban"></i></template>
 					<template #label>{{ i18n.ts.blockedUsers }}</template>
 
@@ -223,12 +229,6 @@ const expandedBlockItems = ref([]);
 
 const showSoftWordMutedWord = prefer.model('showSoftWordMutedWord');
 
-watch([
-	showSoftWordMutedWord,
-], async () => {
-	await reloadAsk({ reason: i18n.ts.reloadToApplySetting, unison: true });
-});
-
 async function unrenoteMute(user, ev) {
 	os.popupMenu([{
 		text: i18n.ts.renoteUnmute,