From be81c1a6d68be363df426f2b0026559c054c3982 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 4 Oct 2023 11:15:37 +0900
Subject: [PATCH] refactor
---
.../api/endpoints/notes/hybrid-timeline.ts | 22 ++++++++++---------
1 file changed, 12 insertions(+), 10 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 d6ed3db6e3..cae749bb88 100644
--- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -96,16 +96,18 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
let ltlNoteIdsRes: [string, string[]][] = [];
if (!ps.sinceId && !ps.sinceDate) {
- htlNoteIdsRes = await this.redisForTimelines.xrevrange(
- ps.withFiles ? `homeTimelineWithFiles:${me.id}` : `homeTimeline:${me.id}`,
- ps.untilId ? this.idService.parse(ps.untilId).date.getTime() : ps.untilDate ?? '+',
- '-',
- 'COUNT', limit);
- ltlNoteIdsRes = await this.redisForTimelines.xrevrange(
- ps.withFiles ? 'localTimelineWithFiles' : 'localTimeline',
- ps.untilId ? this.idService.parse(ps.untilId).date.getTime() : ps.untilDate ?? '+',
- '-',
- 'COUNT', limit);
+ [htlNoteIdsRes, ltlNoteIdsRes] = await Promise.all([
+ this.redisForTimelines.xrevrange(
+ ps.withFiles ? `homeTimelineWithFiles:${me.id}` : `homeTimeline:${me.id}`,
+ ps.untilId ? this.idService.parse(ps.untilId).date.getTime() : ps.untilDate ?? '+',
+ '-',
+ 'COUNT', limit),
+ this.redisForTimelines.xrevrange(
+ ps.withFiles ? 'localTimelineWithFiles' : 'localTimeline',
+ ps.untilId ? this.idService.parse(ps.untilId).date.getTime() : ps.untilDate ?? '+',
+ '-',
+ 'COUNT', limit),
+ ]);
}
const htlNoteIds = htlNoteIdsRes.map(x => x[1][1]).filter(x => x !== ps.untilId);