From 9f81288fccdbaf9184d49e61680747945b34f23d Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 17 Jan 2017 11:11:22 +0900 Subject: Fix bug --- src/api/endpoints/users/followers.js | 5 ++--- src/api/endpoints/users/following.js | 5 ++--- src/api/endpoints/users/posts.js | 5 ++--- src/api/endpoints/users/recommendation.js | 5 ++--- src/api/endpoints/users/search.js | 6 ++---- src/api/endpoints/users/search_by_username.js | 3 +-- 6 files changed, 11 insertions(+), 18 deletions(-) (limited to 'src/api/endpoints/users') diff --git a/src/api/endpoints/users/followers.js b/src/api/endpoints/users/followers.js index 303f55e450..ac61361232 100644 --- a/src/api/endpoints/users/followers.js +++ b/src/api/endpoints/users/followers.js @@ -78,11 +78,10 @@ module.exports = (params, me) => // Get followers const following = await Following - .find(query, {}, { + .find(query, { limit: limit + 1, sort: { _id: -1 } - }) - .toArray(); + }); // 「次のページ」があるかどうか const inStock = following.length === limit + 1; diff --git a/src/api/endpoints/users/following.js b/src/api/endpoints/users/following.js index ec3954563a..c1266b1d19 100644 --- a/src/api/endpoints/users/following.js +++ b/src/api/endpoints/users/following.js @@ -78,11 +78,10 @@ module.exports = (params, me) => // Get followers const following = await Following - .find(query, {}, { + .find(query, { limit: limit + 1, sort: { _id: -1 } - }) - .toArray(); + }); // 「次のページ」があるかどうか const inStock = following.length === limit + 1; diff --git a/src/api/endpoints/users/posts.js b/src/api/endpoints/users/posts.js index 1b8dfe031b..8902cc314c 100644 --- a/src/api/endpoints/users/posts.js +++ b/src/api/endpoints/users/posts.js @@ -111,11 +111,10 @@ module.exports = (params, me) => // Issue query const posts = await Post - .find(query, {}, { + .find(query, { limit: limit, sort: sort - }) - .toArray(); + }); // Serialize res(await Promise.all(posts.map(async (post) => diff --git a/src/api/endpoints/users/recommendation.js b/src/api/endpoints/users/recommendation.js index 9daab0ec57..d4c33c37a4 100644 --- a/src/api/endpoints/users/recommendation.js +++ b/src/api/endpoints/users/recommendation.js @@ -46,14 +46,13 @@ module.exports = (params, me) => _id: { $nin: followingIds } - }, {}, { + }, { limit: limit, skip: offset, sort: { followers_count: -1 } - }) - .toArray(); + }); // Serialize res(await Promise.all(users.map(async user => diff --git a/src/api/endpoints/users/search.js b/src/api/endpoints/users/search.js index 3a3fe677db..f8b2eccec6 100644 --- a/src/api/endpoints/users/search.js +++ b/src/api/endpoints/users/search.js @@ -63,8 +63,7 @@ async function byNative(res, rej, me, query, offset, max) { }, { name: new RegExp(escapedQuery) }] - }) - .toArray(); + }); // Serialize res(await Promise.all(users.map(async user => @@ -106,8 +105,7 @@ async function byElasticsearch(res, rej, me, query, offset, max) { _id: { $in: hits } - }) - .toArray(); + }); // Serialize res(await Promise.all(users.map(async user => diff --git a/src/api/endpoints/users/search_by_username.js b/src/api/endpoints/users/search_by_username.js index 9e3efbd85c..2f19df3c8a 100644 --- a/src/api/endpoints/users/search_by_username.js +++ b/src/api/endpoints/users/search_by_username.js @@ -56,8 +56,7 @@ module.exports = (params, me) => }, { limit: limit, skip: offset - }) - .toArray(); + }); // Serialize res(await Promise.all(users.map(async user => -- cgit v1.2.3-freya