summaryrefslogtreecommitdiff
path: root/src/queue/processors/http
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-08-30 03:56:51 +0900
committerGitHub <noreply@github.com>2018-08-30 03:56:51 +0900
commit4e11da98d90c1c44fce1abaf63c248896feff03a (patch)
treecbe91363f87a3cc29b142433c16e4b16ccf2aa7d /src/queue/processors/http
parentNew translations ja-JP.yml (French) (diff)
parent:art: (diff)
downloadsharkey-4e11da98d90c1c44fce1abaf63c248896feff03a.tar.gz
sharkey-4e11da98d90c1c44fce1abaf63c248896feff03a.tar.bz2
sharkey-4e11da98d90c1c44fce1abaf63c248896feff03a.zip
Merge branch 'develop' into l10n_develop
Diffstat (limited to 'src/queue/processors/http')
-rw-r--r--src/queue/processors/http/process-inbox.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/queue/processors/http/process-inbox.ts b/src/queue/processors/http/process-inbox.ts
index 0738853dd1..c9c2fa72cb 100644
--- a/src/queue/processors/http/process-inbox.ts
+++ b/src/queue/processors/http/process-inbox.ts
@@ -46,7 +46,7 @@ export default async (job: bq.Job, done: any): Promise<void> => {
// アクティビティを送信してきたユーザーがまだMisskeyサーバーに登録されていなかったら登録する
if (user === null) {
- user = await resolvePerson(signature.keyId) as IRemoteUser;
+ user = await resolvePerson(activity.actor) as IRemoteUser;
}
}