:v:

7 files changed, 34 insertions, 34 deletions

diff --git a/src/api/endpoints/users/followers.ts b/src/api/endpoints/users/followers.ts
index 1b032245c8..4905323ba5 100644
--- a/src/api/endpoints/users/followers.ts
+++ b/src/api/endpoints/users/followers.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from 'cafy';
+import $ from 'cafy';
 import User from '../../models/user';
 import Following from '../../models/following';
 import serialize from '../../serializers/user';
@@ -16,19 +16,19 @@ import getFriends from '../../common/get-friends';
  */
 module.exports = (params, me) => new Promise(async (res, rej) => {
 	// Get 'user_id' parameter
-	const [userId, userIdErr] = it(params.user_id, 'id!').get();
+	const [userId, userIdErr] = $(params.user_id).id().$;
 	if (userIdErr) return rej('invalid user_id param');
 
 	// Get 'iknow' parameter
-	const [iknow = false, iknowErr] = it(params.iknow).expect.boolean().get();
+	const [iknow = false, iknowErr] = $(params.iknow).optional.boolean().$;
 	if (iknowErr) return rej('invalid iknow param');
 
 	// Get 'limit' parameter
-	const [limit = 10, limitErr] = it(params.limit).expect.number().range(1, 100).get();
+	const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).$;
 	if (limitErr) return rej('invalid limit param');
 
 	// Get 'cursor' parameter
-	const [cursor = null, cursorErr] = it(params.cursor).expect.id().get();
+	const [cursor = null, cursorErr] = $(params.cursor).optional.id().$;
 	if (cursorErr) return rej('invalid cursor param');
 
 	// Lookup user
diff --git a/src/api/endpoints/users/following.ts b/src/api/endpoints/users/following.ts
index 8eb175970b..dc2ff49bbe 100644
--- a/src/api/endpoints/users/following.ts
+++ b/src/api/endpoints/users/following.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from 'cafy';
+import $ from 'cafy';
 import User from '../../models/user';
 import Following from '../../models/following';
 import serialize from '../../serializers/user';
@@ -16,19 +16,19 @@ import getFriends from '../../common/get-friends';
  */
 module.exports = (params, me) => new Promise(async (res, rej) => {
 	// Get 'user_id' parameter
-	const [userId, userIdErr] = it(params.user_id, 'id!').get();
+	const [userId, userIdErr] = $(params.user_id).id().$;
 	if (userIdErr) return rej('invalid user_id param');
 
 	// Get 'iknow' parameter
-	const [iknow = false, iknowErr] = it(params.iknow).expect.boolean().get();
+	const [iknow = false, iknowErr] = $(params.iknow).optional.boolean().$;
 	if (iknowErr) return rej('invalid iknow param');
 
 	// Get 'limit' parameter
-	const [limit = 10, limitErr] = it(params.limit).expect.number().range(1, 100).get();
+	const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).$;
 	if (limitErr) return rej('invalid limit param');
 
 	// Get 'cursor' parameter
-	const [cursor = null, cursorErr] = it(params.cursor).expect.id().get();
+	const [cursor = null, cursorErr] = $(params.cursor).optional.id().$;
 	if (cursorErr) return rej('invalid cursor param');
 
 	// Lookup user
diff --git a/src/api/endpoints/users/posts.ts b/src/api/endpoints/users/posts.ts
index 7ac9f78237..e37b660773 100644
--- a/src/api/endpoints/users/posts.ts
+++ b/src/api/endpoints/users/posts.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from 'cafy';
+import $ from 'cafy';
 import Post from '../../models/post';
 import User from '../../models/user';
 import serialize from '../../serializers/post';
@@ -15,11 +15,11 @@ import serialize from '../../serializers/post';
  */
 module.exports = (params, me) => new Promise(async (res, rej) => {
 	// Get 'user_id' parameter
-	const [userId, userIdErr] = it(params.user_id, 'id').get();
+	const [userId, userIdErr] = $(params.user_id).optional.id().$;
 	if (userIdErr) return rej('invalid user_id param');
 
 	// Get 'username' parameter
-	const [username, usernameErr] = it(params.username, 'string').get();
+	const [username, usernameErr] = $(params.username).optional.string().$;
 	if (usernameErr) return rej('invalid username param');
 
 	if (userId === undefined && username === undefined) {
@@ -27,23 +27,23 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
 	}
 
 	// Get 'include_replies' parameter
-	const [includeReplies = true, includeRepliesErr] = it(params.include_replies).expect.boolean().get();
+	const [includeReplies = true, includeRepliesErr] = $(params.include_replies).optional.boolean().$;
 	if (includeRepliesErr) return rej('invalid include_replies param');
 
 	// Get 'with_media' parameter
-	const [withMedia = false, withMediaErr] = it(params.with_media).expect.boolean().get();
+	const [withMedia = false, withMediaErr] = $(params.with_media).optional.boolean().$;
 	if (withMediaErr) return rej('invalid with_media param');
 
 	// Get 'limit' parameter
-	const [limit = 10, limitErr] = it(params.limit).expect.number().range(1, 100).get();
+	const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).$;
 	if (limitErr) return rej('invalid limit param');
 
 	// Get 'since_id' parameter
-	const [sinceId, sinceIdErr] = it(params.since_id).expect.id().get();
+	const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
 	if (sinceIdErr) return rej('invalid since_id param');
 
 	// Get 'max_id' parameter
-	const [maxId, maxIdErr] = it(params.max_id).expect.id().get();
+	const [maxId, maxIdErr] = $(params.max_id).optional.id().$;
 	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/users/recommendation.ts b/src/api/endpoints/users/recommendation.ts
index a0fb6613c6..7f5e0b5f5c 100644
--- a/src/api/endpoints/users/recommendation.ts
+++ b/src/api/endpoints/users/recommendation.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from 'cafy';
+import $ from 'cafy';
 import User from '../../models/user';
 import serialize from '../../serializers/user';
 import getFriends from '../../common/get-friends';
@@ -15,14 +15,14 @@ import getFriends from '../../common/get-friends';
  */
 module.exports = (params, me) => new Promise(async (res, rej) => {
 	// Get 'limit' parameter
-	const [limit = 10, limitErr] = it(params.limit).expect.number().range(1, 100).get();
+	const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).$;
 	if (limitErr) return rej('invalid limit param');
 
 	// Get 'offset' parameter
-	const [offset = 0, offsetErr] = it(params.offset).expect.number().min(0).get();
+	const [offset = 0, offsetErr] = $(params.offset).optional.number().min(0).$;
 	if (offsetErr) return rej('invalid offset param');
 
-	// ID list of the user itself and other users who the user follows
+	// ID list of the user $self and other users who the user follows
 	const followingIds = await getFriends(me._id);
 
 	const users = await User
diff --git a/src/api/endpoints/users/search.ts b/src/api/endpoints/users/search.ts
index 8be6a4dc8c..a3f2fb796d 100644
--- a/src/api/endpoints/users/search.ts
+++ b/src/api/endpoints/users/search.ts
@@ -2,7 +2,7 @@
  * Module dependencies
  */
 import * as mongo from 'mongodb';
-import it from 'cafy';
+import $ from 'cafy';
 import User from '../../models/user';
 import serialize from '../../serializers/user';
 import config from '../../../conf';
@@ -17,18 +17,18 @@ const escapeRegexp = require('escape-regexp');
  */
 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 != '').get();
+	const [query, queryError] = $(params.query).string().pipe(x => x != '').$;
 	if (queryError) return rej('invalid query param');
 
 	// Get 'offset' parameter
-	const [offset = 0, offsetErr] = it(params.offset).expect.number().min(0).get();
+	const [offset = 0, offsetErr] = $(params.offset).optional.number().min(0).$;
 	if (offsetErr) return rej('invalid offset param');
 
 	// Get 'max' parameter
-	const [max = 10, maxErr] = it(params.max).expect.number().range(1, 30).get();
+	const [max = 10, maxErr] = $(params.max).optional.number().range(1, 30).$;
 	if (maxErr) return rej('invalid max param');
 
-	// If Elasticsearch is available, search by it
+	// If Elasticsearch is available, search by $
 	// If not, search by MongoDB
 	(config.elasticsearch.enable ? byElasticsearch : byNative)
 		(res, rej, me, query, offset, max);
diff --git a/src/api/endpoints/users/search_by_username.ts b/src/api/endpoints/users/search_by_username.ts
index b3193a4956..4d7a6e05b8 100644
--- a/src/api/endpoints/users/search_by_username.ts
+++ b/src/api/endpoints/users/search_by_username.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from 'cafy';
+import $ from 'cafy';
 import User from '../../models/user';
 import { validateUsername } from '../../models/user';
 import serialize from '../../serializers/user';
@@ -15,15 +15,15 @@ import serialize from '../../serializers/user';
  */
 module.exports = (params, me) => new Promise(async (res, rej) => {
 	// Get 'query' parameter
-	const [query, queryError] = it(params.query).expect.string().required().trim().validate(validateUsername).get();
+	const [query, queryError] = $(params.query).string().pipe(validateUsername).$;
 	if (queryError) return rej('invalid query param');
 
 	// Get 'offset' parameter
-	const [offset = 0, offsetErr] = it(params.offset).expect.number().min(0).get();
+	const [offset = 0, offsetErr] = $(params.offset).optional.number().min(0).$;
 	if (offsetErr) return rej('invalid offset param');
 
 	// Get 'limit' parameter
-	const [limit = 10, limitErr] = it(params.limit).expect.number().range(1, 100).get();
+	const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).$;
 	if (limitErr) return rej('invalid limit param');
 
 	const users = await User
diff --git a/src/api/endpoints/users/show.ts b/src/api/endpoints/users/show.ts
index 897e777fb6..8e74b0fe3f 100644
--- a/src/api/endpoints/users/show.ts
+++ b/src/api/endpoints/users/show.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from 'cafy';
+import $ from 'cafy';
 import User from '../../models/user';
 import serialize from '../../serializers/user';
 
@@ -14,11 +14,11 @@ import serialize from '../../serializers/user';
  */
 module.exports = (params, me) => new Promise(async (res, rej) => {
 	// Get 'user_id' parameter
-	const [userId, userIdErr] = it(params.user_id, 'id').get();
+	const [userId, userIdErr] = $(params.user_id).optional.id().$;
 	if (userIdErr) return rej('invalid user_id param');
 
 	// Get 'username' parameter
-	const [username, usernameErr] = it(params.username, 'string').get();
+	const [username, usernameErr] = $(params.username).optional.string().$;
 	if (usernameErr) return rej('invalid username param');
 
 	if (userId === undefined && username === undefined) {