From 174f8022eb5828db3e9af01afcf72fe7526c4c57 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 2 Nov 2018 13:47:44 +0900 Subject: Refactor --- src/server/api/endpoints/games/reversi/games.ts | 10 +++------- src/server/api/endpoints/games/reversi/games/show.ts | 10 +++------- src/server/api/endpoints/games/reversi/games/surrender.ts | 10 +++------- src/server/api/endpoints/games/reversi/invitations.ts | 6 +++--- src/server/api/endpoints/games/reversi/match.ts | 11 ++++------- src/server/api/endpoints/games/reversi/match/cancel.ts | 6 +++--- 6 files changed, 19 insertions(+), 34 deletions(-) (limited to 'src/server/api/endpoints/games') diff --git a/src/server/api/endpoints/games/reversi/games.ts b/src/server/api/endpoints/games/reversi/games.ts index 9c7a7c4d74..2bebe36ef8 100644 --- a/src/server/api/endpoints/games/reversi/games.ts +++ b/src/server/api/endpoints/games/reversi/games.ts @@ -1,7 +1,6 @@ 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'; +import define from '../../../define'; export const meta = { params: { @@ -27,10 +26,7 @@ export const meta = { } }; -export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => { - const [ps, psErr] = getParams(meta, params); - if (psErr) return rej(psErr); - +export default define(meta, (ps, user) => new Promise(async (res, rej) => { // Check if both of sinceId and untilId is specified if (ps.sinceId && ps.untilId) { return rej('cannot set sinceId and untilId'); @@ -72,4 +68,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) = res(Promise.all(games.map(async (g) => await pack(g, user, { detail: false })))); -}); +})); diff --git a/src/server/api/endpoints/games/reversi/games/show.ts b/src/server/api/endpoints/games/reversi/games/show.ts index a2c84ae82d..c747202354 100644 --- a/src/server/api/endpoints/games/reversi/games/show.ts +++ b/src/server/api/endpoints/games/reversi/games/show.ts @@ -1,8 +1,7 @@ import $ from 'cafy'; import ID, { transform } from '../../../../../../misc/cafy-id'; import ReversiGame, { pack } from '../../../../../../models/games/reversi/game'; import Reversi from '../../../../../../games/reversi/core'; -import { ILocalUser } from '../../../../../../models/user'; -import getParams from '../../../../get-params'; +import define from '../../../../define'; export const meta = { params: { @@ -13,10 +12,7 @@ export const meta = { } }; -export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => { - const [ps, psErr] = getParams(meta, params); - if (psErr) return rej(psErr); - +export default define(meta, (ps, user) => new Promise(async (res, rej) => { const game = await ReversiGame.findOne({ _id: ps.gameId }); if (game == null) { @@ -39,4 +35,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) = board: o.board, turn: o.turn }, packed)); -}); +})); diff --git a/src/server/api/endpoints/games/reversi/games/surrender.ts b/src/server/api/endpoints/games/reversi/games/surrender.ts index 2860c154fe..aab88da664 100644 --- a/src/server/api/endpoints/games/reversi/games/surrender.ts +++ b/src/server/api/endpoints/games/reversi/games/surrender.ts @@ -1,8 +1,7 @@ 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'; import { publishReversiGameStream } from '../../../../../../stream'; +import define from '../../../../define'; export const meta = { desc: { @@ -22,10 +21,7 @@ export const meta = { } }; -export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => { - const [ps, psErr] = getParams(meta, params); - if (psErr) return rej(psErr); - +export default define(meta, (ps, user) => new Promise(async (res, rej) => { const game = await ReversiGame.findOne({ _id: ps.gameId }); if (game == null) { @@ -58,4 +54,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) = }); res(); -}); +})); diff --git a/src/server/api/endpoints/games/reversi/invitations.ts b/src/server/api/endpoints/games/reversi/invitations.ts index 3962282759..d808ff2e78 100644 --- a/src/server/api/endpoints/games/reversi/invitations.ts +++ b/src/server/api/endpoints/games/reversi/invitations.ts @@ -1,11 +1,11 @@ import Matching, { pack as packMatching } from '../../../../../models/games/reversi/matching'; -import { ILocalUser } from '../../../../../models/user'; +import define from '../../../define'; export const meta = { requireCredential: true }; -export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => { +export default define(meta, (ps, user) => new Promise(async (res, rej) => { // Find session const invitations = await Matching.find({ childId: user._id @@ -17,4 +17,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) = // Reponse res(Promise.all(invitations.map(async (i) => await packMatching(i, user)))); -}); +})); diff --git a/src/server/api/endpoints/games/reversi/match.ts b/src/server/api/endpoints/games/reversi/match.ts index f43650aeeb..e0f9c20cbb 100644 --- a/src/server/api/endpoints/games/reversi/match.ts +++ b/src/server/api/endpoints/games/reversi/match.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id'; import Matching, { pack as packMatching } from '../../../../../models/games/reversi/matching'; import ReversiGame, { pack as packGame } from '../../../../../models/games/reversi/game'; -import User, { ILocalUser } from '../../../../../models/user'; +import User from '../../../../../models/user'; import { publishMainStream, publishReversiStream } from '../../../../../stream'; import { eighteight } from '../../../../../games/reversi/maps'; -import getParams from '../../../get-params'; +import define from '../../../define'; export const meta = { requireCredential: true, @@ -17,10 +17,7 @@ export const meta = { } }; -export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => { - const [ps, psErr] = getParams(meta, params); - if (psErr) return rej(psErr); - +export default define(meta, (ps, user) => new Promise(async (res, rej) => { // Myself if (ps.userId.equals(user._id)) { return rej('invalid userId param'); @@ -103,4 +100,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) = publishMainStream(child._id, 'reversiInvited', packed); } -}); +})); diff --git a/src/server/api/endpoints/games/reversi/match/cancel.ts b/src/server/api/endpoints/games/reversi/match/cancel.ts index d5c186409c..ac51e416ed 100644 --- a/src/server/api/endpoints/games/reversi/match/cancel.ts +++ b/src/server/api/endpoints/games/reversi/match/cancel.ts @@ -1,14 +1,14 @@ import Matching from '../../../../../../models/games/reversi/matching'; -import { ILocalUser } from '../../../../../../models/user'; +import define from '../../../../define'; export const meta = { requireCredential: true }; -export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => { +export default define(meta, (ps, user) => new Promise(async (res, rej) => { await Matching.remove({ parentId: user._id }); res(); -}); +})); -- cgit v1.2.3-freya