Refactoring, Clean up and bug fixes

4 files changed, 44 insertions, 28 deletions

diff --git a/src/server/api/endpoints/charts/user/drive.ts b/src/server/api/endpoints/charts/user/drive.ts
index 2626c36c9d..beb6b5bea3 100644
--- a/src/server/api/endpoints/charts/user/drive.ts
+++ b/src/server/api/endpoints/charts/user/drive.ts
@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import getParams from '../../../get-params';
 import perUserDriveChart from '../../../../../chart/per-user-drive';
-import ID from '../../../../../misc/cafy-id';
+import ID, { transform } from '../../../../../misc/cafy-id';
 
 export const meta = {
 	desc: {
@@ -9,25 +9,29 @@ export const meta = {
 	},
 
 	params: {
-		span: $.str.or(['day', 'hour']).note({
+		span: {
+			validator: $.str.or(['day', 'hour']),
 			desc: {
 				'ja-JP': '集計のスパン (day または hour)'
 			}
-		}),
+		},
 
-		limit: $.num.optional.range(1, 100).note({
+		limit: {
+			validator: $.num.optional.range(1, 100),
 			default: 30,
 			desc: {
 				'ja-JP': '最大数。例えば 30 を指定したとすると、スパンが"day"の場合は30日分のデータが、スパンが"hour"の場合は30時間分のデータが返ります。'
 			}
-		}),
+		},
 
-		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/charts/user/following.ts b/src/server/api/endpoints/charts/user/following.ts
index 57c15cdcfe..e0aebf4255 100644
--- a/src/server/api/endpoints/charts/user/following.ts
+++ b/src/server/api/endpoints/charts/user/following.ts
@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import getParams from '../../../get-params';
 import perUserFollowingChart from '../../../../../chart/per-user-following';
-import ID from '../../../../../misc/cafy-id';
+import ID, { transform } from '../../../../../misc/cafy-id';
 
 export const meta = {
 	desc: {
@@ -9,25 +9,29 @@ export const meta = {
 	},
 
 	params: {
-		span: $.str.or(['day', 'hour']).note({
+		span: {
+			validator: $.str.or(['day', 'hour']),
 			desc: {
 				'ja-JP': '集計のスパン (day または hour)'
 			}
-		}),
+		},
 
-		limit: $.num.optional.range(1, 100).note({
+		limit: {
+			validator: $.num.optional.range(1, 100),
 			default: 30,
 			desc: {
 				'ja-JP': '最大数。例えば 30 を指定したとすると、スパンが"day"の場合は30日分のデータが、スパンが"hour"の場合は30時間分のデータが返ります。'
 			}
-		}),
+		},
 
-		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/charts/user/notes.ts b/src/server/api/endpoints/charts/user/notes.ts
index 66051fa7c6..251de4d399 100644
--- a/src/server/api/endpoints/charts/user/notes.ts
+++ b/src/server/api/endpoints/charts/user/notes.ts
@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import getParams from '../../../get-params';
 import perUserNotesChart from '../../../../../chart/per-user-notes';
-import ID from '../../../../../misc/cafy-id';
+import ID, { transform } from '../../../../../misc/cafy-id';
 
 export const meta = {
 	desc: {
@@ -9,25 +9,29 @@ export const meta = {
 	},
 
 	params: {
-		span: $.str.or(['day', 'hour']).note({
+		span: {
+			validator: $.str.or(['day', 'hour']),
 			desc: {
 				'ja-JP': '集計のスパン (day または hour)'
 			}
-		}),
+		},
 
-		limit: $.num.optional.range(1, 100).note({
+		limit: {
+			validator: $.num.optional.range(1, 100),
 			default: 30,
 			desc: {
 				'ja-JP': '最大数。例えば 30 を指定したとすると、スパンが"day"の場合は30日分のデータが、スパンが"hour"の場合は30時間分のデータが返ります。'
 			}
-		}),
+		},
 
-		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/charts/user/reactions.ts b/src/server/api/endpoints/charts/user/reactions.ts
index 60cdaa70bb..f812400709 100644
--- a/src/server/api/endpoints/charts/user/reactions.ts
+++ b/src/server/api/endpoints/charts/user/reactions.ts
@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import getParams from '../../../get-params';
 import perUserReactionsChart from '../../../../../chart/per-user-reactions';
-import ID from '../../../../../misc/cafy-id';
+import ID, { transform } from '../../../../../misc/cafy-id';
 
 export const meta = {
 	desc: {
@@ -9,25 +9,29 @@ export const meta = {
 	},
 
 	params: {
-		span: $.str.or(['day', 'hour']).note({
+		span: {
+			validator: $.str.or(['day', 'hour']),
 			desc: {
 				'ja-JP': '集計のスパン (day または hour)'
 			}
-		}),
+		},
 
-		limit: $.num.optional.range(1, 100).note({
+		limit: {
+			validator: $.num.optional.range(1, 100),
 			default: 30,
 			desc: {
 				'ja-JP': '最大数。例えば 30 を指定したとすると、スパンが"day"の場合は30日分のデータが、スパンが"hour"の場合は30時間分のデータが返ります。'
 			}
-		}),
+		},
 
-		userId: $.type(ID).note({
+		userId: {
+			validator: $.type(ID),
+			transform: transform,
 			desc: {
 				'ja-JP': '対象のユーザーのID',
 				'en-US': 'Target user ID'
 			}
-		})
+		}
 	}
 };