chore: fix non-reply / renote

This commit is contained in:
anatawa12 2025-04-08 00:46:53 +09:00
parent 96c1ac2252
commit 12c3304cb5
No known key found for this signature in database
GPG Key ID: 9CA909848B8E4EA6
1 changed files with 7 additions and 3 deletions

View File

@ -257,16 +257,20 @@ export class QueryService {
public generateSuspendedUserQueryForNote(q: SelectQueryBuilder<any>, excludeAuthor?: boolean): void {
if (excludeAuthor) {
const brakets = (user: string) => new Brackets(qb => qb
.where(`user.id = ${user}.id`)
.where(`${user} IS NULL`)
.orWhere(`user.id = ${user}.id`)
.orWhere(`${user}.isSuspended = FALSE`));
q
.andWhere(brakets('replyUser'))
.andWhere(brakets('renoteUser'));
} else {
const brakets = (user: string) => new Brackets(qb => qb
.where(`${user} IS NULL`)
.orWhere(`${user}.isSuspended = FALSE`));
q
.andWhere('user.isSuspended = FALSE')
.andWhere('replyUser.isSuspended = FALSE')
.andWhere('renoteUser.isSuspended = FALSE');
.andWhere(brakets('replyUser'))
.andWhere(brakets('renoteUser'));
}
}
}