diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2020-12-26 15:31:28 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-26 15:31:28 +0900 |
| commit | c5bdee086da27c2c0b5e1119603b6d0783b1708e (patch) | |
| tree | d493c60abf1af80773486213101ef5a7b625d122 /src/server/api | |
| parent | fix locale handling (diff) | |
| download | sharkey-c5bdee086da27c2c0b5e1119603b6d0783b1708e.tar.gz sharkey-c5bdee086da27c2c0b5e1119603b6d0783b1708e.tar.bz2 sharkey-c5bdee086da27c2c0b5e1119603b6d0783b1708e.zip | |
フォローリクエストがなくてもフォロー承認が出来てしまうのを修正 (#7013)
* フォローリクエストがなくてもフォロー承認が出来てしまうのを修正
* プロキシアカウントがDB処理をせずにフォローを飛ばしているのを修正
Diffstat (limited to 'src/server/api')
| -rw-r--r-- | src/server/api/endpoints/following/requests/accept.ts | 10 |
1 files changed, 9 insertions, 1 deletions
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; }); |