From dbe67738d88057a7d4203e88fdc3e39949de1113 Mon Sep 17 00:00:00 2001 From: mattyatea Date: Mon, 9 Oct 2023 22:17:13 +0900 Subject: [PATCH] bug fix --- .../src/server/api/endpoints/notes/hybrid-timeline.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts index 0a3006efc8..3ec8281888 100644 --- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts @@ -81,8 +81,8 @@ export default class extends Endpoint { // eslint- private redisTimelineService: RedisTimelineService, ) { super(meta, paramDef, async (ps, me) => { - const untilId = ps.untilId ?? (ps.untilDate ? this.idService.genId(new Date(ps.untilDate!)) : null); - const sinceId = ps.sinceId ?? (ps.sinceDate ? this.idService.genId(new Date(ps.sinceDate!)) : null); + const untilId = ps.untilId ?? ps.untilDate ? this.idService.genId(new Date(ps.untilDate!)) : null; + const sinceId = ps.sinceId ?? ps.sinceDate ? this.idService.genId(new Date(ps.sinceDate!)) : null; const policies = await this.roleService.getUserPolicies(me.id); if (!policies.ltlAvailable) { @@ -107,7 +107,7 @@ export default class extends Endpoint { // eslint- let noteIds = Array.from(new Set([...htlNoteIds, ...ltlNoteIds])); noteIds.sort((a, b) => a > b ? -1 : 1); noteIds = noteIds.slice(0, ps.limit); - if (noteIds.length < limit) { + if (noteIds.length < ps.limit) { const followingQuery = this.followingsRepository.createQueryBuilder('following') .select('following.followeeId') .where('following.followerId = :followerId', { followerId: me.id }); @@ -165,11 +165,11 @@ export default class extends Endpoint { // eslint- query.andWhere('note.fileIds != \'{}\''); } //#endregion - const ids = await query.limit(limit - noteIds.length).getMany(); + const ids = await query.limit(ps.limit - noteIds.length).getMany(); noteIds = noteIds.concat(ids.map(note => note.id)); } - + if (noteIds.length === 0) { return []; }