summaryrefslogtreecommitdiff
path: root/src/server/web
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2020-01-02 02:47:20 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2020-01-02 02:47:20 +0900
commit541f5f13149022dc637a4afb5ff91d103e2ed7d6 (patch)
tree82c2ff166507e48726b7bf923c494e81a18569bf /src/server/web
parentFix: リモートプロキシ時にサムネイルのContent-Typeがおかし... (diff)
downloadsharkey-541f5f13149022dc637a4afb5ff91d103e2ed7d6.tar.gz
sharkey-541f5f13149022dc637a4afb5ff91d103e2ed7d6.tar.bz2
sharkey-541f5f13149022dc637a4afb5ff91d103e2ed7d6.zip
Hide suspended user profile (#5452)
Diffstat (limited to 'src/server/web')
-rw-r--r--src/server/web/index.ts10
1 files changed, 7 insertions, 3 deletions
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) {