From c5bdee086da27c2c0b5e1119603b6d0783b1708e Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sat, 26 Dec 2020 15:31:28 +0900
Subject: フォローリクエストがなくてもフォロー承認が出来てしまうのを修正
 (#7013)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* フォローリクエストがなくてもフォロー承認が出来てしまうのを修正

* プロキシアカウントがDB処理をせずにフォローを飛ばしているのを修正
---
 src/server/api/endpoints/following/requests/accept.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/server/api')

diff --git a/src/server/api/endpoints/following/requests/accept.ts b/src/server/api/endpoints/following/requests/accept.ts
index 6f3a0510a1..6dd93c0d45 100644
--- a/src/server/api/endpoints/following/requests/accept.ts
+++ b/src/server/api/endpoints/following/requests/accept.ts
@@ -33,6 +33,11 @@ export const meta = {
 			code: 'NO_SUCH_USER',
 			id: '66ce1645-d66c-46bb-8b79-96739af885bd'
 		},
+		noFollowRequest: {
+			message: 'No follow request.',
+			code: 'NO_FOLLOW_REQUEST',
+			id: 'bcde4f8b-0913-4614-8881-614e522fb041'
+		},
 	}
 };
 
@@ -43,7 +48,10 @@ export default define(meta, async (ps, user) => {
 		throw e;
 	});
 
-	await acceptFollowRequest(user, follower);
+	await acceptFollowRequest(user, follower).catch(e => {
+		if (e.id === '8884c2dd-5795-4ac9-b27e-6a01d38190f9') throw new ApiError(meta.errors.noFollowRequest);
+		throw e;
+	});
 
 	return;
 });
-- 
cgit v1.2.3-freya