chore: fix non-reply / renote
This commit is contained in:
parent
96c1ac2252
commit
12c3304cb5
|
@ -257,16 +257,20 @@ export class QueryService {
|
||||||
public generateSuspendedUserQueryForNote(q: SelectQueryBuilder<any>, excludeAuthor?: boolean): void {
|
public generateSuspendedUserQueryForNote(q: SelectQueryBuilder<any>, excludeAuthor?: boolean): void {
|
||||||
if (excludeAuthor) {
|
if (excludeAuthor) {
|
||||||
const brakets = (user: string) => new Brackets(qb => qb
|
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`));
|
.orWhere(`${user}.isSuspended = FALSE`));
|
||||||
q
|
q
|
||||||
.andWhere(brakets('replyUser'))
|
.andWhere(brakets('replyUser'))
|
||||||
.andWhere(brakets('renoteUser'));
|
.andWhere(brakets('renoteUser'));
|
||||||
} else {
|
} else {
|
||||||
|
const brakets = (user: string) => new Brackets(qb => qb
|
||||||
|
.where(`${user} IS NULL`)
|
||||||
|
.orWhere(`${user}.isSuspended = FALSE`));
|
||||||
q
|
q
|
||||||
.andWhere('user.isSuspended = FALSE')
|
.andWhere('user.isSuspended = FALSE')
|
||||||
.andWhere('replyUser.isSuspended = FALSE')
|
.andWhere(brakets('replyUser'))
|
||||||
.andWhere('renoteUser.isSuspended = FALSE');
|
.andWhere(brakets('renoteUser'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue