diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-04-27 19:12:15 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-04-27 19:12:15 +0900 |
| commit | 0f27b629244ebaba1036596ffd2044126de94d07 (patch) | |
| tree | 4001424f660328b413d978475d8bef8d692e6031 /src/server/api/endpoints/users | |
| parent | Update README.md (diff) | |
| download | sharkey-0f27b629244ebaba1036596ffd2044126de94d07.tar.gz sharkey-0f27b629244ebaba1036596ffd2044126de94d07.tar.bz2 sharkey-0f27b629244ebaba1036596ffd2044126de94d07.zip | |
Update dependencies :rocket:
Diffstat (limited to 'src/server/api/endpoints/users')
| -rw-r--r-- | src/server/api/endpoints/users/followers.ts | 8 | ||||
| -rw-r--r-- | src/server/api/endpoints/users/following.ts | 8 | ||||
| -rw-r--r-- | src/server/api/endpoints/users/get_frequently_replied_users.ts | 4 | ||||
| -rw-r--r-- | src/server/api/endpoints/users/lists/create.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/users/lists/push.ts | 4 | ||||
| -rw-r--r-- | src/server/api/endpoints/users/lists/show.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/users/notes.ts | 20 | ||||
| -rw-r--r-- | src/server/api/endpoints/users/recommendation.ts | 4 | ||||
| -rw-r--r-- | src/server/api/endpoints/users/search.ts | 6 | ||||
| -rw-r--r-- | src/server/api/endpoints/users/search_by_username.ts | 6 | ||||
| -rw-r--r-- | src/server/api/endpoints/users/show.ts | 8 |
11 files changed, 36 insertions, 36 deletions
diff --git a/src/server/api/endpoints/users/followers.ts b/src/server/api/endpoints/users/followers.ts index 940b5ed9bc..7892f633d4 100644 --- a/src/server/api/endpoints/users/followers.ts +++ b/src/server/api/endpoints/users/followers.ts @@ -12,19 +12,19 @@ import { getFriendIds } from '../../common/get-friends'; */ module.exports = (params, me) => new Promise(async (res, rej) => { // Get 'userId' parameter - const [userId, userIdErr] = $(params.userId).type(ID).$; + const [userId, userIdErr] = $(params.userId).type(ID).get(); if (userIdErr) return rej('invalid userId param'); // Get 'iknow' parameter - const [iknow = false, iknowErr] = $(params.iknow).optional.boolean().$; + const [iknow = false, iknowErr] = $(params.iknow).optional.boolean().get(); if (iknowErr) return rej('invalid iknow param'); // Get 'limit' parameter - const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).$; + const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).get(); if (limitErr) return rej('invalid limit param'); // Get 'cursor' parameter - const [cursor = null, cursorErr] = $(params.cursor).optional.type(ID).$; + const [cursor = null, cursorErr] = $(params.cursor).optional.type(ID).get(); if (cursorErr) return rej('invalid cursor param'); // Lookup user diff --git a/src/server/api/endpoints/users/following.ts b/src/server/api/endpoints/users/following.ts index 63a73a2e27..e584e61f9c 100644 --- a/src/server/api/endpoints/users/following.ts +++ b/src/server/api/endpoints/users/following.ts @@ -16,19 +16,19 @@ import { getFriendIds } from '../../common/get-friends'; */ module.exports = (params, me) => new Promise(async (res, rej) => { // Get 'userId' parameter - const [userId, userIdErr] = $(params.userId).type(ID).$; + const [userId, userIdErr] = $(params.userId).type(ID).get(); if (userIdErr) return rej('invalid userId param'); // Get 'iknow' parameter - const [iknow = false, iknowErr] = $(params.iknow).optional.boolean().$; + const [iknow = false, iknowErr] = $(params.iknow).optional.boolean().get(); if (iknowErr) return rej('invalid iknow param'); // Get 'limit' parameter - const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).$; + const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).get(); if (limitErr) return rej('invalid limit param'); // Get 'cursor' parameter - const [cursor = null, cursorErr] = $(params.cursor).optional.type(ID).$; + const [cursor = null, cursorErr] = $(params.cursor).optional.type(ID).get(); if (cursorErr) return rej('invalid cursor param'); // Lookup user diff --git a/src/server/api/endpoints/users/get_frequently_replied_users.ts b/src/server/api/endpoints/users/get_frequently_replied_users.ts index 4c00620a52..034684260c 100644 --- a/src/server/api/endpoints/users/get_frequently_replied_users.ts +++ b/src/server/api/endpoints/users/get_frequently_replied_users.ts @@ -7,11 +7,11 @@ import User, { pack } from '../../../../models/user'; module.exports = (params, me) => new Promise(async (res, rej) => { // Get 'userId' parameter - const [userId, userIdErr] = $(params.userId).type(ID).$; + const [userId, userIdErr] = $(params.userId).type(ID).get(); if (userIdErr) return rej('invalid userId param'); // Get 'limit' parameter - const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).$; + const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).get(); if (limitErr) return rej('invalid limit param'); // Lookup user diff --git a/src/server/api/endpoints/users/lists/create.ts b/src/server/api/endpoints/users/lists/create.ts index 6ae510f52b..79a680c736 100644 --- a/src/server/api/endpoints/users/lists/create.ts +++ b/src/server/api/endpoints/users/lists/create.ts @@ -9,7 +9,7 @@ import UserList, { pack } from '../../../../../models/user-list'; */ module.exports = async (params, user) => new Promise(async (res, rej) => { // Get 'title' parameter - const [title, titleErr] = $(params.title).string().range(1, 100).$; + const [title, titleErr] = $(params.title).string().range(1, 100).get(); if (titleErr) return rej('invalid title param'); // insert diff --git a/src/server/api/endpoints/users/lists/push.ts b/src/server/api/endpoints/users/lists/push.ts index 5d6f201524..ceb5692c81 100644 --- a/src/server/api/endpoints/users/lists/push.ts +++ b/src/server/api/endpoints/users/lists/push.ts @@ -11,7 +11,7 @@ import { deliver } from '../../../../../queue'; */ module.exports = async (params, me) => new Promise(async (res, rej) => { // Get 'listId' parameter - const [listId, listIdErr] = $(params.listId).type(ID).$; + const [listId, listIdErr] = $(params.listId).type(ID).get(); if (listIdErr) return rej('invalid listId param'); // Fetch the list @@ -25,7 +25,7 @@ module.exports = async (params, me) => new Promise(async (res, rej) => { } // Get 'userId' parameter - const [userId, userIdErr] = $(params.userId).type(ID).$; + const [userId, userIdErr] = $(params.userId).type(ID).get(); if (userIdErr) return rej('invalid userId param'); // Fetch the user diff --git a/src/server/api/endpoints/users/lists/show.ts b/src/server/api/endpoints/users/lists/show.ts index 61e0f0463f..54e1df7b2f 100644 --- a/src/server/api/endpoints/users/lists/show.ts +++ b/src/server/api/endpoints/users/lists/show.ts @@ -6,7 +6,7 @@ import UserList, { pack } from '../../../../../models/user-list'; */ module.exports = async (params, me) => new Promise(async (res, rej) => { // Get 'listId' parameter - const [listId, listIdErr] = $(params.listId).type(ID).$; + const [listId, listIdErr] = $(params.listId).type(ID).get(); if (listIdErr) return rej('invalid listId param'); // Fetch the list diff --git a/src/server/api/endpoints/users/notes.ts b/src/server/api/endpoints/users/notes.ts index dafa18bcc9..67b14b36a3 100644 --- a/src/server/api/endpoints/users/notes.ts +++ b/src/server/api/endpoints/users/notes.ts @@ -11,11 +11,11 @@ import User from '../../../../models/user'; */ module.exports = (params, me) => new Promise(async (res, rej) => { // Get 'userId' parameter - const [userId, userIdErr] = $(params.userId).optional.type(ID).$; + const [userId, userIdErr] = $(params.userId).optional.type(ID).get(); if (userIdErr) return rej('invalid userId param'); // Get 'username' parameter - const [username, usernameErr] = $(params.username).optional.string().$; + const [username, usernameErr] = $(params.username).optional.string().get(); if (usernameErr) return rej('invalid username param'); if (userId === undefined && username === undefined) { @@ -23,7 +23,7 @@ module.exports = (params, me) => new Promise(async (res, rej) => { } // Get 'host' parameter - const [host, hostErr] = $(params.host).optional.string().$; + const [host, hostErr] = $(params.host).optional.string().get(); if (hostErr) return rej('invalid host param'); if (userId === undefined && host === undefined) { @@ -31,31 +31,31 @@ module.exports = (params, me) => new Promise(async (res, rej) => { } // Get 'includeReplies' parameter - const [includeReplies = true, includeRepliesErr] = $(params.includeReplies).optional.boolean().$; + const [includeReplies = true, includeRepliesErr] = $(params.includeReplies).optional.boolean().get(); if (includeRepliesErr) return rej('invalid includeReplies param'); // Get 'withMedia' parameter - const [withMedia = false, withMediaErr] = $(params.withMedia).optional.boolean().$; + const [withMedia = false, withMediaErr] = $(params.withMedia).optional.boolean().get(); if (withMediaErr) return rej('invalid withMedia param'); // Get 'limit' parameter - const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).$; + const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).get(); if (limitErr) return rej('invalid limit param'); // Get 'sinceId' parameter - const [sinceId, sinceIdErr] = $(params.sinceId).optional.type(ID).$; + const [sinceId, sinceIdErr] = $(params.sinceId).optional.type(ID).get(); if (sinceIdErr) return rej('invalid sinceId param'); // Get 'untilId' parameter - const [untilId, untilIdErr] = $(params.untilId).optional.type(ID).$; + const [untilId, untilIdErr] = $(params.untilId).optional.type(ID).get(); if (untilIdErr) return rej('invalid untilId param'); // Get 'sinceDate' parameter - const [sinceDate, sinceDateErr] = $(params.sinceDate).optional.number().$; + const [sinceDate, sinceDateErr] = $(params.sinceDate).optional.number().get(); if (sinceDateErr) throw 'invalid sinceDate param'; // Get 'untilDate' parameter - const [untilDate, untilDateErr] = $(params.untilDate).optional.number().$; + const [untilDate, untilDateErr] = $(params.untilDate).optional.number().get(); if (untilDateErr) throw 'invalid untilDate param'; // Check if only one of sinceId, untilId, sinceDate, untilDate specified diff --git a/src/server/api/endpoints/users/recommendation.ts b/src/server/api/endpoints/users/recommendation.ts index f72bb04bf1..f48ac7cb28 100644 --- a/src/server/api/endpoints/users/recommendation.ts +++ b/src/server/api/endpoints/users/recommendation.ts @@ -16,11 +16,11 @@ import Mute from '../../../../models/mute'; */ module.exports = (params, me) => new Promise(async (res, rej) => { // Get 'limit' parameter - const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).$; + const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).get(); if (limitErr) return rej('invalid limit param'); // Get 'offset' parameter - const [offset = 0, offsetErr] = $(params.offset).optional.number().min(0).$; + const [offset = 0, offsetErr] = $(params.offset).optional.number().min(0).get(); if (offsetErr) return rej('invalid offset param'); // ID list of the user itself and other users who the user follows diff --git a/src/server/api/endpoints/users/search.ts b/src/server/api/endpoints/users/search.ts index da30f47c2a..48630c6fd3 100644 --- a/src/server/api/endpoints/users/search.ts +++ b/src/server/api/endpoints/users/search.ts @@ -16,15 +16,15 @@ const escapeRegexp = require('escape-regexp'); */ module.exports = (params, me) => new Promise(async (res, rej) => { // Get 'query' parameter - const [query, queryError] = $(params.query).string().pipe(x => x != '').$; + const [query, queryError] = $(params.query).string().pipe(x => x != '').get(); if (queryError) return rej('invalid query param'); // Get 'offset' parameter - const [offset = 0, offsetErr] = $(params.offset).optional.number().min(0).$; + const [offset = 0, offsetErr] = $(params.offset).optional.number().min(0).get(); if (offsetErr) return rej('invalid offset param'); // Get 'max' parameter - const [max = 10, maxErr] = $(params.max).optional.number().range(1, 30).$; + const [max = 10, maxErr] = $(params.max).optional.number().range(1, 30).get(); if (maxErr) return rej('invalid max param'); // If Elasticsearch is available, search by $ diff --git a/src/server/api/endpoints/users/search_by_username.ts b/src/server/api/endpoints/users/search_by_username.ts index 91d9ad1f3a..da38347956 100644 --- a/src/server/api/endpoints/users/search_by_username.ts +++ b/src/server/api/endpoints/users/search_by_username.ts @@ -9,15 +9,15 @@ import User, { pack } from '../../../../models/user'; */ module.exports = (params, me) => new Promise(async (res, rej) => { // Get 'query' parameter - const [query, queryError] = $(params.query).string().$; + const [query, queryError] = $(params.query).string().get(); if (queryError) return rej('invalid query param'); // Get 'offset' parameter - const [offset = 0, offsetErr] = $(params.offset).optional.number().min(0).$; + const [offset = 0, offsetErr] = $(params.offset).optional.number().min(0).get(); if (offsetErr) return rej('invalid offset param'); // Get 'limit' parameter - const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).$; + const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).get(); if (limitErr) return rej('invalid limit param'); const users = await User diff --git a/src/server/api/endpoints/users/show.ts b/src/server/api/endpoints/users/show.ts index 141565ece6..89a8684538 100644 --- a/src/server/api/endpoints/users/show.ts +++ b/src/server/api/endpoints/users/show.ts @@ -14,19 +14,19 @@ module.exports = (params, me) => new Promise(async (res, rej) => { let user; // Get 'userId' parameter - const [userId, userIdErr] = $(params.userId).optional.type(ID).$; + const [userId, userIdErr] = $(params.userId).optional.type(ID).get(); if (userIdErr) return rej('invalid userId param'); // Get 'userIds' parameter - const [userIds, userIdsErr] = $(params.userIds).optional.array($().type(ID)).$; + const [userIds, userIdsErr] = $(params.userIds).optional.array($().type(ID)).get(); if (userIdsErr) return rej('invalid userIds param'); // Get 'username' parameter - const [username, usernameErr] = $(params.username).optional.string().$; + const [username, usernameErr] = $(params.username).optional.string().get(); if (usernameErr) return rej('invalid username param'); // Get 'host' parameter - const [host, hostErr] = $(params.host).nullable.optional.string().$; + const [host, hostErr] = $(params.host).nullable.optional.string().get(); if (hostErr) return rej('invalid host param'); if (userIds) { |