From 5aa58da9180f95fc787d175b9d074d8c22357cf0 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 13 Feb 2019 16:33:07 +0900
Subject: Migrate cafy to 14.0 (#4240)

---
 src/server/api/endpoints/i/authorized_apps.ts      |  6 ++---
 src/server/api/endpoints/i/favorites.ts            |  6 ++---
 src/server/api/endpoints/i/notifications.ts        | 14 +++++-----
 src/server/api/endpoints/i/signin_history.ts       |  6 ++---
 src/server/api/endpoints/i/update.ts               | 30 +++++++++++-----------
 .../api/endpoints/i/update_client_setting.ts       |  2 +-
 src/server/api/endpoints/i/update_email.ts         |  2 +-
 7 files changed, 33 insertions(+), 33 deletions(-)

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

diff --git a/src/server/api/endpoints/i/authorized_apps.ts b/src/server/api/endpoints/i/authorized_apps.ts
index c4b992b52f..3e60afe698 100644
--- a/src/server/api/endpoints/i/authorized_apps.ts
+++ b/src/server/api/endpoints/i/authorized_apps.ts
@@ -10,17 +10,17 @@ export const meta = {
 
 	params: {
 		limit: {
-			validator: $.num.optional.range(1, 100),
+			validator: $.optional.num.range(1, 100),
 			default: 10,
 		},
 
 		offset: {
-			validator: $.num.optional.min(0),
+			validator: $.optional.num.min(0),
 			default: 0,
 		},
 
 		sort: {
-			validator: $.str.optional.or('desc|asc'),
+			validator: $.optional.str.or('desc|asc'),
 			default: 'desc',
 		}
 	}
diff --git a/src/server/api/endpoints/i/favorites.ts b/src/server/api/endpoints/i/favorites.ts
index 3bfed4cbbc..c476844b4b 100644
--- a/src/server/api/endpoints/i/favorites.ts
+++ b/src/server/api/endpoints/i/favorites.ts
@@ -15,17 +15,17 @@ export const meta = {
 
 	params: {
 		limit: {
-			validator: $.num.optional.range(1, 100),
+			validator: $.optional.num.range(1, 100),
 			default: 10
 		},
 
 		sinceId: {
-			validator: $.type(ID).optional,
+			validator: $.optional.type(ID),
 			transform: transform,
 		},
 
 		untilId: {
-			validator: $.type(ID).optional,
+			validator: $.optional.type(ID),
 			transform: transform,
 		}
 	}
diff --git a/src/server/api/endpoints/i/notifications.ts b/src/server/api/endpoints/i/notifications.ts
index 264ed3c9ce..6287e42622 100644
--- a/src/server/api/endpoints/i/notifications.ts
+++ b/src/server/api/endpoints/i/notifications.ts
@@ -19,37 +19,37 @@ export const meta = {
 
 	params: {
 		limit: {
-			validator: $.num.optional.range(1, 100),
+			validator: $.optional.num.range(1, 100),
 			default: 10
 		},
 
 		sinceId: {
-			validator: $.type(ID).optional,
+			validator: $.optional.type(ID),
 			transform: transform,
 		},
 
 		untilId: {
-			validator: $.type(ID).optional,
+			validator: $.optional.type(ID),
 			transform: transform,
 		},
 
 		following: {
-			validator: $.bool.optional,
+			validator: $.optional.bool,
 			default: false
 		},
 
 		markAsRead: {
-			validator: $.bool.optional,
+			validator: $.optional.bool,
 			default: true
 		},
 
 		includeTypes: {
-			validator: $.arr($.str.or(['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'poll_vote', 'receiveFollowRequest'])).optional,
+			validator: $.optional.arr($.str.or(['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'poll_vote', 'receiveFollowRequest'])),
 			default: [] as string[]
 		},
 
 		excludeTypes: {
-			validator: $.arr($.str.or(['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'poll_vote', 'receiveFollowRequest'])).optional,
+			validator: $.optional.arr($.str.or(['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'poll_vote', 'receiveFollowRequest'])),
 			default: [] as string[]
 		}
 	}
diff --git a/src/server/api/endpoints/i/signin_history.ts b/src/server/api/endpoints/i/signin_history.ts
index c30e3f8fb8..cdffc6cc3c 100644
--- a/src/server/api/endpoints/i/signin_history.ts
+++ b/src/server/api/endpoints/i/signin_history.ts
@@ -10,17 +10,17 @@ export const meta = {
 
 	params: {
 		limit: {
-			validator: $.num.optional.range(1, 100),
+			validator: $.optional.num.range(1, 100),
 			default: 10
 		},
 
 		sinceId: {
-			validator: $.type(ID).optional,
+			validator: $.optional.type(ID),
 			transform: transform,
 		},
 
 		untilId: {
-			validator: $.type(ID).optional,
+			validator: $.optional.type(ID),
 			transform: transform,
 		}
 	}
diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts
index 0ad7e0f33f..6ae63c52db 100644
--- a/src/server/api/endpoints/i/update.ts
+++ b/src/server/api/endpoints/i/update.ts
@@ -24,42 +24,42 @@ export const meta = {
 
 	params: {
 		name: {
-			validator: $.str.optional.nullable.pipe(isValidName),
+			validator: $.optional.nullable.str.pipe(isValidName),
 			desc: {
 				'ja-JP': '名前(ハンドルネームやニックネーム)'
 			}
 		},
 
 		description: {
-			validator: $.str.optional.nullable.pipe(isValidDescription),
+			validator: $.optional.nullable.str.pipe(isValidDescription),
 			desc: {
 				'ja-JP': 'アカウントの説明や自己紹介'
 			}
 		},
 
 		lang: {
-			validator: $.str.optional.nullable.or(Object.keys(langmap)),
+			validator: $.optional.nullable.str.or(Object.keys(langmap)),
 			desc: {
 				'ja-JP': '言語'
 			}
 		},
 
 		location: {
-			validator: $.str.optional.nullable.pipe(isValidLocation),
+			validator: $.optional.nullable.str.pipe(isValidLocation),
 			desc: {
 				'ja-JP': '住んでいる地域、所在'
 			}
 		},
 
 		birthday: {
-			validator: $.str.optional.nullable.pipe(isValidBirthday),
+			validator: $.optional.nullable.str.pipe(isValidBirthday),
 			desc: {
 				'ja-JP': '誕生日 (YYYY-MM-DD形式)'
 			}
 		},
 
 		avatarId: {
-			validator: $.type(ID).optional.nullable,
+			validator: $.optional.nullable.type(ID),
 			transform: transform,
 			desc: {
 				'ja-JP': 'アイコンに設定する画像のドライブファイルID'
@@ -67,7 +67,7 @@ export const meta = {
 		},
 
 		bannerId: {
-			validator: $.type(ID).optional.nullable,
+			validator: $.optional.nullable.type(ID),
 			transform: transform,
 			desc: {
 				'ja-JP': 'バナーに設定する画像のドライブファイルID'
@@ -75,7 +75,7 @@ export const meta = {
 		},
 
 		wallpaperId: {
-			validator: $.type(ID).optional.nullable,
+			validator: $.optional.nullable.type(ID),
 			transform: transform,
 			desc: {
 				'ja-JP': '壁紙に設定する画像のドライブファイルID'
@@ -83,49 +83,49 @@ export const meta = {
 		},
 
 		isLocked: {
-			validator: $.bool.optional,
+			validator: $.optional.bool,
 			desc: {
 				'ja-JP': '鍵アカウントか否か'
 			}
 		},
 
 		carefulBot: {
-			validator: $.bool.optional,
+			validator: $.optional.bool,
 			desc: {
 				'ja-JP': 'Botからのフォローを承認制にするか'
 			}
 		},
 
 		autoAcceptFollowed: {
-			validator: $.bool.optional,
+			validator: $.optional.bool,
 			desc: {
 				'ja-JP': 'フォローしているユーザーからのフォローリクエストを自動承認するか'
 			}
 		},
 
 		isBot: {
-			validator: $.bool.optional,
+			validator: $.optional.bool,
 			desc: {
 				'ja-JP': 'Botか否か'
 			}
 		},
 
 		isCat: {
-			validator: $.bool.optional,
+			validator: $.optional.bool,
 			desc: {
 				'ja-JP': '猫か否か'
 			}
 		},
 
 		autoWatch: {
-			validator: $.bool.optional,
+			validator: $.optional.bool,
 			desc: {
 				'ja-JP': '投稿の自動ウォッチをするか否か'
 			}
 		},
 
 		alwaysMarkNsfw: {
-			validator: $.bool.optional,
+			validator: $.optional.bool,
 			desc: {
 				'ja-JP': 'アップロードするメディアをデフォルトで「閲覧注意」として設定するか'
 			}
diff --git a/src/server/api/endpoints/i/update_client_setting.ts b/src/server/api/endpoints/i/update_client_setting.ts
index 2b2f3d3c7b..2157986f10 100644
--- a/src/server/api/endpoints/i/update_client_setting.ts
+++ b/src/server/api/endpoints/i/update_client_setting.ts
@@ -14,7 +14,7 @@ export const meta = {
 		},
 
 		value: {
-			validator: $.any.nullable
+			validator: $.nullable.any
 		}
 	}
 };
diff --git a/src/server/api/endpoints/i/update_email.ts b/src/server/api/endpoints/i/update_email.ts
index c3aafc8d8b..8781c8ac93 100644
--- a/src/server/api/endpoints/i/update_email.ts
+++ b/src/server/api/endpoints/i/update_email.ts
@@ -26,7 +26,7 @@ export const meta = {
 		},
 
 		email: {
-			validator: $.str.optional.nullable
+			validator: $.optional.nullable.str
 		},
 	}
 };
-- 
cgit v1.2.3-freya