diff options
| author | Aya Morisawa <AyaMorisawa4869@gmail.com> | 2018-07-08 20:04:35 +0900 |
|---|---|---|
| committer | Aya Morisawa <AyaMorisawa4869@gmail.com> | 2018-07-08 20:04:35 +0900 |
| commit | 65a3c7dae4165b89eb82744f0695ced1a946bd2d (patch) | |
| tree | 3477efdae2a45ff82e0003d15959bea0bb00d3b5 /src | |
| parent | Add locales (diff) | |
| parent | Merge pull request #1871 from mei23/mei-apreq3 (diff) | |
| download | misskey-65a3c7dae4165b89eb82744f0695ced1a946bd2d.tar.gz misskey-65a3c7dae4165b89eb82744f0695ced1a946bd2d.tar.bz2 misskey-65a3c7dae4165b89eb82744f0695ced1a946bd2d.zip | |
Merge branch 'master' of aya.github:syuilo/misskey
Diffstat (limited to 'src')
| -rw-r--r-- | src/remote/activitypub/kernel/accept/follow.ts | 2 | ||||
| -rw-r--r-- | src/remote/activitypub/kernel/reject/follow.ts | 2 | ||||
| -rw-r--r-- | src/remote/activitypub/kernel/undo/follow.ts | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/remote/activitypub/kernel/accept/follow.ts b/src/remote/activitypub/kernel/accept/follow.ts index 0f414ba321..07c820c28a 100644 --- a/src/remote/activitypub/kernel/accept/follow.ts +++ b/src/remote/activitypub/kernel/accept/follow.ts @@ -5,7 +5,7 @@ import accept from '../../../../services/following/requests/accept'; import { IFollow } from '../../type'; export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => { - const id = typeof activity.object == 'string' ? activity.object : activity.object.id; + const id = typeof activity.actor == 'string' ? activity.actor : activity.actor.id; if (!id.startsWith(config.url + '/')) { return null; diff --git a/src/remote/activitypub/kernel/reject/follow.ts b/src/remote/activitypub/kernel/reject/follow.ts index c139865d0e..35cd2ec0c9 100644 --- a/src/remote/activitypub/kernel/reject/follow.ts +++ b/src/remote/activitypub/kernel/reject/follow.ts @@ -5,7 +5,7 @@ import reject from '../../../../services/following/requests/reject'; import { IFollow } from '../../type'; export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => { - const id = typeof activity.object == 'string' ? activity.object : activity.object.id; + const id = typeof activity.actor == 'string' ? activity.actor : activity.actor.id; if (!id.startsWith(config.url + '/')) { return null; diff --git a/src/remote/activitypub/kernel/undo/follow.ts b/src/remote/activitypub/kernel/undo/follow.ts index 7377984616..f112ee8bfb 100644 --- a/src/remote/activitypub/kernel/undo/follow.ts +++ b/src/remote/activitypub/kernel/undo/follow.ts @@ -31,7 +31,7 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => { }); if (req) { - await cancelRequest(actor, followee); + await cancelRequest(followee, actor); } else { await unfollow(actor, followee); } |