From db3724cf33c402d66700f89b319b423887466757 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 28 May 2021 09:34:42 +0900
Subject: improve types

---
 src/server/api/define.ts                         | 7 +++++--
 src/server/api/endpoints/gallery/posts/create.ts | 3 ++-
 src/server/api/endpoints/gallery/posts/update.ts | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/server/api')

diff --git a/src/server/api/define.ts b/src/server/api/define.ts
index 432d5017e8..cba69cfdc4 100644
--- a/src/server/api/define.ts
+++ b/src/server/api/define.ts
@@ -5,6 +5,8 @@ import { ApiError } from './error';
 import { SchemaType } from '@/misc/schema';
 import { AccessToken } from '../../models/entities/access-token';
 
+type NonOptional<T> = T extends undefined ? never : T;
+
 type SimpleUserInfo = {
 	id: ILocalUser['id'];
 	host: ILocalUser['host'];
@@ -17,11 +19,12 @@ type SimpleUserInfo = {
 	isSilenced: ILocalUser['isSilenced'];
 };
 
-// TODO: defaultが設定されている場合はその型も考慮する
 type Params<T extends IEndpointMeta> = {
 	[P in keyof T['params']]: NonNullable<T['params']>[P]['transform'] extends Function
 		? ReturnType<NonNullable<T['params']>[P]['transform']>
-		: ReturnType<NonNullable<T['params']>[P]['validator']['get']>[0];
+		: NonNullable<T['params']>[P]['default'] extends null | number | string
+			? NonOptional<ReturnType<NonNullable<T['params']>[P]['validator']['get']>[0]>
+			: ReturnType<NonNullable<T['params']>[P]['validator']['get']>[0];
 };
 
 export type Response = Record<string, any> | void;
diff --git a/src/server/api/endpoints/gallery/posts/create.ts b/src/server/api/endpoints/gallery/posts/create.ts
index d1ae68b126..ed24a45f88 100644
--- a/src/server/api/endpoints/gallery/posts/create.ts
+++ b/src/server/api/endpoints/gallery/posts/create.ts
@@ -6,6 +6,7 @@ import { DriveFiles, GalleryPosts } from '../../../../../models';
 import { genId } from '../../../../../misc/gen-id';
 import { GalleryPost } from '../../../../../models/entities/gallery-post';
 import { ApiError } from '../../../error';
+import { DriveFile } from '@/models/entities/drive-file';
 
 export const meta = {
 	tags: ['gallery'],
@@ -55,7 +56,7 @@ export default define(meta, async (ps, user) => {
 			id: fileId,
 			userId: user.id
 		})
-	))).filter(file => file != null);
+	))).filter((file): file is DriveFile => file != null);
 
 	if (files.length === 0) {
 		throw new Error();
diff --git a/src/server/api/endpoints/gallery/posts/update.ts b/src/server/api/endpoints/gallery/posts/update.ts
index c8bb8d48c9..d9176ea407 100644
--- a/src/server/api/endpoints/gallery/posts/update.ts
+++ b/src/server/api/endpoints/gallery/posts/update.ts
@@ -5,6 +5,7 @@ import { ID } from '../../../../../misc/cafy-id';
 import { DriveFiles, GalleryPosts } from '../../../../../models';
 import { GalleryPost } from '../../../../../models/entities/gallery-post';
 import { ApiError } from '../../../error';
+import { DriveFile } from '@/models/entities/drive-file';
 
 export const meta = {
 	tags: ['gallery'],
@@ -58,7 +59,7 @@ export default define(meta, async (ps, user) => {
 			id: fileId,
 			userId: user.id
 		})
-	))).filter(file => file != null);
+	))).filter((file): file is DriveFile => file != null);
 
 	if (files.length === 0) {
 		throw new Error();
-- 
cgit v1.2.3-freya