From e8bde94e5bccf1303a1aec2f86544d59452bbb9d Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 2 Apr 2018 04:01:34 +0900 Subject: Refactor --- src/server/activitypub/inbox.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/server/activitypub') diff --git a/src/server/activitypub/inbox.ts b/src/server/activitypub/inbox.ts index 6d092e66bf..cb679dbf0e 100644 --- a/src/server/activitypub/inbox.ts +++ b/src/server/activitypub/inbox.ts @@ -1,8 +1,9 @@ import * as bodyParser from 'body-parser'; import * as express from 'express'; import { parseRequest, verifySignature } from 'http-signature'; -import User, { IRemoteAccount } from '../../models/user'; +import User, { IRemoteUser } from '../../models/user'; import queue from '../../queue'; +import parseAcct from '../../common/user/parse-acct'; const app = express(); app.disable('x-powered-by'); @@ -36,13 +37,13 @@ app.post('/@:user/inbox', async (req, res) => { }; } - const user = await User.findOne(query); + const user = await User.findOne(query) as IRemoteUser; if (user === null) { return res.sendStatus(401); } - if (!verifySignature(parsed, (user.account as IRemoteAccount).publicKey.publicKeyPem)) { + if (!verifySignature(parsed, user.account.publicKey.publicKeyPem)) { return res.sendStatus(401); } -- cgit v1.2.3-freya