sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use object instead of if chain (#4212)

Browse Source
This commit is contained in:
Acid Chicken (硫酸鶏)
2019-02-17 21:40:53 +09:00
committed by syuilo
parent c4efbdf4c7
commit 357528d139
4 changed files with 65 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/server/api/endpoints/admin/show-users.ts
View File

@@ -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
});