:v:

3 files changed, 12 insertions, 12 deletions

diff --git a/src/api/endpoints/app/create.ts b/src/api/endpoints/app/create.ts
index 43f533d216..498c4f144e 100644
--- a/src/api/endpoints/app/create.ts
+++ b/src/api/endpoints/app/create.ts
@@ -2,7 +2,7 @@
  * Module dependencies
  */
 import rndstr from 'rndstr';
-import it from 'cafy';
+import $ from 'cafy';
 import App from '../../models/app';
 import { isValidNameId } from '../../models/app';
 import serialize from '../../serializers/app';
@@ -69,24 +69,24 @@ import serialize from '../../serializers/app';
  */
 module.exports = async (params, user) => new Promise(async (res, rej) => {
 	// Get 'name_id' parameter
-	const [nameId, nameIdErr] = it(params.name_id).expect.string().required().validate(isValidNameId).get();
+	const [nameId, nameIdErr] = $(params.name_id).string().pipe(isValidNameId).$;
 	if (nameIdErr) return rej('invalid name_id param');
 
 	// Get 'name' parameter
-	const [name, nameErr] = it(params.name).expect.string().required().get();
+	const [name, nameErr] = $(params.name).string().$;
 	if (nameErr) return rej('invalid name param');
 
 	// Get 'description' parameter
-	const [description, descriptionErr] = it(params.description).expect.string().required().get();
+	const [description, descriptionErr] = $(params.description).string().$;
 	if (descriptionErr) return rej('invalid description param');
 
 	// Get 'permission' parameter
-	const [permission, permissionErr] = it(params.permission).expect.array().unique().allString().required().get();
+	const [permission, permissionErr] = $(params.permission).array('string').unique().$;
 	if (permissionErr) return rej('invalid permission param');
 
 	// Get 'callback_url' parameter
-	// TODO: Check it is valid url
-	const [callbackUrl = null, callbackUrlErr] = it(params.callback_url).expect.nullable.string().get();
+	// TODO: Check $ is valid url
+	const [callbackUrl = null, callbackUrlErr] = $(params.callback_url).optional.nullable.string().$;
 	if (callbackUrlErr) return rej('invalid callback_url param');
 
 	// Generate secret
diff --git a/src/api/endpoints/app/name_id/available.ts b/src/api/endpoints/app/name_id/available.ts
index ac38c89847..3d2c710322 100644
--- a/src/api/endpoints/app/name_id/available.ts
+++ b/src/api/endpoints/app/name_id/available.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from 'cafy';
+import $ from 'cafy';
 import App from '../../../models/app';
 import { isValidNameId } from '../../../models/app';
 
@@ -42,7 +42,7 @@ import { isValidNameId } from '../../../models/app';
  */
 module.exports = async (params) => new Promise(async (res, rej) => {
 	// Get 'name_id' parameter
-	const [nameId, nameIdErr] = it(params.name_id).expect.string().required().validate(isValidNameId).get();
+	const [nameId, nameIdErr] = $(params.name_id).string().pipe(isValidNameId).$;
 	if (nameIdErr) return rej('invalid name_id param');
 
 	// Get exist
diff --git a/src/api/endpoints/app/show.ts b/src/api/endpoints/app/show.ts
index 88698d5cd8..054aab8596 100644
--- a/src/api/endpoints/app/show.ts
+++ b/src/api/endpoints/app/show.ts
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-import it from 'cafy';
+import $ from 'cafy';
 import App from '../../models/app';
 import serialize from '../../serializers/app';
 
@@ -46,11 +46,11 @@ import serialize from '../../serializers/app';
  */
 module.exports = (params, user, _, isSecure) => new Promise(async (res, rej) => {
 	// Get 'app_id' parameter
-	const [appId, appIdErr] = it(params.app_id, 'id').get();
+	const [appId, appIdErr] = $(params.app_id).optional.id().$;
 	if (appIdErr) return rej('invalid app_id param');
 
 	// Get 'name_id' parameter
-	const [nameId, nameIdErr] = it(params.name_id, 'string').get();
+	const [nameId, nameIdErr] = $(params.name_id).optional.string().$;
 	if (nameIdErr) return rej('invalid name_id param');
 
 	if (appId === undefined && nameId === undefined) {