diff options
| author | かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> | 2024-03-18 14:20:28 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-18 14:20:28 +0900 |
| commit | a38646bd0f732c3f71bf9e8174baa7d66f8eae9f (patch) | |
| tree | 9586686699daaf5a68c94d130b206d9b96622f10 | |
| parent | fix(frontend): WebGL2コンテキストの初期化に失敗するとMisskey... (diff) | |
| download | sharkey-a38646bd0f732c3f71bf9e8174baa7d66f8eae9f.tar.gz sharkey-a38646bd0f732c3f71bf9e8174baa7d66f8eae9f.tar.bz2 sharkey-a38646bd0f732c3f71bf9e8174baa7d66f8eae9f.zip | |
fix(backend): フォローリクエストを作成する際に既存のものは削除するように (#13588)
* fix: delete old follow request (if exists) before creating new
(cherry picked from commit ea948ccadc7eace1fcace176c9c070b2a9b46f56)
* Update Changelog
* Update Changelog
---------
Co-authored-by: Kaity A <kaity@atikayda.au>
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | packages/backend/src/core/UserFollowingService.ts | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index cbd190d714..09f7bba18b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ ### Server - Enhance: エンドポイント`antennas/update`の必須項目を`antennaId`のみに +- Fix: フォローリクエストを作成する際に既存のものは削除するように + (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/440) ## 2024.3.1 diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts index 0a492c06e4..deeecdeb1f 100644 --- a/packages/backend/src/core/UserFollowingService.ts +++ b/packages/backend/src/core/UserFollowingService.ts @@ -511,6 +511,12 @@ export class UserFollowingService implements OnModuleInit { if (blocking) throw new Error('blocking'); if (blocked) throw new Error('blocked'); + // Remove old follow requests before creating a new one. + await this.followRequestsRepository.delete({ + followeeId: followee.id, + followerId: follower.id, + }); + const followRequest = await this.followRequestsRepository.insert({ id: this.idService.gen(), followerId: follower.id, |