diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts index b0ed3f41ce..fcd61319b8 100644 --- a/packages/backend/src/server/api/endpoints/users/notes.ts +++ b/packages/backend/src/server/api/endpoints/users/notes.ts @@ -67,8 +67,13 @@ export default define(meta, paramDef, async (ps, me) => { throw e; }); - const cte = - Notes.createQueryBuilder("n") + const cte = makePaginationQuery( + Notes.createQueryBuilder("n"), + ps.sinceId, + ps.untilId, + ps.sinceDate, + ps.untilDate, + ) .select(`"n"."id"`, "id") .andWhere("n.userId = :userId", { userId: user.id }); @@ -82,7 +87,6 @@ export default define(meta, paramDef, async (ps, me) => { if (ps.includeMyRenotes === false) { cte.andWhere( new Brackets((qb) => { - qb.orWhere("n.userId != :userId", { userId: user.id }); qb.orWhere("n.renoteId IS NULL"); qb.orWhere("n.text IS NOT NULL"); qb.orWhere("n.fileIds != '{}'"); @@ -93,13 +97,7 @@ export default define(meta, paramDef, async (ps, me) => { ); } - const query = makePaginationQuery( - Notes.createQueryBuilder("note"), - ps.sinceId, - ps.untilId, - ps.sinceDate, - ps.untilDate, - ) + const query = Notes.createQueryBuilder("note") .addCommonTableExpression(cte, "noteCte"); query.andWhere(`"note"."id" IN` + query.subQuery()