perf: hydrate repost events in reblog endpoint & streaming

src/controllers/api/statuses.ts

@@ -12,6 +12,7 @@ import { getLnurl } from '@/utils/lnurl.ts';
 import { nip05Cache } from '@/utils/nip05.ts';
 import { asyncReplaceAll } from '@/utils/text.ts';
 import { eventsDB } from '@/storages.ts';
+import { hydrateEvents } from '@/storages/hydrate.ts';
 
 const createStatusSchema = z.object({
   in_reply_to_id: z.string().regex(/[0-9a-f]{64}/).nullish(),
@@ -212,6 +213,7 @@ const favouritedByController: AppController = (c) => {
 /** https://docs.joinmastodon.org/methods/statuses/#boost */
 const reblogStatusController: AppController = async (c) => {
   const eventId = c.req.param('id');
+  const { signal } = c.req.raw;
 
   const event = await getEvent(eventId, {
     kind: 1,
@@ -226,7 +228,14 @@ const reblogStatusController: AppController = async (c) => {
     tags: [['e', event.id], ['p', event.pubkey]],
   }, c);
 
-  const status = await renderReblog(reblogEvent, { loadOriginalPostEvent: true });
+  await hydrateEvents({
+    events: [reblogEvent, event],
+    relations: ['repost', 'author'],
+    storage: eventsDB,
+    signal: signal,
+  });
+
+  const status = await renderReblog(reblogEvent);
 
   return c.json(status);
 };

src/controllers/api/streaming.ts

@@ -6,6 +6,8 @@ import { getFeedPubkeys } from '@/queries.ts';
 import { Sub } from '@/subs.ts';
 import { bech32ToPubkey } from '@/utils.ts';
 import { renderReblog, renderStatus } from '@/views/mastodon/statuses.ts';
+import { hydrateEvents } from '@/storages/hydrate.ts';
+import { eventsDB } from '@/storages.ts';
 
 const debug = Debug('ditto:streaming');
 
@@ -64,7 +66,14 @@ const streamingController: AppController = (c) => {
     if (filter) {
       for await (const event of Sub.sub(socket, '1', [filter])) {
         if (event.kind === 6) {
-          const status = await renderReblog(event, { loadOriginalPostEvent: true });
+          await hydrateEvents({
+            events: [event],
+            relations: ['repost', 'author'],
+            storage: eventsDB,
+            signal: AbortSignal.timeout(1000),
+          });
+
+          const status = await renderReblog(event);
           if (status) {
             send('update', status);
           }

src/controllers/api/timelines.ts

@@ -63,7 +63,7 @@ async function renderStatuses(c: AppContext, filters: NostrFilter[]) {
 
   const statuses = (await Promise.all(events.map((event) => {
     if (event.kind === 6) {
-      return renderReblog(event, {});
+      return renderReblog(event);
     }
     return renderStatus(event, c.get('pubkey'));
   }))).filter((boolean) => boolean);