From 18d3363b656aa3e0335a1e193d31838af1e8e7c1 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 5 Jun 2024 11:10:58 -0500 Subject: [PATCH] contextController: fix hydration again --- src/controllers/api/statuses.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/controllers/api/statuses.ts b/src/controllers/api/statuses.ts index 01e947af..b5ecf01e 100644 --- a/src/controllers/api/statuses.ts +++ b/src/controllers/api/statuses.ts @@ -215,17 +215,22 @@ const contextController: AppController = async (c) => { } if (event) { - const [ancestors, descendants] = await Promise.all([ - getAncestors(store, event).then(renderStatuses), - getDescendants(store, event.id).then(renderStatuses), + const [ancestorEvents, descendantEvents] = await Promise.all([ + getAncestors(store, event), + getDescendants(store, event.id), ]); await hydrateEvents({ - events: [...ancestors, ...descendants], + events: [...ancestorEvents, ...descendantEvents], signal: c.req.raw.signal, store, }); + const [ancestors, descendants] = await Promise.all([ + renderStatuses(ancestorEvents), + renderStatuses(descendantEvents), + ]); + return c.json({ ancestors, descendants }); }