From 2615368b1e16571024708782ddddbac5f1a116b1 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 15 Jun 2019 00:07:41 +0900
Subject: Resolve #365

---
 src/server/api/endpoints/i/update.ts                  | 8 ++++----
 src/server/api/endpoints/messaging/messages/create.ts | 2 +-
 src/server/api/endpoints/username/available.ts        | 2 +-
 src/server/api/endpoints/users/search.ts              | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts
index 2951072cf6..10521d12d8 100644
--- a/src/server/api/endpoints/i/update.ts
+++ b/src/server/api/endpoints/i/update.ts
@@ -29,14 +29,14 @@ export const meta = {
 
 	params: {
 		name: {
-			validator: $.optional.nullable.str.pipe(Users.isValidName),
+			validator: $.optional.nullable.use(Users.validateName),
 			desc: {
 				'ja-JP': '名前(ハンドルネームやニックネーム)'
 			}
 		},
 
 		description: {
-			validator: $.optional.nullable.str.pipe(Users.isValidDescription),
+			validator: $.optional.nullable.use(Users.validateDescription),
 			desc: {
 				'ja-JP': 'アカウントの説明や自己紹介'
 			}
@@ -50,14 +50,14 @@ export const meta = {
 		},
 
 		location: {
-			validator: $.optional.nullable.str.pipe(Users.isValidLocation),
+			validator: $.optional.nullable.use(Users.validateLocation),
 			desc: {
 				'ja-JP': '住んでいる地域、所在'
 			}
 		},
 
 		birthday: {
-			validator: $.optional.nullable.str.pipe(Users.isValidBirthday),
+			validator: $.optional.nullable.use(Users.validateBirthday),
 			desc: {
 				'ja-JP': '誕生日 (YYYY-MM-DD形式)'
 			}
diff --git a/src/server/api/endpoints/messaging/messages/create.ts b/src/server/api/endpoints/messaging/messages/create.ts
index f5d7cf2b38..feffc9a0c6 100644
--- a/src/server/api/endpoints/messaging/messages/create.ts
+++ b/src/server/api/endpoints/messaging/messages/create.ts
@@ -44,7 +44,7 @@ export const meta = {
 		},
 
 		text: {
-			validator: $.optional.str.pipe(MessagingMessages.isValidText)
+			validator: $.optional.str.pipe(MessagingMessages.validateText)
 		},
 
 		fileId: {
diff --git a/src/server/api/endpoints/username/available.ts b/src/server/api/endpoints/username/available.ts
index 42ab176652..724bb3a0c3 100644
--- a/src/server/api/endpoints/username/available.ts
+++ b/src/server/api/endpoints/username/available.ts
@@ -9,7 +9,7 @@ export const meta = {
 
 	params: {
 		username: {
-			validator: $.str.pipe(Users.validateUsername)
+			validator: $.use(Users.validateLocalUsername)
 		}
 	}
 };
diff --git a/src/server/api/endpoints/users/search.ts b/src/server/api/endpoints/users/search.ts
index 2809465fd7..5c413defbc 100644
--- a/src/server/api/endpoints/users/search.ts
+++ b/src/server/api/endpoints/users/search.ts
@@ -66,7 +66,7 @@ export const meta = {
 };
 
 export default define(meta, async (ps, me) => {
-	const isUsername = Users.validateUsername(ps.query.replace('@', ''), !ps.localOnly);
+	const isUsername = ps.localOnly ? Users.validateLocalUsername.ok(ps.query.replace('@', '')) : Users.validateRemoteUsername.ok(ps.query.replace('@', ''));
 
 	let users: User[] = [];
 
-- 
cgit v1.2.3-freya