From 541f5f13149022dc637a4afb5ff91d103e2ed7d6 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Thu, 2 Jan 2020 02:47:20 +0900
Subject: Hide suspended user profile (#5452)

---
 src/server/api/endpoints/users/show.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/server/api/endpoints/users')

diff --git a/src/server/api/endpoints/users/show.ts b/src/server/api/endpoints/users/show.ts
index d17dd51c0a..f49017a8c3 100644
--- a/src/server/api/endpoints/users/show.ts
+++ b/src/server/api/endpoints/users/show.ts
@@ -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);
 		}
 
-- 
cgit v1.2.3-freya