From 11439afde76015b80e8d2e680808161cbc1800d5 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 5 Jul 2018 23:36:07 +0900
Subject: wip

---
 src/server/api/get-params.ts | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/server/api/get-params.ts')

diff --git a/src/server/api/get-params.ts b/src/server/api/get-params.ts
index 6b047a28f4..e495e3ef3e 100644
--- a/src/server/api/get-params.ts
+++ b/src/server/api/get-params.ts
@@ -1,25 +1,22 @@
-import { Query } from 'cafy';
+import { Context } from 'cafy';
 
 type Defs = {
-	params: {[key: string]: {
-		def: Query<any>;
-		default?: any;
-	}}
+	params: { [key: string]: Context<any> }
 };
 
 export default function <T extends Defs>(defs: T, params: any): [{
-	[P in keyof T['params']]: ReturnType<T['params'][P]['def']['get']>[0];
+	[P in keyof T['params']]: ReturnType<T['params'][P]['get']>[0];
 }, Error] {
 	const x: any = {};
 	let err: Error = null;
 	Object.keys(defs.params).some(k => {
-		const [v, e] = defs.params[k].def.get(params[k]);
+		const [v, e] = defs.params[k].get(params[k]);
 		if (e) {
 			err = e;
 			return true;
 		} else {
-			if (v === undefined && defs.params[k].default) {
-				x[k] = defs.params[k].default;
+			if (v === undefined && defs.params[k].data.default) {
+				x[k] = defs.params[k].data.default;
 			} else {
 				x[k] = v;
 			}
-- 
cgit v1.2.3-freya