Use cafy

14 files changed, 42 insertions, 42 deletions

diff --git a/src/api/endpoints/posts/context.ts b/src/api/endpoints/posts/context.ts
index 7bccecfb98..11dd43fe97 100644
--- a/src/api/endpoints/posts/context.ts
+++ b/src/api/endpoints/posts/context.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from '../../it';
+import it from 'cafy';
 import Post from '../../models/post';
 import serialize from '../../serializers/post';
 
@@ -18,11 +18,11 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	if (postIdErr) return rej('invalid post_id param');
 
 	// Get 'limit' parameter
-	const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed();
+	const [limit = 10, limitErr] = it(params.limit).expect.number().range(1, 100).get();
 	if (limitErr) return rej('invalid limit param');
 
 	// Get 'offset' parameter
-	const [offset, offsetErr] = it(params.offset).expect.number().min(0).default(0).qed();
+	const [offset = 0, offsetErr] = it(params.offset).expect.number().min(0).get();
 	if (offsetErr) return rej('invalid offset param');
 
 	// Lookup post
diff --git a/src/api/endpoints/posts/create.ts b/src/api/endpoints/posts/create.ts
index dfc9866515..3737012a30 100644
--- a/src/api/endpoints/posts/create.ts
+++ b/src/api/endpoints/posts/create.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from '../../it';
+import it from 'cafy';
 import parse from '../../../common/text';
 import Post from '../../models/post';
 import { isValidText } from '../../models/post';
@@ -23,11 +23,11 @@ import config from '../../../conf';
  */
 module.exports = (params, user, app) => new Promise(async (res, rej) => {
 	// Get 'text' parameter
-	const [text, textErr] = it(params.text).must.be.a.string().validate(isValidText).qed();
+	const [text, textErr] = it(params.text).must.be.a.string().validate(isValidText).get();
 	if (textErr) return rej('invalid text');
 
 	// Get 'media_ids' parameter
-	const [mediaIds, mediaIdsErr] = it(params.media_ids).must.be.an.array().unique().range(1, 4).qed();
+	const [mediaIds, mediaIdsErr] = it(params.media_ids).must.be.an.array().unique().range(1, 4).get();
 	if (mediaIdsErr) return rej('invalid media_ids');
 
 	let files = [];
@@ -36,7 +36,7 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => {
 		// forEach だと途中でエラーなどがあっても return できないので
 		// 敢えて for を使っています。
 		for (let i = 0; i < mediaIds.length; i++) {
-			const [mediaId, mediaIdErr] = it(mediaIds[i]).must.be.an.id().required().qed();
+			const [mediaId, mediaIdErr] = it(mediaIds[i]).must.be.an.id().required().get();
 			if (mediaIdErr) return rej('invalid media id');
 
 			// Fetch file
@@ -59,7 +59,7 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => {
 	}
 
 	// Get 'repost_id' parameter
-	const [repostId, repostIdErr] = it(params.repost_id).must.be.an.id().qed();
+	const [repostId, repostIdErr] = it(params.repost_id).must.be.an.id().get();
 	if (repostIdErr) return rej('invalid repost_id');
 
 	let repost = null;
@@ -138,7 +138,7 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => {
 					if (choice.trim().length > 50) return true;
 					return false;
 				}))
-				.qed();
+				.get();
 		if (pollChoicesErr) return rej('invalid poll choices');
 
 		_poll.choices = pollChoices.map((choice, i) => ({
diff --git a/src/api/endpoints/posts/favorites/create.ts b/src/api/endpoints/posts/favorites/create.ts
index 7ae77778e3..bf316b3573 100644
--- a/src/api/endpoints/posts/favorites/create.ts
+++ b/src/api/endpoints/posts/favorites/create.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from '../../../it';
+import it from 'cafy';
 import Favorite from '../../../models/favorite';
 import Post from '../../../models/post';
 
diff --git a/src/api/endpoints/posts/favorites/delete.ts b/src/api/endpoints/posts/favorites/delete.ts
index 437863d06c..5d4ad0a79d 100644
--- a/src/api/endpoints/posts/favorites/delete.ts
+++ b/src/api/endpoints/posts/favorites/delete.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from '../../../it';
+import it from 'cafy';
 import Favorite from '../../../models/favorite';
 import Post from '../../../models/post';
 
diff --git a/src/api/endpoints/posts/likes.ts b/src/api/endpoints/posts/likes.ts
index 88d3a6e1de..8aca5f9904 100644
--- a/src/api/endpoints/posts/likes.ts
+++ b/src/api/endpoints/posts/likes.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from '../../it';
+import it from 'cafy';
 import Post from '../../models/post';
 import Like from '../../models/like';
 import serialize from '../../serializers/user';
@@ -19,15 +19,15 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	if (postIdErr) return rej('invalid post_id param');
 
 	// Get 'limit' parameter
-	const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed();
+	const [limit = 10, limitErr] = it(params.limit).expect.number().range(1, 100).get();
 	if (limitErr) return rej('invalid limit param');
 
 	// Get 'offset' parameter
-	const [offset, offsetErr] = it(params.offset).expect.number().min(0).default(0).qed();
+	const [offset = 0, offsetErr] = it(params.offset).expect.number().min(0).get();
 	if (offsetErr) return rej('invalid offset param');
 
 	// Get 'sort' parameter
-	const [sort, sortError] = it(params.sort).expect.string().or('desc asc').default('desc').qed();
+	const [sort = 'desc', sortError] = it(params.sort).expect.string().or('desc asc').get();
 	if (sortError) return rej('invalid sort param');
 
 	// Lookup post
diff --git a/src/api/endpoints/posts/likes/create.ts b/src/api/endpoints/posts/likes/create.ts
index 43e76d1a58..9447cba247 100644
--- a/src/api/endpoints/posts/likes/create.ts
+++ b/src/api/endpoints/posts/likes/create.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from '../../../it';
+import it from 'cafy';
 import Like from '../../../models/like';
 import Post from '../../../models/post';
 import User from '../../../models/user';
diff --git a/src/api/endpoints/posts/likes/delete.ts b/src/api/endpoints/posts/likes/delete.ts
index bd2f83e21d..411a1d53ca 100644
--- a/src/api/endpoints/posts/likes/delete.ts
+++ b/src/api/endpoints/posts/likes/delete.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from '../../../it';
+import it from 'cafy';
 import Like from '../../../models/like';
 import Post from '../../../models/post';
 import User from '../../../models/user';
diff --git a/src/api/endpoints/posts/mentions.ts b/src/api/endpoints/posts/mentions.ts
index 3f54674955..677df52b28 100644
--- a/src/api/endpoints/posts/mentions.ts
+++ b/src/api/endpoints/posts/mentions.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from '../../it';
+import it from 'cafy';
 import Post from '../../models/post';
 import getFriends from '../../common/get-friends';
 import serialize from '../../serializers/post';
@@ -15,20 +15,20 @@ import serialize from '../../serializers/post';
  */
 module.exports = (params, user) => new Promise(async (res, rej) => {
 	// Get 'following' parameter
-	const [following, followingError] =
-		it(params.following).expect.boolean().default(false).qed();
+	const [following = false, followingError] =
+		it(params.following).expect.boolean().get();
 	if (followingError) return rej('invalid following param');
 
 	// Get 'limit' parameter
-	const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed();
+	const [limit = 10, limitErr] = it(params.limit).expect.number().range(1, 100).get();
 	if (limitErr) return rej('invalid limit param');
 
 	// Get 'since_id' parameter
-	const [sinceId, sinceIdErr] = it(params.since_id).expect.id().qed();
+	const [sinceId, sinceIdErr] = it(params.since_id).expect.id().get();
 	if (sinceIdErr) return rej('invalid since_id param');
 
 	// Get 'max_id' parameter
-	const [maxId, maxIdErr] = it(params.max_id).expect.id().qed();
+	const [maxId, maxIdErr] = it(params.max_id).expect.id().get();
 	if (maxIdErr) return rej('invalid max_id param');
 
 	// Check if both of since_id and max_id is specified
diff --git a/src/api/endpoints/posts/polls/vote.ts b/src/api/endpoints/posts/polls/vote.ts
index 36d0de975b..d049041b2f 100644
--- a/src/api/endpoints/posts/polls/vote.ts
+++ b/src/api/endpoints/posts/polls/vote.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from '../../../it';
+import it from 'cafy';
 import Vote from '../../../models/poll-vote';
 import Post from '../../../models/post';
 import notify from '../../../common/notify';
@@ -36,7 +36,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 		it(params.choice).expect.string()
 			.required()
 			.validate(c => post.poll.choices.some(x => x.id == c))
-			.qed();
+			.get();
 	if (choiceError) return rej('invalid choice param');
 
 	// if already voted
diff --git a/src/api/endpoints/posts/replies.ts b/src/api/endpoints/posts/replies.ts
index 378ba7ec2b..9279cd66f6 100644
--- a/src/api/endpoints/posts/replies.ts
+++ b/src/api/endpoints/posts/replies.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from '../../it';
+import it from 'cafy';
 import Post from '../../models/post';
 import serialize from '../../serializers/post';
 
@@ -18,15 +18,15 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	if (postIdErr) return rej('invalid post_id param');
 
 	// Get 'limit' parameter
-	const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed();
+	const [limit = 10, limitErr] = it(params.limit).expect.number().range(1, 100)).get();
 	if (limitErr) return rej('invalid limit param');
 
 	// Get 'offset' parameter
-	const [offset, offsetErr] = it(params.offset).expect.number().min(0).default(0).qed();
+	const [offset = 0, offsetErr] = it(params.offset).expect.number().min(0).get();
 	if (offsetErr) return rej('invalid offset param');
 
 	// Get 'sort' parameter
-	const [sort, sortError] = it(params.sort).expect.string().or('desc asc').default('desc').qed();
+	const [sort = 'desc', sortError] = it(params.sort).expect.string().or('desc asc').get();
 	if (sortError) return rej('invalid sort param');
 
 	// Lookup post
diff --git a/src/api/endpoints/posts/reposts.ts b/src/api/endpoints/posts/reposts.ts
index fc9b56cfc4..14de17992d 100644
--- a/src/api/endpoints/posts/reposts.ts
+++ b/src/api/endpoints/posts/reposts.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from '../../it';
+import it from 'cafy';
 import Post from '../../models/post';
 import serialize from '../../serializers/post';
 
@@ -18,15 +18,15 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	if (postIdErr) return rej('invalid post_id param');
 
 	// Get 'limit' parameter
-	const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed();
+	const [limit = 10, limitErr] = it(params.limit).expect.number().range(1, 100).get();
 	if (limitErr) return rej('invalid limit param');
 
 	// Get 'since_id' parameter
-	const [sinceId, sinceIdErr] = it(params.since_id).expect.id().qed();
+	const [sinceId, sinceIdErr] = it(params.since_id).expect.id().get();
 	if (sinceIdErr) return rej('invalid since_id param');
 
 	// Get 'max_id' parameter
-	const [maxId, maxIdErr] = it(params.max_id).expect.id().qed();
+	const [maxId, maxIdErr] = it(params.max_id).expect.id().get();
 	if (maxIdErr) return rej('invalid max_id param');
 
 	// Check if both of since_id and max_id is specified
diff --git a/src/api/endpoints/posts/search.ts b/src/api/endpoints/posts/search.ts
index e869701a30..04b845bc3a 100644
--- a/src/api/endpoints/posts/search.ts
+++ b/src/api/endpoints/posts/search.ts
@@ -2,7 +2,7 @@
  * Module dependencies
  */
 import * as mongo from 'mongodb';
-import it from '../../it';
+import it from 'cafy';
 const escapeRegexp = require('escape-regexp');
 import Post from '../../models/post';
 import serialize from '../../serializers/post';
@@ -17,15 +17,15 @@ import config from '../../../conf';
  */
 module.exports = (params, me) => new Promise(async (res, rej) => {
 	// Get 'query' parameter
-	const [query, queryError] = it(params.query).expect.string().required().trim().validate(x => x != '').qed();
+	const [query, queryError] = it(params.query).expect.string().required().trim().validate(x => x != '').get();
 	if (queryError) return rej('invalid query param');
 
 	// Get 'offset' parameter
-	const [offset, offsetErr] = it(params.offset).expect.number().min(0).default(0).qed();
+	const [offset = 0, offsetErr] = it(params.offset).expect.number().min(0).get();
 	if (offsetErr) return rej('invalid offset param');
 
 	// Get 'max' parameter
-	const [max, maxErr] = it(params.max).expect.number().range(1, 30).default(10).qed();
+	const [max = 10, maxErr] = it(params.max).expect.number().range(1, 30).get();
 	if (maxErr) return rej('invalid max param');
 
 	// If Elasticsearch is available, search by it
diff --git a/src/api/endpoints/posts/show.ts b/src/api/endpoints/posts/show.ts
index 0ff1947e98..e19a3dae78 100644
--- a/src/api/endpoints/posts/show.ts
+++ b/src/api/endpoints/posts/show.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from '../../it';
+import it from 'cafy';
 import Post from '../../models/post';
 import serialize from '../../serializers/post';
 
diff --git a/src/api/endpoints/posts/timeline.ts b/src/api/endpoints/posts/timeline.ts
index 83a96e6c65..02fdf4a17c 100644
--- a/src/api/endpoints/posts/timeline.ts
+++ b/src/api/endpoints/posts/timeline.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from '../../it';
+import it from 'cafy';
 import Post from '../../models/post';
 import getFriends from '../../common/get-friends';
 import serialize from '../../serializers/post';
@@ -16,15 +16,15 @@ import serialize from '../../serializers/post';
  */
 module.exports = (params, user, app) => new Promise(async (res, rej) => {
 	// Get 'limit' parameter
-	const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed();
+	const [limit = 10, limitErr] = it(params.limit).expect.number().range(1, 100).get();
 	if (limitErr) return rej('invalid limit param');
 
 	// Get 'since_id' parameter
-	const [sinceId, sinceIdErr] = it(params.since_id).expect.id().qed();
+	const [sinceId, sinceIdErr] = it(params.since_id).expect.id().get();
 	if (sinceIdErr) return rej('invalid since_id param');
 
 	// Get 'max_id' parameter
-	const [maxId, maxIdErr] = it(params.max_id).expect.id().qed();
+	const [maxId, maxIdErr] = it(params.max_id).expect.id().get();
 	if (maxIdErr) return rej('invalid max_id param');
 
 	// Check if both of since_id and max_id is specified