From f4b981cefed8ffbd18cc10efe79ebec51a9fd053 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 24 Sep 2022 10:25:32 +0900
Subject: [PATCH] fix type

---
 .../api/endpoints/admin/drive/show-file.ts    | 61 ++++++++++---------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts b/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts
index 25d13d13a..6180eeae2 100644
--- a/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts
+++ b/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts
@@ -76,23 +76,6 @@ export const meta = {
 			properties: {
 				type: 'object',
 				optional: false, nullable: false,
-				properties: {
-					width: {
-						type: 'number',
-						optional: false, nullable: false,
-						example: 1280,
-					},
-					height: {
-						type: 'number',
-						optional: false, nullable: false,
-						example: 720,
-					},
-					avgColor: {
-						type: 'string',
-						optional: true, nullable: false,
-						example: 'rgb(40,65,87)',
-					},
-				},
 			},
 			storedInternal: {
 				type: 'boolean',
@@ -116,15 +99,15 @@ export const meta = {
 			},
 			accessKey: {
 				type: 'string',
-				optional: false, nullable: false,
+				optional: false, nullable: true,
 			},
 			thumbnailAccessKey: {
 				type: 'string',
-				optional: false, nullable: false,
+				optional: false, nullable: true,
 			},
 			webpublicAccessKey: {
 				type: 'string',
-				optional: false, nullable: false,
+				optional: false, nullable: true,
 			},
 			uri: {
 				type: 'string',
@@ -192,14 +175,36 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				throw new ApiError(meta.errors.noSuchFile);
 			}
 
-			const res = file as Partial<typeof file>;
-
-			if (!me.isAdmin) {
-				delete res.requestIp;
-				delete res.requestHeaders;
-			}
-
-			return res;
+			return {
+				id: file.id,
+				userId: file.userId,
+				userHost: file.userHost,
+				isLink: file.isLink,
+				maybePorn: file.maybePorn,
+				maybeSensitive: file.maybeSensitive,
+				isSensitive: file.isSensitive,
+				folderId: file.folderId,
+				src: file.src,
+				uri: file.uri,
+				webpublicAccessKey: file.webpublicAccessKey,
+				thumbnailAccessKey: file.thumbnailAccessKey,
+				accessKey: file.accessKey,
+				webpublicType: file.webpublicType,
+				webpublicUrl: file.webpublicUrl,
+				thumbnailUrl: file.thumbnailUrl,
+				url: file.url,
+				storedInternal: file.storedInternal,
+				properties: file.properties,
+				blurhash: file.blurhash,
+				comment: file.comment,
+				size: file.size,
+				type: file.type,
+				name: file.name,
+				md5: file.md5,
+				createdAt: file.createdAt.toISOString(),
+				requestIp: me.isAdmin ? file.requestIp : null,
+				requestHeaders: me.isAdmin ? file.requestHeaders : null,
+			};
 		});
 	}
 }