enhance(abuses): 通報一覧ページの改修

* fix(admin/abuse-user-reports): forwarded, moderationNote が含まれていない問題 * fix(MkAbuseReport): 通報一覧で描画が崩れる問題
taiyme · May 23, 2024 · 4f1c4bb · 4f1c4bb
1 parent bad02fd
commit 4f1c4bb
Show file tree

Hide file tree

Showing 8 changed files with 264 additions and 101 deletions.
diff --git 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
@@ -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
@@ -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
@@ -404,19 +404,21 @@ 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 });
 
 		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
@@ -74,6 +74,10 @@ export const meta = {
 					nullable: true, optional: true,
 					ref: 'UserDetailedNotMe',
 				},
+				forwarded: {
+					type: 'boolean',
+					nullable: false, optional: false,
+				},
 			},
 		},
 	},