1 files changed, 32 insertions, 23 deletions

diff --git a/src/server/api/endpoints/games/reversi/games.ts b/src/server/api/endpoints/games/reversi/games.ts
index 2838940b5c..9c7a7c4d74 100644
--- a/src/server/api/endpoints/games/reversi/games.ts
+++ b/src/server/api/endpoints/games/reversi/games.ts
@@ -1,33 +1,42 @@
-import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
+import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
 import ReversiGame, { pack } from '../../../../../models/games/reversi/game';
 import { ILocalUser } from '../../../../../models/user';
+import getParams from '../../../get-params';
 
 export const meta = {
-};
+	params: {
+		limit: {
+			validator: $.num.optional.range(1, 100),
+			default: 10
+		},
 
-export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
-	// Get 'my' parameter
-	const [my = false, myErr] = $.bool.optional.get(params.my);
-	if (myErr) return rej('invalid my param');
+		sinceId: {
+			validator: $.type(ID).optional,
+			transform: transform,
+		},
 
-	// Get 'limit' parameter
-	const [limit = 10, limitErr] = $.num.optional.range(1, 100).get(params.limit);
-	if (limitErr) return rej('invalid limit param');
+		untilId: {
+			validator: $.type(ID).optional,
+			transform: transform,
+		},
 
-	// Get 'sinceId' parameter
-	const [sinceId, sinceIdErr] = $.type(ID).optional.get(params.sinceId);
-	if (sinceIdErr) return rej('invalid sinceId param');
+		my: {
+			validator: $.bool.optional,
+			default: false
+		}
+	}
+};
 
-	// Get 'untilId' parameter
-	const [untilId, untilIdErr] = $.type(ID).optional.get(params.untilId);
-	if (untilIdErr) return rej('invalid untilId param');
+export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
+	const [ps, psErr] = getParams(meta, params);
+	if (psErr) return rej(psErr);
 
 	// Check if both of sinceId and untilId is specified
-	if (sinceId && untilId) {
+	if (ps.sinceId && ps.untilId) {
 		return rej('cannot set sinceId and untilId');
 	}
 
-	const q: any = my ? {
+	const q: any = ps.my ? {
 		isStarted: true,
 		$or: [{
 			user1Id: user._id
@@ -42,21 +51,21 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 		_id: -1
 	};
 
-	if (sinceId) {
+	if (ps.sinceId) {
 		sort._id = 1;
 		q._id = {
-			$gt: sinceId
+			$gt: ps.sinceId
 		};
-	} else if (untilId) {
+	} else if (ps.untilId) {
 		q._id = {
-			$lt: untilId
+			$lt: ps.untilId
 		};
 	}
 
 	// Fetch games
 	const games = await ReversiGame.find(q, {
-		sort,
-		limit
+		sort: sort,
+		limit: ps.limit
 	});
 
 	// Reponse