diff options
Diffstat (limited to 'src/server/api/endpoints')
| -rw-r--r-- | src/server/api/endpoints/users/search_by_username.ts | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/server/api/endpoints/users/search_by_username.ts b/src/server/api/endpoints/users/search_by_username.ts index 1d8553baef..bfab378389 100644 --- a/src/server/api/endpoints/users/search_by_username.ts +++ b/src/server/api/endpoints/users/search_by_username.ts @@ -28,7 +28,7 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) => }); if (users.length < limit) { - const remoteUsers = await User + const otherUsers = await User .find({ host: { $ne: null }, usernameLower: new RegExp('^' + escapeRegexp(query.toLowerCase())) @@ -36,31 +36,33 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) => limit: limit - users.length }); - users = users.concat(remoteUsers); + users = users.concat(otherUsers); } if (users.length < limit) { - const remoteUsers = await User + const otherUsers = await User .find({ + _id: { $nin: users.map(u => u._id) }, host: null, usernameLower: new RegExp(escapeRegexp(query.toLowerCase())) }, { limit: limit - users.length }); - users = users.concat(remoteUsers); + users = users.concat(otherUsers); } if (users.length < limit) { - const remoteUsers = await User + const otherUsers = await User .find({ + _id: { $nin: users.map(u => u._id) }, host: { $ne: null }, usernameLower: new RegExp(escapeRegexp(query.toLowerCase())) }, { limit: limit - users.length }); - users = users.concat(remoteUsers); + users = users.concat(otherUsers); } // Serialize |