From f69867fcffd0ffbb1ea393cc2bf718bb59e8755e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 3 Feb 2022 21:09:07 +0900
Subject: [PATCH] refactor

---
 .../admin/resolve-abuse-user-report.ts        |   4 +-
 .../server/api/endpoints/admin/show-user.ts   | 138 ------------------
 .../src/server/api/endpoints/announcements.ts |   6 +-
 3 files changed, 7 insertions(+), 141 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts b/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts
index b00457f09..a47b69ec1 100644
--- a/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts
+++ b/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts
@@ -36,9 +36,9 @@ export default define(meta, async (ps, me) => {
 
 	if (ps.forward && report.targetUserHost != null) {
 		const actor = await getInstanceActor();
-		const targetUser = await Users.findOne(report.targetUserId);
+		const targetUser = await Users.findOneOrFail(report.targetUserId);
 
-		deliver(actor, renderActivity(renderFlag(actor, [targetUser.uri], report.comment)), targetUser.inbox);
+		deliver(actor, renderActivity(renderFlag(actor, [targetUser.uri!], report.comment)), targetUser.inbox);
 	}
 
 	await AbuseUserReports.update(report.id, {
diff --git a/packages/backend/src/server/api/endpoints/admin/show-user.ts b/packages/backend/src/server/api/endpoints/admin/show-user.ts
index c2a6a294b..0d0cc9087 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-user.ts
@@ -18,144 +18,6 @@ export const meta = {
 	res: {
 		type: 'object',
 		nullable: false, optional: false,
-		properties: {
-			id: {
-				type: 'string',
-				nullable: false, optional: false,
-				format: 'id',
-			},
-			createdAt: {
-				type: 'string',
-				nullable: false, optional: false,
-				format: 'date-time',
-			},
-			updatedAt: {
-				type: 'string',
-				nullable: true, optional: false,
-				format: 'date-time',
-			},
-			lastFetchedAt: {
-				type: 'string',
-				nullable: true, optional: false,
-			},
-			username: {
-				type: 'string',
-				nullable: false, optional: false,
-			},
-			name: {
-				type: 'string',
-				nullable: true, optional: false,
-			},
-			folowersCount: {
-				type: 'number',
-				nullable: false, optional: true,
-			},
-			followingCount: {
-				type: 'number',
-				nullable: false, optional: false,
-			},
-			notesCount: {
-				type: 'number',
-				nullable: false, optional: false,
-			},
-			avatarId: {
-				type: 'string',
-				nullable: true, optional: false,
-			},
-			bannerId: {
-				type: 'string',
-				nullable: true, optional: false,
-			},
-			tags: {
-				type: 'array',
-				nullable: false, optional: false,
-				items: {
-					type: 'string',
-					nullable: false, optional: false,
-				},
-			},
-			avatarUrl: {
-				type: 'string',
-				nullable: true, optional: false,
-				format: 'url',
-			},
-			bannerUrl: {
-				type: 'string',
-				nullable: true, optional: false,
-				format: 'url',
-			},
-			avatarBlurhash: {
-				type: 'any',
-				nullable: true, optional: false,
-				default: null,
-			},
-			bannerBlurhash: {
-				type: 'any',
-				nullable: true, optional: false,
-				default: null,
-			},
-			isSuspended: {
-				type: 'boolean',
-				nullable: false, optional: false,
-			},
-			isSilenced: {
-				type: 'boolean',
-				nullable: false, optional: false,
-			},
-			isLocked: {
-				type: 'boolean',
-				nullable: false, optional: false,
-			},
-			isBot: {
-				type: 'boolean',
-				nullable: false, optional: false,
-			},
-			isCat: {
-				type: 'boolean',
-				nullable: false, optional: false,
-			},
-			isAdmin: {
-				type: 'boolean',
-				nullable: false, optional: false,
-			},
-			isModerator: {
-				type: 'boolean',
-				nullable: false, optional: false,
-			},
-			emojis: {
-				type: 'array',
-				nullable: false, optional: false,
-				items: {
-					type: 'string',
-					nullable: false, optional: false,
-				},
-			},
-			host: {
-				type: 'string',
-				nullable: true, optional: false,
-			},
-			inbox: {
-				type: 'string',
-				nullable: true, optional: false,
-			},
-			sharedInbox: {
-				type: 'string',
-				nullable: true, optional: false,
-			},
-			featured: {
-				type: 'string',
-				nullable: true, optional: false,
-			},
-			uri: {
-				type: 'string',
-				nullable: true, optional: false,
-			},
-			token: {
-				type: 'string',
-				nullable: true, optional: false,
-				default: '<MASKED>',
-			},
-		},
 	},
 } as const;
 
diff --git a/packages/backend/src/server/api/endpoints/announcements.ts b/packages/backend/src/server/api/endpoints/announcements.ts
index 0bd29607d..22c13743a 100644
--- a/packages/backend/src/server/api/endpoints/announcements.ts
+++ b/packages/backend/src/server/api/endpoints/announcements.ts
@@ -89,5 +89,9 @@ export default define(meta, async (ps, user) => {
 		}
 	}
 
-	return ps.withUnreads ? announcements.filter((a: any) => !a.isRead) : announcements;
+	return (ps.withUnreads ? announcements.filter((a: any) => !a.isRead) : announcements).map((a) => ({
+		...a,
+		createdAt: a.createdAt.toISOString(),
+		updatedAt: a.updatedAt?.toISOString() ?? null,
+	}));
 });