From ac8eb94a27905a1bcac9fea445b41e5866cf173f Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Wed, 1 Mar 2017 17:37:01 +0900 Subject: Use any instead of Object --- src/api/endpoints/users.js | 89 +++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 45 deletions(-) (limited to 'src/api/endpoints/users.js') diff --git a/src/api/endpoints/users.js b/src/api/endpoints/users.js index 671eaae14f..63e28caa46 100644 --- a/src/api/endpoints/users.js +++ b/src/api/endpoints/users.js @@ -9,58 +9,57 @@ import serialize from '../serializers/user'; /** * Lists all users * - * @param {Object} params - * @param {Object} me - * @return {Promise} + * @param {any} params + * @param {any} me + * @return {Promise} */ module.exports = (params, me) => - new Promise(async (res, rej) => -{ - // Get 'limit' parameter - let limit = params.limit; - if (limit !== undefined && limit !== null) { - limit = parseInt(limit, 10); + new Promise(async (res, rej) => { + // Get 'limit' parameter + let limit = params.limit; + if (limit !== undefined && limit !== null) { + limit = parseInt(limit, 10); - // From 1 to 100 - if (!(1 <= limit && limit <= 100)) { - return rej('invalid limit range'); + // From 1 to 100 + if (!(1 <= limit && limit <= 100)) { + return rej('invalid limit range'); + } + } else { + limit = 10; } - } else { - limit = 10; - } - const since = params.since_id || null; - const max = params.max_id || null; + const since = params.since_id || null; + const max = params.max_id || null; - // Check if both of since_id and max_id is specified - if (since !== null && max !== null) { - return rej('cannot set since_id and max_id'); - } + // Check if both of since_id and max_id is specified + if (since !== null && max !== null) { + return rej('cannot set since_id and max_id'); + } - // Construct query - const sort = { - _id: -1 - }; - const query = {}; - if (since !== null) { - sort._id = 1; - query._id = { - $gt: new mongo.ObjectID(since) - }; - } else if (max !== null) { - query._id = { - $lt: new mongo.ObjectID(max) + // Construct query + const sort = { + _id: -1 }; - } + const query = {}; + if (since !== null) { + sort._id = 1; + query._id = { + $gt: new mongo.ObjectID(since) + }; + } else if (max !== null) { + query._id = { + $lt: new mongo.ObjectID(max) + }; + } - // Issue query - const users = await User - .find(query, { - limit: limit, - sort: sort - }); + // Issue query + const users = await User + .find(query, { + limit: limit, + sort: sort + }); - // Serialize - res(await Promise.all(users.map(async user => - await serialize(user, me)))); -}); + // Serialize + res(await Promise.all(users.map(async user => + await serialize(user, me)))); + }); -- cgit v1.3.1-freya