From 4c2f7c64cc2b70bd7b686e9ece1ebbc30eeab511 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 8 Mar 2023 08:56:09 +0900
Subject: feat: Per-user renote mute (#10249)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: per-user renote muting

From FoundKey/c414f24a2c https://akkoma.dev/FoundKeyGang/FoundKey

* Update ja-JP.yml

* Delete renote-muting.ts

* rename

* fix ids

* lint

* fix

* Update CHANGELOG.md

* リノートをミュートしたユーザー一覧を見れるように

* :art:

* add test

* fix test

---------

Co-authored-by: Hélène <pleroma-dev@helene.moe>
---
 .../frontend/src/pages/settings/mute-block.vue     | 64 ++++++++++++++++++++--
 packages/frontend/src/scripts/get-user-menu.ts     | 12 ++++
 2 files changed, 72 insertions(+), 4 deletions(-)

(limited to 'packages/frontend/src')

diff --git a/packages/frontend/src/pages/settings/mute-block.vue b/packages/frontend/src/pages/settings/mute-block.vue
index 577337868f..3d0463f708 100644
--- a/packages/frontend/src/pages/settings/mute-block.vue
+++ b/packages/frontend/src/pages/settings/mute-block.vue
@@ -1,10 +1,40 @@
 <template>
 <div class="_gaps_m">
-	<MkTab v-model="tab" style="margin-bottom: var(--margin);">
+	<MkTab v-model="tab">
+		<option value="renoteMute">{{ i18n.ts.mutedUsers }} ({{ i18n.ts.renote }})</option>
 		<option value="mute">{{ i18n.ts.mutedUsers }}</option>
 		<option value="block">{{ i18n.ts.blockedUsers }}</option>
 	</MkTab>
-	<div v-if="tab === 'mute'">
+
+	<div v-if="tab === 'renoteMute'">
+		<MkPagination :pagination="renoteMutingPagination">
+			<template #empty>
+				<div class="_fullinfo">
+					<img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/>
+					<div>{{ i18n.ts.noUsers }}</div>
+				</div>
+			</template>
+
+			<template #default="{ items }">
+				<div class="_gaps_s">
+					<div v-for="item in items" :key="item.mutee.id" :class="[$style.userItem, { [$style.userItemOpend]: expandedRenoteMuteItems.includes(item.id) }]">
+						<div :class="$style.userItemMain">
+							<MkA :class="$style.userItemMainBody" :to="`/user-info/${item.mutee.id}`">
+								<MkUserCardMini :user="item.mutee"/>
+							</MkA>
+							<button class="_button" :class="$style.userToggle" @click="toggleRenoteMuteItem(item)"><i :class="$style.chevron" class="ti ti-chevron-down"></i></button>
+							<button class="_button" :class="$style.remove" @click="unrenoteMute(item.mutee, $event)"><i class="ti ti-x"></i></button>
+						</div>
+						<div v-if="expandedRenoteMuteItems.includes(item.id)" :class="$style.userItemSub">
+							<div>Muted at: <MkTime :time="item.createdAt" mode="detail"/></div>
+						</div>
+					</div>
+				</div>
+			</template>
+		</MkPagination>
+	</div>
+
+	<div v-else-if="tab === 'mute'">
 		<MkPagination :pagination="mutingPagination">
 			<template #empty>
 				<div class="_fullinfo">
@@ -33,7 +63,8 @@
 			</template>
 		</MkPagination>
 	</div>
-	<div v-if="tab === 'block'">
+
+	<div v-else-if="tab === 'block'">
 		<MkPagination :pagination="blockingPagination">
 			<template #empty>
 				<div class="_fullinfo">
@@ -77,7 +108,12 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 import MkUserCardMini from '@/components/MkUserCardMini.vue';
 import * as os from '@/os';
 
-let tab = $ref('mute');
+let tab = $ref('renoteMute');
+
+const renoteMutingPagination = {
+	endpoint: 'renote-mute/list' as const,
+	limit: 10,
+};
 
 const mutingPagination = {
 	endpoint: 'mute/list' as const,
@@ -89,9 +125,21 @@ const blockingPagination = {
 	limit: 10,
 };
 
+let expandedRenoteMuteItems = $ref([]);
 let expandedMuteItems = $ref([]);
 let expandedBlockItems = $ref([]);
 
+async function unrenoteMute(user, ev) {
+	os.popupMenu([{
+		text: i18n.ts.renoteUnmute,
+		icon: 'ti ti-x',
+		action: async () => {
+			await os.apiWithDialog('renote-mute/delete', { userId: user.id });
+			//role.users = role.users.filter(u => u.id !== user.id);
+		},
+	}], ev.currentTarget ?? ev.target);
+}
+
 async function unmute(user, ev) {
 	os.popupMenu([{
 		text: i18n.ts.unmute,
@@ -114,6 +162,14 @@ async function unblock(user, ev) {
 	}], ev.currentTarget ?? ev.target);
 }
 
+async function toggleRenoteMuteItem(item) {
+	if (expandedRenoteMuteItems.includes(item.id)) {
+		expandedRenoteMuteItems = expandedRenoteMuteItems.filter(x => x !== item.id);
+	} else {
+		expandedRenoteMuteItems.push(item.id);
+	}
+}
+
 async function toggleMuteItem(item) {
 	if (expandedMuteItems.includes(item.id)) {
 		expandedMuteItems = expandedMuteItems.filter(x => x !== item.id);
diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts
index f5aa551bdb..d7eb331183 100644
--- a/packages/frontend/src/scripts/get-user-menu.ts
+++ b/packages/frontend/src/scripts/get-user-menu.ts
@@ -53,6 +53,14 @@ export function getUserMenu(user: misskey.entities.UserDetailed, router: Router
 		}
 	}
 
+	async function toggleRenoteMute() {
+		os.apiWithDialog(user.isRenoteMuted ? 'renote-mute/delete' : 'renote-mute/create', {
+			userId: user.id,
+		}).then(() => {
+			user.isRenoteMuted = !user.isRenoteMuted;
+		});
+	}
+
 	async function toggleBlock() {
 		if (!await getConfirmed(user.isBlocking ? i18n.ts.unblockConfirm : i18n.ts.blockConfirm)) return;
 
@@ -179,6 +187,10 @@ export function getUserMenu(user: misskey.entities.UserDetailed, router: Router
 			icon: user.isMuted ? 'ti ti-eye' : 'ti ti-eye-off',
 			text: user.isMuted ? i18n.ts.unmute : i18n.ts.mute,
 			action: toggleMute,
+		}, {
+			icon: user.isRenoteMuted ? 'ti ti-repeat' : 'ti ti-repeat-off',
+			text: user.isRenoteMuted ? i18n.ts.renoteUnmute : i18n.ts.renoteMute,
+			action: toggleRenoteMute,
 		}, {
 			icon: 'ti ti-ban',
 			text: user.isBlocking ? i18n.ts.unblock : i18n.ts.block,
-- 
cgit v1.2.3-freya