From 96ee6357652a25f7175373dbaacedca2e2e69ba3 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Wed, 13 Aug 2025 11:54:44 -0400 Subject: [PATCH] make QueryService.generateSuspendedUserQueryForNote automatically add all required joins --- packages/backend/src/core/QueryService.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts index 4fa0afc71e..00696b23a7 100644 --- a/packages/backend/src/core/QueryService.ts +++ b/packages/backend/src/core/QueryService.ts @@ -663,9 +663,14 @@ export class QueryService { return q[join](`NOT EXISTS (${threadMutedQuery.getQuery()})`, threadMutedQuery.getParameters()); } - // Requirements: user replyUser renoteUser must be joined @bindThis - public generateSuspendedUserQueryForNote(q: SelectQueryBuilder, excludeAuthor?: boolean): void { + public generateSuspendedUserQueryForNote(q: SelectQueryBuilder, excludeAuthor?: boolean): void { + this.leftJoin(q, 'note.user', 'user'); + this.leftJoin(q, 'note.reply', 'reply'); + this.leftJoin(q, 'note.renote', 'renote'); + this.leftJoin(q, 'reply.user', 'replyUser'); + this.leftJoin(q, 'renote.user', 'renoteUser'); + if (excludeAuthor) { const brakets = (user: string) => new Brackets(qb => qb .where(`note.${user}Id IS NULL`)