remove duplicate isBlocked check from generateBlockedHostQueryForNote
This commit is contained in:
@@ -260,8 +260,7 @@ export class QueryService {
|
|||||||
q.leftJoin(`note.${key}Instance`, `${key}Instance`);
|
q.leftJoin(`note.${key}Instance`, `${key}Instance`);
|
||||||
q.andWhere(new Brackets(qb => {
|
q.andWhere(new Brackets(qb => {
|
||||||
qb.orWhere(`note.${key}Id IS NULL`) // no corresponding user
|
qb.orWhere(`note.${key}Id IS NULL`) // no corresponding user
|
||||||
.orWhere(`note.${key}Host IS NULL`) // local
|
.orWhere(`note.${key}Host IS NULL`); // local
|
||||||
.orWhere(`${key}Instance.isBlocked = false`); // not blocked
|
|
||||||
|
|
||||||
if (allowSilenced) {
|
if (allowSilenced) {
|
||||||
qb.orWhere(`${key}Instance.isBlocked = false`); // not blocked
|
qb.orWhere(`${key}Instance.isBlocked = false`); // not blocked
|
||||||
|
|||||||
Reference in New Issue
Block a user