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/messaging/history.ts         | 2 +-
 src/server/api/endpoints/messaging/messages.ts        | 8 ++++----
 src/server/api/endpoints/messaging/messages/create.ts | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/src/server/api/endpoints/messaging/history.ts b/src/server/api/endpoints/messaging/history.ts
index 78abea269a..408e2d42a6 100644
--- a/src/server/api/endpoints/messaging/history.ts
+++ b/src/server/api/endpoints/messaging/history.ts
@@ -15,7 +15,7 @@ export const meta = {
 
 	params: {
 		limit: {
-			validator: $.num.optional.range(1, 100),
+			validator: $.optional.num.range(1, 100),
 			default: 10
 		}
 	}
diff --git a/src/server/api/endpoints/messaging/messages.ts b/src/server/api/endpoints/messaging/messages.ts
index 486bc56b98..4c1b7206d6 100644
--- a/src/server/api/endpoints/messaging/messages.ts
+++ b/src/server/api/endpoints/messaging/messages.ts
@@ -27,22 +27,22 @@ export const meta = {
 		},
 
 		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,
 		},
 
 		markAsRead: {
-			validator: $.bool.optional,
+			validator: $.optional.bool,
 			default: true
 		}
 	}
diff --git a/src/server/api/endpoints/messaging/messages/create.ts b/src/server/api/endpoints/messaging/messages/create.ts
index 8300f69e53..96a047a9bf 100644
--- a/src/server/api/endpoints/messaging/messages/create.ts
+++ b/src/server/api/endpoints/messaging/messages/create.ts
@@ -32,11 +32,11 @@ export const meta = {
 		},
 
 		text: {
-			validator: $.str.optional.pipe(isValidText)
+			validator: $.optional.str.pipe(isValidText)
 		},
 
 		fileId: {
-			validator: $.type(ID).optional,
+			validator: $.optional.type(ID),
 			transform: transform,
 		}
 	}
-- 
cgit v1.2.3-freya