Merge pull request #1871 from mei23/mei-apreq3

フォロー申請結果とフォロー申請解除の処理の修正

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;

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;

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);
 	}