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/web/index.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/server/web/index.ts')

diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index dff6e139c8..06c7274f5a 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -101,7 +101,8 @@ const getFeed = async (acct: string) => {
 	const { username, host } = parseAcct(acct);
 	const user = await Users.findOne({
 		usernameLower: username.toLowerCase(),
-		host
+		host,
+		isSuspended: false
 	});
 
 	return user && await packFeed(user);
@@ -149,7 +150,8 @@ router.get(['/@:user', '/@:user/:sub'], async (ctx, next) => {
 	const { username, host } = parseAcct(ctx.params.user);
 	const user = await Users.findOne({
 		usernameLower: username.toLowerCase(),
-		host
+		host,
+		isSuspended: false
 	});
 
 	if (user != null) {
@@ -170,6 +172,7 @@ router.get(['/@:user', '/@:user/:sub'], async (ctx, next) => {
 		ctx.set('Cache-Control', 'public, max-age=30');
 	} else {
 		// リモートユーザーなので
+		// モデレータがAPI経由で参照可能にするために404にはしない
 		await next();
 	}
 });
@@ -177,7 +180,8 @@ router.get(['/@:user', '/@:user/:sub'], async (ctx, next) => {
 router.get('/users/:user', async ctx => {
 	const user = await Users.findOne({
 		id: ctx.params.user,
-		host: null
+		host: null,
+		isSuspended: false
 	});
 
 	if (user == null) {
-- 
cgit v1.2.3-freya