From 931bdc6aace5e7aa71ffdfb470e208ead78a2a53 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 2 Nov 2018 03:32:24 +0900
Subject: Refactoring, Clean up and bug fixes

---
 src/server/api/endpoints/blocking/create.ts |  8 +++++---
 src/server/api/endpoints/blocking/delete.ts |  8 +++++---
 src/server/api/endpoints/blocking/list.ts   | 19 ++++++++++++-------
 3 files changed, 22 insertions(+), 13 deletions(-)

(limited to 'src/server/api/endpoints/blocking')

diff --git a/src/server/api/endpoints/blocking/create.ts b/src/server/api/endpoints/blocking/create.ts
index c3a4d24ae0..7ec01b4237 100644
--- a/src/server/api/endpoints/blocking/create.ts
+++ b/src/server/api/endpoints/blocking/create.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
+import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
 const ms = require('ms');
 import User, { pack, ILocalUser } from '../../../../models/user';
 import Blocking from '../../../../models/blocking';
@@ -23,12 +23,14 @@ export const meta = {
 	kind: 'following-write',
 
 	params: {
-		userId: $.type(ID).note({
+		userId: {
+			validator: $.type(ID),
+			transform: transform,
 			desc: {
 				'ja-JP': '対象のユーザーのID',
 				'en-US': 'Target user ID'
 			}
-		})
+		}
 	}
 };
 
diff --git a/src/server/api/endpoints/blocking/delete.ts b/src/server/api/endpoints/blocking/delete.ts
index e712d54d30..adf8d8c500 100644
--- a/src/server/api/endpoints/blocking/delete.ts
+++ b/src/server/api/endpoints/blocking/delete.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
+import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
 const ms = require('ms');
 import User, { pack, ILocalUser } from '../../../../models/user';
 import Blocking from '../../../../models/blocking';
@@ -23,12 +23,14 @@ export const meta = {
 	kind: 'following-write',
 
 	params: {
-		userId: $.type(ID).note({
+		userId: {
+			validator: $.type(ID),
+			transform: transform,
 			desc: {
 				'ja-JP': '対象のユーザーのID',
 				'en-US': 'Target user ID'
 			}
-		})
+		}
 	}
 };
 
diff --git a/src/server/api/endpoints/blocking/list.ts b/src/server/api/endpoints/blocking/list.ts
index a0bef38b58..52f55805d0 100644
--- a/src/server/api/endpoints/blocking/list.ts
+++ b/src/server/api/endpoints/blocking/list.ts
@@ -1,4 +1,4 @@
-import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
+import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
 import Blocking, { packMany } from '../../../../models/blocking';
 import { ILocalUser } from '../../../../models/user';
 import getParams from '../../get-params';
@@ -14,15 +14,20 @@ export const meta = {
 	kind: 'following-read',
 
 	params: {
-		limit: $.num.optional.range(1, 100).note({
+		limit: {
+			validator: $.num.optional.range(1, 100),
 			default: 30
-		}),
+		},
 
-		sinceId: $.type(ID).optional.note({
-		}),
+		sinceId: {
+			validator: $.type(ID).optional,
+			transform: transform,
+		},
 
-		untilId: $.type(ID).optional.note({
-		}),
+		untilId: {
+			validator: $.type(ID).optional,
+			transform: transform,
+		},
 	}
 };
 
-- 
cgit v1.2.3-freya