Refactoring, Clean up and bug fixes

src/server/api/endpoints/admin/suspend-user.ts

@@ -1,5 +1,5 @@
 import $ from 'cafy';
-import ID from '../../../../misc/cafy-id';
+import ID, { transform } from '../../../../misc/cafy-id';
 import getParams from '../../get-params';
 import User from '../../../../models/user';
 
@@ -13,12 +13,14 @@ export const meta = {
 	requireAdmin: true,
 
 	params: {
-		userId: $.type(ID).note({
+		userId: {
+			validator: $.type(ID),
+			transform: transform,
 			desc: {
 				'ja-JP': '対象のユーザーID',
 				'en-US': 'The user ID which you want to suspend'
 			}
-		}),
+		},
 	}
 };
 

src/server/api/endpoints/admin/unsuspend-user.ts

@@ -1,5 +1,5 @@
 import $ from 'cafy';
-import ID from '../../../../misc/cafy-id';
+import ID, { transform } from '../../../../misc/cafy-id';
 import getParams from '../../get-params';
 import User from '../../../../models/user';
 
@@ -13,12 +13,14 @@ export const meta = {
 	requireAdmin: true,
 
 	params: {
-		userId: $.type(ID).note({
+		userId: {
+			validator: $.type(ID),
+			transform: transform,
 			desc: {
 				'ja-JP': '対象のユーザーID',
 				'en-US': 'The user ID which you want to unsuspend'
 			}
-		}),
+		},
 	}
 };
 

src/server/api/endpoints/admin/unverify-user.ts

@@ -1,5 +1,5 @@
 import $ from 'cafy';
-import ID from '../../../../misc/cafy-id';
+import ID, { transform } from '../../../../misc/cafy-id';
 import getParams from '../../get-params';
 import User from '../../../../models/user';
 
@@ -13,12 +13,14 @@ export const meta = {
 	requireAdmin: true,
 
 	params: {
-		userId: $.type(ID).note({
+		userId: {
+			validator: $.type(ID),
+			transform: transform,
 			desc: {
 				'ja-JP': '対象のユーザーID',
 				'en-US': 'The user ID which you want to unverify'
 			}
-		}),
+		},
 	}
 };
 

src/server/api/endpoints/admin/update-meta.ts

@@ -11,41 +11,47 @@ export const meta = {
 	requireAdmin: true,
 
 	params: {
-		broadcasts: $.arr($.obj()).optional.nullable.note({
+		broadcasts: {
+			validator: $.arr($.obj()).optional.nullable,
 			desc: {
 				'ja-JP': 'ブロードキャスト'
 			}
-		}),
+		},
 
-		emojis: $.arr($.obj()).optional.note({
+		emojis: {
+			validator: $.arr($.obj()).optional,
 			desc: {
 				'ja-JP': 'カスタム絵文字定義'
 			}
-		}),
+		},
 
-		disableRegistration: $.bool.optional.nullable.note({
+		disableRegistration: {
+			validator: $.bool.optional.nullable,
 			desc: {
 				'ja-JP': '招待制か否か'
 			}
-		}),
+		},
 
-		disableLocalTimeline: $.bool.optional.nullable.note({
+		disableLocalTimeline: {
+			validator: $.bool.optional.nullable,
 			desc: {
 				'ja-JP': 'ローカルタイムライン(とソーシャルタイムライン)を無効にするか否か'
 			}
-		}),
+		},
 
-		hidedTags: $.arr($.str).optional.nullable.note({
+		hidedTags: {
+			validator: $.arr($.str).optional.nullable,
 			desc: {
 				'ja-JP': '統計などで無視するハッシュタグ'
 			}
-		}),
+		},
 
-		bannerUrl: $.str.optional.nullable.note({
+		bannerUrl: {
+			validator: $.str.optional.nullable,
 			desc: {
 				'ja-JP': 'インスタンスのバナー画像URL'
 			}
-		}),
+		},
 	}
 };
 

src/server/api/endpoints/admin/verify-user.ts

@@ -1,5 +1,5 @@
 import $ from 'cafy';
-import ID from '../../../../misc/cafy-id';
+import ID, { transform } from '../../../../misc/cafy-id';
 import getParams from '../../get-params';
 import User from '../../../../models/user';
 
@@ -13,12 +13,14 @@ export const meta = {
 	requireAdmin: true,
 
 	params: {
-		userId: $.type(ID).note({
+		userId: {
+			validator: $.type(ID),
+			transform: transform,
 			desc: {
 				'ja-JP': '対象のユーザーID',
 				'en-US': 'The user ID which you want to verify'
 			}
-		}),
+		},
 	}
 };