diff options
Diffstat (limited to 'src/server/api/endpoints/admin/show-users.ts')
| -rw-r--r-- | src/server/api/endpoints/admin/show-users.ts | 46 |
1 files changed, 12 insertions, 34 deletions
diff --git a/src/server/api/endpoints/admin/show-users.ts b/src/server/api/endpoints/admin/show-users.ts index cc21b4e672..3646f96d7d 100644 --- a/src/server/api/endpoints/admin/show-users.ts +++ b/src/server/api/endpoints/admin/show-users.ts @@ -1,6 +1,7 @@ import $ from 'cafy'; import User, { pack } from '../../../../models/user'; import define from '../../define'; +import { fallback } from '../../../../prelude/symbol'; export const meta = { requireCredential: true, @@ -52,40 +53,17 @@ export const meta = { } }; -export default define(meta, (ps, me) => new Promise(async (res, rej) => { - let _sort; - if (ps.sort) { - if (ps.sort == '+follower') { - _sort = { - followersCount: -1 - }; - } else if (ps.sort == '-follower') { - _sort = { - followersCount: 1 - }; - } else if (ps.sort == '+createdAt') { - _sort = { - createdAt: -1 - }; - } else if (ps.sort == '+updatedAt') { - _sort = { - updatedAt: -1 - }; - } else if (ps.sort == '-createdAt') { - _sort = { - createdAt: 1 - }; - } else if (ps.sort == '-updatedAt') { - _sort = { - updatedAt: 1 - }; - } - } else { - _sort = { - _id: -1 - }; - } +const sort: any = { // < https://github.com/Microsoft/TypeScript/issues/1863 + '+follower': { followersCount: -1 }, + '-follower': { followersCount: 1 }, + '+createdAt': { createdAt: -1 }, + '-createdAt': { createdAt: 1 }, + '+updatedAt': { updatedAt: -1 }, + '-updatedAt': { updatedAt: 1 }, + [fallback]: { _id: -1 } +}; +export default define(meta, (ps, me) => new Promise(async (res, rej) => { const q = { $and: [] } as any; @@ -117,7 +95,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => { const users = await User .find(q, { limit: ps.limit, - sort: _sort, + sort: sort[ps.sort] || sort[fallback], skip: ps.offset }); |