Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hide suspended user profile (#5452)

Browse source
This commit is contained in:
MeiMei 2020-01-02 02:47:20 +09:00 • committed by syuilo
parent a3c7901f87
commit 541f5f1314
6 changed files with 40 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/server/api/endpoints/users/show.ts
View file

@ -66,13 +66,18 @@ export const meta = {
export default define(meta, async (ps, me) => {
let user;
const isAdminOrModerator = me && (me.isAdmin || me.isModerator);
if (ps.userIds) {
if (ps.userIds.length === 0) {
return [];
}
const users = await Users.find({
const users = await Users.find(isAdminOrModerator ? {
id: In(ps.userIds)
} : {
id: In(ps.userIds),
isSuspended: false
});
return await Promise.all(users.map(u => Users.pack(u, me, {
@ -93,7 +98,7 @@ export default define(meta, async (ps, me) => {
user = await Users.findOne(q);
}
if (user == null) {
if (user == null || (!isAdminOrModerator && user.isSuspended)) {
throw new ApiError(meta.errors.noSuchUser);
}