diff options
| author | Akihiko Odaki <nekomanma@pixiv.co.jp> | 2018-04-03 20:39:27 +0900 |
|---|---|---|
| committer | Akihiko Odaki <nekomanma@pixiv.co.jp> | 2018-04-03 20:41:54 +0900 |
| commit | c22cb377599780666ffe2c7ccdbdcb19a49f1969 (patch) | |
| tree | 1e5a8d36deceeb1611025ac93f04894178e22774 /src/processor/http | |
| parent | Improve readability (diff) | |
| download | sharkey-c22cb377599780666ffe2c7ccdbdcb19a49f1969.tar.gz sharkey-c22cb377599780666ffe2c7ccdbdcb19a49f1969.tar.bz2 sharkey-c22cb377599780666ffe2c7ccdbdcb19a49f1969.zip | |
Remove resolveRemoteUserObjects method of remote/activitypub/resolver
The value of the value returned by resolveRemoteUserObjects method of
remote/activitypub/resolver was inconsistent.
Diffstat (limited to 'src/processor/http')
| -rw-r--r-- | src/processor/http/perform-activitypub.ts | 3 | ||||
| -rw-r--r-- | src/processor/http/process-inbox.ts | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/processor/http/perform-activitypub.ts b/src/processor/http/perform-activitypub.ts index 4fdbb901d7..963e532fe5 100644 --- a/src/processor/http/perform-activitypub.ts +++ b/src/processor/http/perform-activitypub.ts @@ -3,4 +3,5 @@ import act from '../../remote/activitypub/act'; import Resolver from '../../remote/activitypub/resolver'; export default ({ data }) => User.findOne({ _id: data.actor }) - .then(actor => act(new Resolver(), actor, data.outbox)); + .then(actor => act(new Resolver(), actor, data.outbox)) + .then(Promise.all); diff --git a/src/processor/http/process-inbox.ts b/src/processor/http/process-inbox.ts index e75c0b5c54..8ceb082577 100644 --- a/src/processor/http/process-inbox.ts +++ b/src/processor/http/process-inbox.ts @@ -35,5 +35,5 @@ export default async ({ data }) => { throw 'signature verification failed'; } - await act(new Resolver(), user, data.inbox, true); + await Promise.all(await act(new Resolver(), user, data.inbox, true)); }; |