Fix follow duplicate (#3548)

* フォローとリクエスト両方存在しても解除する

* 既にフォローしてても承認できるように

1 files changed, 9 insertions, 1 deletions

diff --git a/src/remote/activitypub/kernel/undo/follow.ts b/src/remote/activitypub/kernel/undo/follow.ts
index f112ee8bfb..af06aa5b31 100644
--- a/src/remote/activitypub/kernel/undo/follow.ts
+++ b/src/remote/activitypub/kernel/undo/follow.ts
@@ -5,6 +5,7 @@ import unfollow from '../../../../services/following/delete';
 import cancelRequest from '../../../../services/following/requests/cancel';
 import { IFollow } from '../../type';
 import FollowRequest from '../../../../models/follow-request';
+import Following from '../../../../models/following';
 
 export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
 	const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
@@ -30,9 +31,16 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
 		followeeId: followee._id
 	});
 
+	const following = await Following.findOne({
+		followerId: actor._id,
+		followeeId: followee._id
+	});
+
 	if (req) {
 		await cancelRequest(followee, actor);
-	} else {
+	}
+
+	if (following) {
 		await unfollow(actor, followee);
 	}
 };