summaryrefslogtreecommitdiff
path: root/packages/backend/src/core/UserFollowingService.ts
diff options
context:
space:
mode:
authorokayurisotto <okayurisotto@proton.me>2023-07-11 14:58:58 +0900
committerGitHub <noreply@github.com>2023-07-11 14:58:58 +0900
commitcf3e39178b4180bfc5f57b8bb766faf5b5fc99b9 (patch)
tree40d7b3daa5a02d715fc82528cc060df4744c46f2 /packages/backend/src/core/UserFollowingService.ts
parentchore(frontend): Remove experimental flag from migration feature (diff)
downloadsharkey-cf3e39178b4180bfc5f57b8bb766faf5b5fc99b9.tar.gz
sharkey-cf3e39178b4180bfc5f57b8bb766faf5b5fc99b9.tar.bz2
sharkey-cf3e39178b4180bfc5f57b8bb766faf5b5fc99b9.zip
refactor(backend): 存在確認の`findOneBy`を`exist`に置き換え (#11224)
* refactor(backend): 存在確認の`findOneBy`を`exist`に置き換え * cleanup
Diffstat (limited to 'packages/backend/src/core/UserFollowingService.ts')
-rw-r--r--packages/backend/src/core/UserFollowingService.ts40
1 files changed, 24 insertions, 16 deletions
diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts
index 7d90bc2c08..4d7bfeaf23 100644
--- a/packages/backend/src/core/UserFollowingService.ts
+++ b/packages/backend/src/core/UserFollowingService.ts
@@ -122,22 +122,26 @@ export class UserFollowingService implements OnModuleInit {
let autoAccept = false;
// 鍵アカウントであっても、既にフォローされていた場合はスルー
- const following = await this.followingsRepository.findOneBy({
- followerId: follower.id,
- followeeId: followee.id,
+ const isFollowing = await this.followingsRepository.exist({
+ where: {
+ followerId: follower.id,
+ followeeId: followee.id,
+ },
});
- if (following) {
+ if (isFollowing) {
autoAccept = true;
}
// フォローしているユーザーは自動承認オプション
if (!autoAccept && (this.userEntityService.isLocalUser(followee) && followeeProfile.autoAcceptFollowed)) {
- const followed = await this.followingsRepository.findOneBy({
- followerId: followee.id,
- followeeId: follower.id,
+ const isFollowed = await this.followingsRepository.exist({
+ where: {
+ followerId: followee.id,
+ followeeId: follower.id,
+ },
});
- if (followed) autoAccept = true;
+ if (isFollowed) autoAccept = true;
}
// Automatically accept if the follower is an account who has moved and the locked followee had accepted the old account.
@@ -206,12 +210,14 @@ export class UserFollowingService implements OnModuleInit {
this.cacheService.userFollowingsCache.refresh(follower.id);
- const req = await this.followRequestsRepository.findOneBy({
- followeeId: followee.id,
- followerId: follower.id,
+ const requestExist = await this.followRequestsRepository.exist({
+ where: {
+ followeeId: followee.id,
+ followerId: follower.id,
+ },
});
- if (req) {
+ if (requestExist) {
await this.followRequestsRepository.delete({
followeeId: followee.id,
followerId: follower.id,
@@ -505,12 +511,14 @@ export class UserFollowingService implements OnModuleInit {
}
}
- const request = await this.followRequestsRepository.findOneBy({
- followeeId: followee.id,
- followerId: follower.id,
+ const requestExist = await this.followRequestsRepository.exist({
+ where: {
+ followeeId: followee.id,
+ followerId: follower.id,
+ },
});
- if (request == null) {
+ if (!requestExist) {
throw new IdentifiableError('17447091-ce07-46dd-b331-c1fd4f15b1e7', 'request not found');
}