From 1372a246b568024275acbe3e487f05d4cd9428e1 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Fri, 29 Jul 2022 00:33:51 -0700 Subject: [PATCH] brackets --- .../src/server/api/endpoints/notes/recommended-timeline.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts b/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts index 0c24560f9..b3dd9b2de 100644 --- a/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/recommended-timeline.ts @@ -66,11 +66,15 @@ export default define(meta, paramDef, async (ps, user) => { } } + // .andWhere('(note.userHost IN (:instances)) OR (note.userHost IS NULL)', { instances: instances }) //#region Construct query const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate) + .andWhere(new Brackets(qb => { + qb.where('((note.userHost IN (:instances))', { instances: instances }) + .orWhere('(note.userHost IS NULL)'); + })) .andWhere('(note.visibility = \'public\')') - .andWhere('(note.userHost IN (:instances)) OR (note.userHost IS NULL)', { instances: instances }) .innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('user.avatar', 'avatar') .leftJoinAndSelect('user.banner', 'banner')