diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-04-03 16:37:42 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-03 16:37:42 +0900 |
| commit | 41d3992c528a2d59862d92992a854ff38934a5b4 (patch) | |
| tree | 2a48cad7628ec973e019ed5be7398004971040d8 /src/processor | |
| parent | Merge pull request #1380 from akihikodaki/misc (diff) | |
| parent | Implement unfollow by remote account (diff) | |
| download | sharkey-41d3992c528a2d59862d92992a854ff38934a5b4.tar.gz sharkey-41d3992c528a2d59862d92992a854ff38934a5b4.tar.bz2 sharkey-41d3992c528a2d59862d92992a854ff38934a5b4.zip | |
Merge pull request #1381 from akihikodaki/unfollow
Implement unfollow by remote account
Diffstat (limited to 'src/processor')
| -rw-r--r-- | src/processor/http/perform-activitypub.ts | 3 | ||||
| -rw-r--r-- | src/processor/http/process-inbox.ts | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/processor/http/perform-activitypub.ts b/src/processor/http/perform-activitypub.ts index adf4e65a72..4fdbb901d7 100644 --- a/src/processor/http/perform-activitypub.ts +++ b/src/processor/http/perform-activitypub.ts @@ -1,5 +1,6 @@ import User from '../../models/user'; import act from '../../remote/activitypub/act'; +import Resolver from '../../remote/activitypub/resolver'; export default ({ data }) => User.findOne({ _id: data.actor }) - .then(actor => act(actor, data.outbox, false)); + .then(actor => act(new Resolver(), actor, data.outbox)); diff --git a/src/processor/http/process-inbox.ts b/src/processor/http/process-inbox.ts index 11801409cc..e75c0b5c54 100644 --- a/src/processor/http/process-inbox.ts +++ b/src/processor/http/process-inbox.ts @@ -3,6 +3,7 @@ import parseAcct from '../../acct/parse'; import User, { IRemoteUser } from '../../models/user'; import act from '../../remote/activitypub/act'; import resolvePerson from '../../remote/activitypub/resolve-person'; +import Resolver from '../../remote/activitypub/resolver'; export default async ({ data }) => { const keyIdLower = data.signature.keyId.toLowerCase(); @@ -34,5 +35,5 @@ export default async ({ data }) => { throw 'signature verification failed'; } - await act(user, data.inbox, true); + await act(new Resolver(), user, data.inbox, true); }; |