From 4f1c4bb5e9bec4a58b5ec6ea903e69f018b5603f Mon Sep 17 00:00:00 2001
From: taiyme <53635909+taiyme@users.noreply.github.com>
Date: Tue, 21 May 2024 14:37:21 +0900
Subject: [PATCH] =?UTF-8?q?enhance(abuses):=20=E9=80=9A=E5=A0=B1=E4=B8=80?=
 =?UTF-8?q?=E8=A6=A7=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=AE=E6=94=B9=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(admin/abuse-user-reports): forwarded, moderationNote が含まれていない問題

* fix(MkAbuseReport): 通報一覧で描画が崩れる問題
---
 locales/index.d.ts                            |   8 +
 locales/ja-JP.yml                             |   2 +
 .../entities/AbuseUserReportEntityService.ts  |   3 +
 .../src/core/entities/UserEntityService.ts    |   4 +-
 .../api/endpoints/admin/abuse-user-reports.ts |   4 +
 .../frontend/src/components/MkAbuseReport.vue | 305 +++++++++++++-----
 packages/frontend/src/pages/admin/abuses.vue  |  38 +--
 packages/misskey-js/src/autogen/types.ts      |   1 +
 8 files changed, 264 insertions(+), 101 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 4c8caf6f3d44..8b342c9f4ab1 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -10009,6 +10009,14 @@ export interface Locale extends ILocale {
          * 数字引用しました
          */
         readonly "didNumberquote": string;
+        /**
+         * {user}によって解決済み
+         */
+        readonly "resolvedBy": ParameterizedString<"user">;
+        /**
+         * リモートサーバーに転送済み
+         */
+        readonly "forwardedReport": string;
         readonly "_about": {
             /**
              * taiymeについて
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index e1053eec6ea2..2da293de7b72 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2666,6 +2666,8 @@ _tms:
   numberquote: "数字引用する"
   didPakuru: "パクりました"
   didNumberquote: "数字引用しました"
+  resolvedBy: "{user}によって解決済み"
+  forwardedReport: "リモートサーバーに転送済み"
   _about:
     title: "taiymeについて"
     description: "taiymeは、Misskeyから派生したオープンソースのソフトウェアです。"
diff --git a/packages/backend/src/core/entities/AbuseUserReportEntityService.ts b/packages/backend/src/core/entities/AbuseUserReportEntityService.ts
index 49f256d870df..1dae9b23994a 100644
--- a/packages/backend/src/core/entities/AbuseUserReportEntityService.ts
+++ b/packages/backend/src/core/entities/AbuseUserReportEntityService.ts
@@ -39,12 +39,15 @@ export class AbuseUserReportEntityService {
 			assigneeId: report.assigneeId,
 			reporter: this.userEntityService.pack(report.reporter ?? report.reporterId, null, {
 				schema: 'UserDetailedNotMe',
+				iAmModerator: true,
 			}),
 			targetUser: this.userEntityService.pack(report.targetUser ?? report.targetUserId, null, {
 				schema: 'UserDetailedNotMe',
+				iAmModerator: true,
 			}),
 			assignee: report.assigneeId ? this.userEntityService.pack(report.assignee ?? report.assigneeId, null, {
 				schema: 'UserDetailedNotMe',
+				iAmModerator: true,
 			}) : null,
 			forwarded: report.forwarded,
 		});
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index b80a1ec206b4..251e19bbfcfd 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -404,11 +404,13 @@ export class UserEntityService implements OnModuleInit {
 			userRelations?: Map<MiUser['id'], UserRelation>,
 			userMemos?: Map<MiUser['id'], string | null>,
 			pinNotes?: Map<MiUser['id'], MiUserNotePining[]>,
+			iAmModerator?: boolean,
 		},
 	): Promise<Packed<S>> {
 		const opts = Object.assign({
 			schema: 'UserLite',
 			includeSecrets: false,
+			iAmModerator: false,
 		}, options);
 
 		const user = typeof src === 'object' ? src : await this.usersRepository.findOneByOrFail({ id: src });
@@ -416,7 +418,7 @@ export class UserEntityService implements OnModuleInit {
 		const isDetailed = opts.schema !== 'UserLite';
 		const meId = me ? me.id : null;
 		const isMe = meId === user.id;
-		const iAmModerator = me ? await this.roleService.isModerator(me as MiUser) : false;
+		const iAmModerator = opts.iAmModerator || (me ? await this.roleService.isModerator(me as MiUser) : false);
 
 		const profile = isDetailed
 			? (opts.userProfile ?? await this.userProfilesRepository.findOneByOrFail({ userId: user.id }))
diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts b/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts
index cf3f257ca692..386ccda9743d 100644
--- a/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts
+++ b/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts
@@ -74,6 +74,10 @@ export const meta = {
 					nullable: true, optional: true,
 					ref: 'UserDetailedNotMe',
 				},
+				forwarded: {
+					type: 'boolean',
+					nullable: false, optional: false,
+				},
 			},
 		},
 	},
diff --git a/packages/frontend/src/components/MkAbuseReport.vue b/packages/frontend/src/components/MkAbuseReport.vue
index a28e7c25592d..3df8ea9fcb41 100644
--- a/packages/frontend/src/components/MkAbuseReport.vue
+++ b/packages/frontend/src/components/MkAbuseReport.vue
@@ -4,37 +4,91 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div class="bcekxzvu _margin _panel">
-	<div class="target">
-		<MkA v-user-preview="report.targetUserId" class="info" :to="`/admin/user/${report.targetUserId}`" :behavior="'window'">
-			<MkAvatar class="avatar" :user="report.targetUser" indicator/>
-			<div class="names">
-				<MkUserName class="name" :user="report.targetUser"/>
-				<MkAcct class="acct" :user="report.targetUser" style="display: block;"/>
-			</div>
+<div :class="[$style.root, '_panel', '_margin']">
+	<!-- 通報されたユーザー -->
+	<div :class="[$style.item, '_gaps_s']">
+		<MkA v-user-preview="props.report.targetUser.id" :to="`/admin/user/${props.report.targetUser.id}`" :behavior="'window'">
+			<MkUserCardMini :user="props.report.targetUser" :withChart="false" :class="$style.userCard"/>
 		</MkA>
-		<MkKeyValue>
-			<template #key>{{ i18n.ts.registeredDate }}</template>
-			<template #value>{{ dateString(report.targetUser.createdAt) }} (<MkTime :time="report.targetUser.createdAt"/>)</template>
-		</MkKeyValue>
+		<div :class="$style.userStatus">
+			<button
+				v-if="props.report.targetUser.isSuspended"
+				v-text="'Suspended'"
+				v-tooltip:dialog="i18n.ts.userSuspended"
+				:class="['_button', $style.badge, $style.isSuspended]"
+			/>
+			<button
+				v-if="props.report.targetUser.isSilenced"
+				v-text="'Silenced'"
+				v-tooltip:dialog="i18n.ts.userSilenced"
+				:class="['_button', $style.badge, $style.isSilenced]"
+			/>
+			<button
+				v-if="props.report.targetUser.moderationNote != null && props.report.targetUser.moderationNote.trim() !== ''"
+				v-text="i18n.ts.moderationNote"
+				v-tooltip:dialog="props.report.targetUser.moderationNote.trim()"
+				:class="['_button', $style.badge]"
+			/>
+		</div>
+	</div>
+
+	<!-- 通報の本文 -->
+	<div :class="$style.item">
+		<Mfm v-if="props.report.comment.trim() !== ''" :text="props.report.comment.trim()" :linkNavigationBehavior="'window'"/>
+		<span v-else :class="$style.noComment">({{ i18n.ts.noDescription }})</span>
+	</div>
+
+	<!-- 通報の情報 -->
+	<div :class="$style.item">
+		<div :class="$style.information">
+			<div :class="$style.infoItem">
+				<div :class="$style.infoLabel">{{ i18n.ts.reporter }}</div>
+				<div :class="$style.infoContent">
+					<MkA :to="`/admin/user/${props.report.reporter.id}`" class="_link" :behavior="'window'">
+						<MkAcct :user="props.report.reporter"/>
+					</MkA>
+				</div>
+			</div>
+			<div :class="$style.infoItem">
+				<div :class="$style.infoLabel">{{ i18n.ts.createdAt }}</div>
+				<div :class="$style.infoContent">{{ dateString(props.report.createdAt) }} (<MkTime :time="props.report.createdAt"/>)</div>
+			</div>
+		</div>
 	</div>
-	<div class="detail">
-		<div>
-			<Mfm :text="report.comment" :linkNavigationBehavior="'window'"/>
+
+	<!-- 通報の状態 -->
+	<div :class="$style.item">
+		<div v-if="resolvedRef">
+			<i class="ti ti-check" style="color: var(--success); margin-right: 0.5em;"></i>
+			<I18n v-if="props.report.assignee != null" :src="i18n.ts._tms.resolvedBy" tag="span">
+				<template #user>
+					<MkA :to="`/admin/user/${props.report.assignee.id}`" class="_link" :behavior="'window'">
+						<MkAcct :user="props.report.assignee"/>
+					</MkA>
+				</template>
+			</I18n>
+			<span v-else>{{ i18n.ts.resolved }}</span>
 		</div>
-		<hr/>
-		<div>{{ i18n.ts.reporter }}: <MkA :to="`/admin/user/${report.reporter.id}`" class="_link" :behavior="'window'">@{{ report.reporter.username }}</MkA></div>
-		<div v-if="report.assignee">
-			{{ i18n.ts.moderator }}:
-			<MkAcct :user="report.assignee"/>
+		<div v-if="forwardedRef">
+			<i class="ti ti-check" style="color: var(--success); margin-right: 0.5em;"></i>
+			<span>{{ i18n.ts._tms.forwardedReport }}</span>
 		</div>
-		<div><MkTime :time="report.createdAt"/></div>
-		<div class="action">
-			<MkSwitch v-model="forward" :disabled="report.targetUser.host == null || report.resolved">
-				{{ i18n.ts.forwardReport }}
-				<template #caption>{{ i18n.ts.forwardReportIsAnonymous }}</template>
+	</div>
+
+	<!-- 通報の操作 -->
+	<div :class="$style.item">
+		<div v-if="!resolvedRef" :class="$style.operations">
+			<MkSwitch v-if="props.report.targetUser.host != null" v-model="editForwardRef">
+				<template #label>{{ i18n.ts.forwardReport }}</template>
 			</MkSwitch>
-			<MkButton v-if="!report.resolved" primary @click="resolve">{{ i18n.ts.abuseMarkAsResolved }}</MkButton>
+			<div :class="$style.resolveButton">
+				<MkButton primary @click="resolveReport">{{ i18n.ts.abuseMarkAsResolved }}</MkButton>
+			</div>
+		</div>
+		<div v-else-if="!forwardedRef && props.report.targetUser.host != null" :class="$style.operations">
+			<div :class="$style.resolveButton">
+				<MkButton @click="forwardReport">{{ i18n.ts.forwardReport }}</MkButton>
+			</div>
 		</div>
 	</div>
 </div>
@@ -42,74 +96,173 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { ref } from 'vue';
-import MkButton from '@/components/MkButton.vue';
-import MkSwitch from '@/components/MkSwitch.vue';
-import MkKeyValue from '@/components/MkKeyValue.vue';
-import * as os from '@/os.js';
+import type * as Misskey from 'misskey-js';
+import { apiWithDialog } from '@/os.js';
 import { i18n } from '@/i18n.js';
 import { dateString } from '@/filters/date.js';
+import MkButton from '@/components/MkButton.vue';
+import MkSwitch from '@/components/MkSwitch.vue';
+import MkUserCardMini from '@/components/MkUserCardMini.vue';
+
+export type AbuseUserReport = Misskey.entities.AdminAbuseUserReportsResponse[number];
 
 const props = defineProps<{
-	report: any;
+	report: AbuseUserReport;
 }>();
 
 const emit = defineEmits<{
-	(ev: 'resolved', reportId: string): void;
+	resolved: [reportId: string];
 }>();
 
-const forward = ref(props.report.forwarded);
+const editForwardRef = ref(false);
 
-function resolve() {
-	os.apiWithDialog('admin/resolve-abuse-user-report', {
-		forward: forward.value,
-		reportId: props.report.id,
-	}).then(() => {
-		emit('resolved', props.report.id);
+const resolvedRef = ref(props.report.resolved);
+const forwardedRef = ref(props.report.forwarded);
+
+const resolveReport = () => {
+	// 解決済みは弾く
+	if (resolvedRef.value) return;
+
+	const reportId = props.report.id;
+	const forward = editForwardRef.value && props.report.targetUser.host != null;
+
+	apiWithDialog('admin/resolve-abuse-user-report', { reportId, forward }).then(() => {
+		emit('resolved', reportId);
+		resolvedRef.value = true;
+		forwardedRef.value = forward;
 	});
-}
+};
+
+const forwardReport = () => {
+	// 未解決は弾く
+	if (!resolvedRef.value) return;
+	// ローカルユーザーは弾く
+	if (props.report.targetUser.host == null) return;
+
+	const reportId = props.report.id;
+	const forward = true;
+
+	apiWithDialog('admin/resolve-abuse-user-report', { reportId, forward }).then(() => {
+		resolvedRef.value = true;
+		forwardedRef.value = forward;
+	});
+};
 </script>
 
-<style lang="scss" scoped>
-.bcekxzvu {
+<style lang="scss" module>
+.root {
+	display: flex;
+	flex-direction: column;
+}
+
+.item {
+	padding: 16px;
+	border-top: solid 0.5px var(--divider);
+
+	&:first-child {
+		border-top: none;
+	}
+
+	&:empty {
+		display: none;
+	}
+}
+
+.userCard {
+	background-image: linear-gradient(
+		45deg,
+		rgba(255, 196, 0, 0.15) 16.67%,
+		transparent 16.67%,
+		transparent 50%,
+		rgba(255, 196, 0, 0.15) 50%,
+		rgba(255, 196, 0, 0.15) 66.67%,
+		transparent 66.67%,
+		transparent 100%
+	);
+	background-size: 16px 16px;
+	background-color: transparent !important;
+}
+
+.userStatus {
 	display: flex;
+	gap: 8px;
+	flex-wrap: wrap;
 
-	> .target {
-		width: 35%;
-		box-sizing: border-box;
-		text-align: left;
-		padding: 24px;
-		border-right: solid 1px var(--divider);
-
-		> .info {
-			display: flex;
-			box-sizing: border-box;
-			align-items: center;
-			padding: 14px;
-			border-radius: 8px;
-			--c: rgb(255 196 0 / 15%);
-			background-image: linear-gradient(45deg, var(--c) 16.67%, transparent 16.67%, transparent 50%, var(--c) 50%, var(--c) 66.67%, transparent 66.67%, transparent 100%);
-			background-size: 16px 16px;
-
-			> .avatar {
-				width: 42px;
-				height: 42px;
-			}
-
-			> .names {
-				margin-left: 0.3em;
-				padding: 0 8px;
-				flex: 1;
-
-				> .name {
-					font-weight: bold;
-				}
-			}
+	&:empty {
+		display: none;
+	}
+
+	> .badge {
+		display: inline-block;
+		border: 1px solid var(--c, var(--fg));
+		border-radius: 6px;
+		padding: 2px 6px;
+		font-size: 85%;
+		color: var(--c, var(--fg));
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+
+		&.isSuspended {
+			--c: var(--error);
+		}
+
+		&.isSilenced {
+			--c: var(--warn);
 		}
 	}
+}
+
+.noComment {
+	color: var(--fgTransparentWeak);
+}
 
-	> .detail {
-		flex: 1;
-		padding: 24px;
+.information {
+	display: grid;
+	grid-template-columns: max-content 1fr;
+	gap: 0;
+}
+
+.infoItem {
+	display: grid;
+	grid-template: auto / subgrid;
+	grid-row: auto;
+	grid-column: span 2;
+	gap: 8px;
+}
+
+@container (max-width: 300px) {
+	.information {
+		grid-template-columns: 1fr;
+		gap: 8px;
 	}
+
+	.infoItem {
+		grid-template: subgrid / auto;
+		grid-row: span 2;
+		grid-column: auto;
+		gap: 0;
+	}
+}
+
+.infoLabel {
+	color: var(--fgTransparentWeak);
+}
+
+.infoContent {
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+.operations {
+	display: flex;
+	gap: 8px;
+	flex-wrap: wrap;
+	align-items: center;
+}
+
+.resolveButton {
+	margin-left: auto;
 }
 </style>
diff --git a/packages/frontend/src/pages/admin/abuses.vue b/packages/frontend/src/pages/admin/abuses.vue
index b74a6a6c337c..da156fbfe8fd 100644
--- a/packages/frontend/src/pages/admin/abuses.vue
+++ b/packages/frontend/src/pages/admin/abuses.vue
@@ -30,19 +30,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 							<option value="remote">{{ i18n.ts.remote }}</option>
 						</MkSelect>
 					</div>
-					<!-- TODO
-			<div class="inputs" style="display: flex; padding-top: 1.2em;">
-				<MkInput v-model="searchUsername" style="margin: 0; flex: 1;" type="text" :spellcheck="false">
-					<span>{{ i18n.ts.username }}</span>
-				</MkInput>
-				<MkInput v-model="searchHost" style="margin: 0; flex: 1;" type="text" :spellcheck="false" :disabled="pagination.params().origin === 'local'">
-					<span>{{ i18n.ts.host }}</span>
-				</MkInput>
-			</div>
-			-->
 
-					<MkPagination v-slot="{items}" ref="reports" :pagination="pagination" style="margin-top: var(--margin);">
-						<XAbuseReport v-for="report in items" :key="report.id" :report="report" @resolved="resolved"/>
+					<MkPagination v-slot="{ items }" ref="reports" :pagination="pagination" style="margin-top: var(--margin);">
+						<XAbuseReport v-for="report in (items as AbuseUserReport[])" :key="report.id" :report="report" @resolved="resolved"/>
 					</MkPagination>
 				</div>
 			</div>
@@ -52,20 +42,18 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, shallowRef, ref } from 'vue';
-import MkSelect from '@/components/MkSelect.vue';
-import MkPagination from '@/components/MkPagination.vue';
-import XAbuseReport from '@/components/MkAbuseReport.vue';
+import { computed, ref, shallowRef } from 'vue';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
+import MkPagination from '@/components/MkPagination.vue';
+import MkSelect from '@/components/MkSelect.vue';
+import XAbuseReport, { type AbuseUserReport } from '@/components/MkAbuseReport.vue';
 
 const reports = shallowRef<InstanceType<typeof MkPagination>>();
 
-const state = ref('unresolved');
-const reporterOrigin = ref('combined');
-const targetUserOrigin = ref('combined');
-const searchUsername = ref('');
-const searchHost = ref('');
+const state = ref<'all' | 'unresolved' | 'resolved'>('unresolved');
+const reporterOrigin = ref<'combined' | 'local' | 'remote'>('combined');
+const targetUserOrigin = ref<'combined' | 'local' | 'remote'>('combined');
 
 const pagination = {
 	endpoint: 'admin/abuse-user-reports' as const,
@@ -77,9 +65,11 @@ const pagination = {
 	})),
 };
 
-function resolved(reportId) {
-	reports.value.removeItem(reportId);
-}
+const resolved = (reportId: string) => {
+	if (state.value === 'unresolved') {
+		reports.value?.removeItem(reportId);
+	}
+};
 
 const headerActions = computed(() => []);
 
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index cca0e8a82faf..3e75478fc77e 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -5080,6 +5080,7 @@ export type operations = {
               reporter: components['schemas']['UserDetailedNotMe'];
               targetUser: components['schemas']['UserDetailedNotMe'];
               assignee?: components['schemas']['UserDetailedNotMe'] | null;
+              forwarded: boolean;
             })[];
         };
       };