summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-07-23 15:45:32 -0400
committerdakkar <dakkar@thenautilus.net>2025-07-27 18:01:11 +0100
commitf937f2d3c677c6634c29d28de1e5f8dbe15d1176 (patch)
tree54ef8b617be8a6d7a0c5d090686e8b009ad69f8b
parentmerge: disable outgoing mastodon quotes *FOR STABLE* (!1169) (diff)
downloadsharkey-f937f2d3c677c6634c29d28de1e5f8dbe15d1176.tar.gz
sharkey-f937f2d3c677c6634c29d28de1e5f8dbe15d1176.tar.bz2
sharkey-f937f2d3c677c6634c29d28de1e5f8dbe15d1176.zip
fix error in UserSuspendService.freezeAll and UserSuspendService.unFreezeAll caused by TypeORM bug
-rw-r--r--packages/backend/src/core/UserSuspendService.ts12
1 files changed, 4 insertions, 8 deletions
diff --git a/packages/backend/src/core/UserSuspendService.ts b/packages/backend/src/core/UserSuspendService.ts
index ddadab7022..0a592e5024 100644
--- a/packages/backend/src/core/UserSuspendService.ts
+++ b/packages/backend/src/core/UserSuspendService.ts
@@ -178,10 +178,8 @@ export class UserSuspendService {
// Freeze follow relations with all remote users
await this.followingsRepository
.createQueryBuilder('following')
- .orWhere({
- followeeId: user.id,
- followerHost: Not(IsNull()),
- })
+ .andWhere('following."followeeId" = :id', { id: user.id })
+ .andWhere('following."followerHost" IS NOT NULL')
.update({
isFollowerHibernated: true,
})
@@ -195,10 +193,8 @@ export class UserSuspendService {
.createQueryBuilder('following')
.innerJoin(MiUser, 'follower', 'user.id = following.followerId')
.andWhere('follower.isHibernated = false') // Don't unfreeze if the follower is *actually* frozen
- .andWhere({
- followeeId: user.id,
- followerHost: Not(IsNull()),
- })
+ .andWhere('following."followeeId" = :id', { id: user.id })
+ .andWhere('following."followerHost" IS NOT NULL')
.update({
isFollowerHibernated: false,
})