summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-09-20 05:14:21 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-09-20 05:14:21 +0900
commit0ef31a8bace77ccff5e3f3a4588069893f99f0bb (patch)
tree9481634b8259e11566b182919d68cd5b45ad8214 /src/server
parentFix: Keycap Number Sign が表示できない (#5431) (diff)
downloadsharkey-0ef31a8bace77ccff5e3f3a4588069893f99f0bb.tar.gz
sharkey-0ef31a8bace77ccff5e3f3a4588069893f99f0bb.tar.bz2
sharkey-0ef31a8bace77ccff5e3f3a4588069893f99f0bb.zip
Fix: unknown user cause 500 on AP (#5436)
Diffstat (limited to 'src/server')
-rw-r--r--src/server/activitypub.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/activitypub.ts b/src/server/activitypub.ts
index cd9ac752a4..1803fef79c 100644
--- a/src/server/activitypub.ts
+++ b/src/server/activitypub.ts
@@ -146,7 +146,7 @@ router.get('/users/:user/publickey', async ctx => {
});
// user
-async function userInfo(ctx: Router.IRouterContext, user: User) {
+async function userInfo(ctx: Router.IRouterContext, user: User | undefined) {
if (user == null) {
ctx.status = 404;
return;
@@ -165,7 +165,7 @@ router.get('/users/:user', async (ctx, next) => {
const user = await Users.findOne({
id: userId,
host: null
- }).then(ensure);
+ });
await userInfo(ctx, user);
});
@@ -176,7 +176,7 @@ router.get('/@:user', async (ctx, next) => {
const user = await Users.findOne({
usernameLower: ctx.params.user.toLowerCase(),
host: null
- }).then(ensure);
+ });
await userInfo(ctx, user);
});