Refactor

17 files changed, 61 insertions, 114 deletions

diff --git a/src/server/api/endpoints/i/2fa/done.ts b/src/server/api/endpoints/i/2fa/done.ts
index 40b45a3d0b..2ee0c8886e 100644
--- a/src/server/api/endpoints/i/2fa/done.ts
+++ b/src/server/api/endpoints/i/2fa/done.ts
@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import * as speakeasy from 'speakeasy';
-import User, { ILocalUser } from '../../../../../models/user';
-import getParams from '../../../get-params';
+import User from '../../../../../models/user';
+import define from '../../../define';
 
 export const meta = {
 	requireCredential: true,
@@ -15,10 +15,7 @@ export const meta = {
 	}
 };
 
-export default async (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 _token = ps.token.replace(/\s/g, '');
 
 	if (user.twoFactorTempSecret == null) {
@@ -43,4 +40,4 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
 	});
 
 	res();
-});
+}));
diff --git a/src/server/api/endpoints/i/2fa/register.ts b/src/server/api/endpoints/i/2fa/register.ts
index 4d6b05b787..38e3ca7806 100644
--- a/src/server/api/endpoints/i/2fa/register.ts
+++ b/src/server/api/endpoints/i/2fa/register.ts
@@ -2,9 +2,9 @@ import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
 import * as speakeasy from 'speakeasy';
 import * as QRCode from 'qrcode';
-import User, { ILocalUser } from '../../../../../models/user';
+import User from '../../../../../models/user';
 import config from '../../../../../config';
-import getParams from '../../../get-params';
+import define from '../../../define';
 
 export const meta = {
 	requireCredential: true,
@@ -18,10 +18,7 @@ export const meta = {
 	}
 };
 
-export default async (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) => {
 	// Compare password
 	const same = await bcrypt.compare(ps.password, user.password);
 
@@ -54,4 +51,4 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
 			issuer: config.host
 		});
 	});
-});
+}));
diff --git a/src/server/api/endpoints/i/2fa/unregister.ts b/src/server/api/endpoints/i/2fa/unregister.ts
index e3a1bd43de..2cb48d93cd 100644
--- a/src/server/api/endpoints/i/2fa/unregister.ts
+++ b/src/server/api/endpoints/i/2fa/unregister.ts
@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
-import User, { ILocalUser } from '../../../../../models/user';
-import getParams from '../../../get-params';
+import User from '../../../../../models/user';
+import define from '../../../define';
 
 export const meta = {
 	requireCredential: true,
@@ -15,10 +15,7 @@ export const meta = {
 	}
 };
 
-export default async (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) => {
 	// Compare password
 	const same = await bcrypt.compare(ps.password, user.password);
 
@@ -34,4 +31,4 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
 	});
 
 	res();
-});
+}));
diff --git a/src/server/api/endpoints/i/authorized_apps.ts b/src/server/api/endpoints/i/authorized_apps.ts
index 09bcd2dcb6..c4b992b52f 100644
--- a/src/server/api/endpoints/i/authorized_apps.ts
+++ b/src/server/api/endpoints/i/authorized_apps.ts
@@ -1,8 +1,7 @@
 import $ from 'cafy';
 import AccessToken from '../../../../models/access-token';
 import { pack } from '../../../../models/app';
-import { ILocalUser } from '../../../../models/user';
-import getParams from '../../get-params';
+import define from '../../define';
 
 export const meta = {
 	requireCredential: true,
@@ -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) => {
 	// Get tokens
 	const tokens = await AccessToken
 		.find({
@@ -46,4 +42,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 	res(await Promise.all(tokens.map(token => pack(token.appId, user, {
 		detail: true
 	}))));
-});
+}));
diff --git a/src/server/api/endpoints/i/change_password.ts b/src/server/api/endpoints/i/change_password.ts
index 818637e224..a2cfc6f70e 100644
--- a/src/server/api/endpoints/i/change_password.ts
+++ b/src/server/api/endpoints/i/change_password.ts
@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
-import User, { ILocalUser } from '../../../../models/user';
-import getParams from '../../get-params';
+import User from '../../../../models/user';
+import define from '../../define';
 
 export const meta = {
 	requireCredential: true,
@@ -19,10 +19,7 @@ export const meta = {
 	}
 };
 
-export default async (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) => {
 	// Compare password
 	const same = await bcrypt.compare(ps.currentPassword, user.password);
 
@@ -41,4 +38,4 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
 	});
 
 	res();
-});
+}));
diff --git a/src/server/api/endpoints/i/favorites.ts b/src/server/api/endpoints/i/favorites.ts
index 847ac64d9a..67a3638885 100644
--- a/src/server/api/endpoints/i/favorites.ts
+++ b/src/server/api/endpoints/i/favorites.ts
@@ -1,7 +1,6 @@
 import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
 import Favorite, { packMany } from '../../../../models/favorite';
-import { ILocalUser } from '../../../../models/user';
-import getParams from '../../get-params';
+import define from '../../define';
 
 export const meta = {
 	desc: {
@@ -31,10 +30,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');
@@ -67,4 +63,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 		});
 
 	res(await packMany(favorites, user));
-});
+}));
diff --git a/src/server/api/endpoints/i/notifications.ts b/src/server/api/endpoints/i/notifications.ts
index d16ba63bdc..b1ddd40d13 100644
--- a/src/server/api/endpoints/i/notifications.ts
+++ b/src/server/api/endpoints/i/notifications.ts
@@ -4,8 +4,7 @@ import Mute from '../../../../models/mute';
 import { packMany } from '../../../../models/notification';
 import { getFriendIds } from '../../common/get-friends';
 import read from '../../common/read-notification';
-import { ILocalUser } from '../../../../models/user';
-import getParams from '../../get-params';
+import define from '../../define';
 
 export const meta = {
 	desc: {
@@ -45,10 +44,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');
@@ -105,4 +101,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 	if (notifications.length > 0 && ps.markAsRead) {
 		read(user._id, notifications);
 	}
-});
+}));
diff --git a/src/server/api/endpoints/i/pin.ts b/src/server/api/endpoints/i/pin.ts
index 4341906a57..ab8d8a1853 100644
--- a/src/server/api/endpoints/i/pin.ts
+++ b/src/server/api/endpoints/i/pin.ts
@@ -1,8 +1,7 @@
 import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
-import { ILocalUser } from '../../../../models/user';
 import { pack } from '../../../../models/user';
 import { addPinned } from '../../../../services/i/pin';
-import getParams from '../../get-params';
+import define from '../../define';
 
 export const meta = {
 	stability: 'stable',
@@ -27,10 +26,7 @@ export const meta = {
 	}
 };
 
-export default async (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) => {
 	// Processing
 	try {
 		await addPinned(user, ps.noteId);
@@ -45,4 +41,4 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
 
 	// Send response
 	res(iObj);
-});
+}));
diff --git a/src/server/api/endpoints/i/read_all_unread_notes.ts b/src/server/api/endpoints/i/read_all_unread_notes.ts
index 6a4f72ea29..7d63de4e19 100644
--- a/src/server/api/endpoints/i/read_all_unread_notes.ts
+++ b/src/server/api/endpoints/i/read_all_unread_notes.ts
@@ -1,6 +1,7 @@
-import User, { ILocalUser } from '../../../../models/user';
+import User from '../../../../models/user';
 import { publishMainStream } from '../../../../stream';
 import NoteUnread from '../../../../models/note-unread';
+import define from '../../define';
 
 export const meta = {
 	desc: {
@@ -16,7 +17,7 @@ export const meta = {
 	}
 };
 
-export default async (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
+export default define(meta, (ps, user) => new Promise(async (res, rej) => {
 	// Remove documents
 	await NoteUnread.remove({
 		userId: user._id
@@ -34,4 +35,4 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
 	publishMainStream(user._id, 'readAllUnreadSpecifiedNotes');
 
 	res();
-});
+}));
diff --git a/src/server/api/endpoints/i/regenerate_token.ts b/src/server/api/endpoints/i/regenerate_token.ts
index 81997362fc..5dfc3cd664 100644
--- a/src/server/api/endpoints/i/regenerate_token.ts
+++ b/src/server/api/endpoints/i/regenerate_token.ts
@@ -1,9 +1,9 @@
 import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
-import User, { ILocalUser } from '../../../../models/user';
+import User from '../../../../models/user';
 import { publishMainStream } from '../../../../stream';
 import generateUserToken from '../../common/generate-native-user-token';
-import getParams from '../../get-params';
+import define from '../../define';
 
 export const meta = {
 	requireCredential: true,
@@ -17,10 +17,7 @@ export const meta = {
 	}
 };
 
-export default async (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) => {
 	// Compare password
 	const same = await bcrypt.compare(ps.password, user.password);
 
@@ -41,4 +38,4 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
 
 	// Publish event
 	publishMainStream(user._id, 'myTokenRegenerated');
-});
+}));
diff --git a/src/server/api/endpoints/i/signin_history.ts b/src/server/api/endpoints/i/signin_history.ts
index df1cd34c8c..acf9349cd2 100644
--- a/src/server/api/endpoints/i/signin_history.ts
+++ b/src/server/api/endpoints/i/signin_history.ts
@@ -1,7 +1,6 @@
 import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
 import Signin, { pack } from '../../../../models/signin';
-import { ILocalUser } from '../../../../models/user';
-import getParams from '../../get-params';
+import define from '../../define';
 
 export const meta = {
 	requireCredential: true,
@@ -26,10 +25,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');
@@ -62,4 +58,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 
 	// Serialize
 	res(await Promise.all(history.map(record => pack(record))));
-});
+}));
diff --git a/src/server/api/endpoints/i/unpin.ts b/src/server/api/endpoints/i/unpin.ts
index 26ff8ccda1..27342fb43c 100644
--- a/src/server/api/endpoints/i/unpin.ts
+++ b/src/server/api/endpoints/i/unpin.ts
@@ -1,8 +1,7 @@
 import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
-import { ILocalUser } from '../../../../models/user';
 import { pack } from '../../../../models/user';
 import { removePinned } from '../../../../services/i/pin';
-import getParams from '../../get-params';
+import define from '../../define';
 
 export const meta = {
 	stability: 'stable',
@@ -27,10 +26,7 @@ export const meta = {
 	}
 };
 
-export default async (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) => {
 	// Processing
 	try {
 		await removePinned(user, ps.noteId);
@@ -45,4 +41,4 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
 
 	// Send response
 	res(iObj);
-});
+}));
diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts
index 93d4448092..7a16248305 100644
--- a/src/server/api/endpoints/i/update.ts
+++ b/src/server/api/endpoints/i/update.ts
@@ -5,7 +5,7 @@ import DriveFile from '../../../../models/drive-file';
 import acceptAllFollowRequests from '../../../../services/following/requests/accept-all';
 import { IApp } from '../../../../models/app';
 import { publishToFollowers } from '../../../../services/i/update';
-import getParams from '../../get-params';
+import define from '../../define';
 import getDriveFileUrl from '../../../../misc/get-drive-file-url';
 
 export const meta = {
@@ -115,10 +115,7 @@ export const meta = {
 	}
 };
 
-export default async (params: any, user: ILocalUser, app: IApp) => new Promise(async (res, rej) => {
-	const [ps, psErr] = getParams(meta, params);
-	if (psErr) return rej(psErr);
-
+export default define(meta, (ps, user, app) => new Promise(async (res, rej) => {
 	const isSecure = user != null && app == null;
 
 	const updates = {} as any;
@@ -209,4 +206,4 @@ export default async (params: any, user: ILocalUser, app: IApp) => new Promise(a
 
 	// フォロワーにUpdateを配信
 	publishToFollowers(user._id);
-});
+}));
diff --git a/src/server/api/endpoints/i/update_client_setting.ts b/src/server/api/endpoints/i/update_client_setting.ts
index a1631b1d95..03eb23a5a2 100644
--- a/src/server/api/endpoints/i/update_client_setting.ts
+++ b/src/server/api/endpoints/i/update_client_setting.ts
@@ -1,7 +1,7 @@
 import $ from 'cafy';
-import User, { ILocalUser } from '../../../../models/user';
+import User from '../../../../models/user';
 import { publishMainStream } from '../../../../stream';
-import getParams from '../../get-params';
+import define from '../../define';
 
 export const meta = {
 	requireCredential: true,
@@ -19,10 +19,7 @@ export const meta = {
 	}
 };
 
-export default async (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 x: any = {};
 	x[`clientSettings.${name}`] = ps.value;
 
@@ -37,4 +34,4 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
 		key: name,
 		value: ps.value
 	});
-});
+}));
diff --git a/src/server/api/endpoints/i/update_home.ts b/src/server/api/endpoints/i/update_home.ts
index eadd0290ab..f472600ee0 100644
--- a/src/server/api/endpoints/i/update_home.ts
+++ b/src/server/api/endpoints/i/update_home.ts
@@ -1,7 +1,7 @@
 import $ from 'cafy';
-import User, { ILocalUser } from '../../../../models/user';
+import User from '../../../../models/user';
 import { publishMainStream } from '../../../../stream';
-import getParams from '../../get-params';
+import define from '../../define';
 
 export const meta = {
 	requireCredential: true,
@@ -20,10 +20,7 @@ export const meta = {
 	}
 };
 
-export default async (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) => {
 	await User.update(user._id, {
 		$set: {
 			'clientSettings.home': ps.home
@@ -33,4 +30,4 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
 	res();
 
 	publishMainStream(user._id, 'homeUpdated', ps.home);
-});
+}));
diff --git a/src/server/api/endpoints/i/update_mobile_home.ts b/src/server/api/endpoints/i/update_mobile_home.ts
index c886574f23..792c4b7877 100644
--- a/src/server/api/endpoints/i/update_mobile_home.ts
+++ b/src/server/api/endpoints/i/update_mobile_home.ts
@@ -1,7 +1,7 @@
 import $ from 'cafy';
-import User, { ILocalUser } from '../../../../models/user';
+import User from '../../../../models/user';
 import { publishMainStream } from '../../../../stream';
-import getParams from '../../get-params';
+import define from '../../define';
 
 export const meta = {
 	requireCredential: true,
@@ -19,10 +19,7 @@ export const meta = {
 	}
 };
 
-export default async (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) => {
 	await User.update(user._id, {
 		$set: {
 			'clientSettings.mobileHome': ps.home
@@ -32,4 +29,4 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
 	res();
 
 	publishMainStream(user._id, 'mobileHomeUpdated', ps.home);
-});
+}));
diff --git a/src/server/api/endpoints/i/update_widget.ts b/src/server/api/endpoints/i/update_widget.ts
index 947a29074c..90fe8fbe23 100644
--- a/src/server/api/endpoints/i/update_widget.ts
+++ b/src/server/api/endpoints/i/update_widget.ts
@@ -1,7 +1,7 @@
 import $ from 'cafy';
-import User, { ILocalUser } from '../../../../models/user';
+import User from '../../../../models/user';
 import { publishMainStream } from '../../../../stream';
-import getParams from '../../get-params';
+import define from '../../define';
 
 export const meta = {
 	requireCredential: true,
@@ -19,10 +19,7 @@ export const meta = {
 	}
 };
 
-export default async (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) => {
 	if (ps.id == null && ps.data == null) return rej('you need to set id and data params if home param unset');
 
 	let widget;
@@ -88,4 +85,4 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
 	} else {
 		rej('widget not found');
 	}
-});
+}));