From dfabdef60f856639e84e041bdc95410c37856056 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 15 Mar 2019 13:51:23 +0900 Subject: [PATCH] Resolve #4501 --- src/models/user.ts | 1 + src/server/api/endpoints/users/search.ts | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/models/user.ts b/src/models/user.ts index 56e052ed4..0c3f7b550 100644 --- a/src/models/user.ts +++ b/src/models/user.ts @@ -20,6 +20,7 @@ User.createIndex('createdAt'); User.createIndex('updatedAt'); User.createIndex('followersCount'); User.createIndex('tags'); +User.createIndex('isSuspended'); User.createIndex('username'); User.createIndex('usernameLower'); User.createIndex('host'); diff --git a/src/server/api/endpoints/users/search.ts b/src/server/api/endpoints/users/search.ts index b8519eeba..27b449d62 100644 --- a/src/server/api/endpoints/users/search.ts +++ b/src/server/api/endpoints/users/search.ts @@ -70,7 +70,8 @@ export default define(meta, async (ps, me) => { users = await User .find({ host: null, - usernameLower: new RegExp('^' + escapeRegexp(ps.query.replace('@', '').toLowerCase())) + usernameLower: new RegExp('^' + escapeRegexp(ps.query.replace('@', '').toLowerCase())), + isSuspended: false }, { limit: ps.limit, skip: ps.offset @@ -80,7 +81,8 @@ export default define(meta, async (ps, me) => { const otherUsers = await User .find({ host: { $ne: null }, - usernameLower: new RegExp('^' + escapeRegexp(ps.query.replace('@', '').toLowerCase())) + usernameLower: new RegExp('^' + escapeRegexp(ps.query.replace('@', '').toLowerCase())), + isSuspended: false }, { limit: ps.limit - users.length });