Merge branch 'threads-block' into 'main'

Hide muted users from threads

See merge request soapbox-pub/ditto!358

src/controllers/api/statuses.ts

@@ -203,6 +203,7 @@ const deleteStatusController: AppController = async (c) => {
 
 const contextController: AppController = async (c) => {
   const id = c.req.param('id');
+  const store = c.get('store');
   const event = await getEvent(id, { kind: 1, relations: ['author', 'event_stats', 'author_stats'] });
   const viewerPubkey = await c.get('signer')?.getPublicKey();
 
@@ -214,9 +215,20 @@ const contextController: AppController = async (c) => {
   }
 
   if (event) {
+    const [ancestorEvents, descendantEvents] = await Promise.all([
+      getAncestors(store, event),
+      getDescendants(store, event.id),
+    ]);
+
+    await hydrateEvents({
+      events: [...ancestorEvents, ...descendantEvents],
+      signal: c.req.raw.signal,
+      store,
+    });
+
     const [ancestors, descendants] = await Promise.all([
-      getAncestors(event).then(renderStatuses),
+      renderStatuses(ancestorEvents),
-      getDescendants(event.id).then(renderStatuses),
+      renderStatuses(descendantEvents),
     ]);
 
     return c.json({ ancestors, descendants });

src/queries.ts

@@ -1,4 +1,4 @@
-import { NostrEvent, NostrFilter } from '@nostrify/nostrify';
+import { NostrEvent, NostrFilter, NStore } from '@nostrify/nostrify';
 import Debug from '@soapbox/stickynotes/debug';
 
 import { Conf } from '@/config.ts';
@@ -68,17 +68,17 @@ async function getFeedPubkeys(pubkey: string): Promise<string[]> {
   return [...authors, pubkey];
 }
 
-async function getAncestors(event: NostrEvent, result: NostrEvent[] = []): Promise<NostrEvent[]> {
+async function getAncestors(store: NStore, event: NostrEvent, result: NostrEvent[] = []): Promise<NostrEvent[]> {
   if (result.length < 100) {
     const replyTag = findReplyTag(event.tags);
     const inReplyTo = replyTag ? replyTag[1] : undefined;
 
     if (inReplyTo) {
-      const parentEvent = await getEvent(inReplyTo, { kind: 1 });
+      const [parentEvent] = await store.query([{ kinds: [1], ids: [inReplyTo], limit: 1 }]);
 
       if (parentEvent) {
         result.push(parentEvent);
-        return getAncestors(parentEvent, result);
+        return getAncestors(store, parentEvent, result);
       }
     }
   }
@@ -86,14 +86,14 @@ async function getAncestors(event: NostrEvent, result: NostrEvent[] = []): Promi
   return result.reverse();
 }
 
-async function getDescendants(eventId: string, signal = AbortSignal.timeout(2000)): Promise<NostrEvent[]> {
+async function getDescendants(
-  const store = await Storages.db();
+  store: NStore,
-
+  eventId: string,
-  const events = await store
+  signal = AbortSignal.timeout(2000),
-    .query([{ kinds: [1], '#e': [eventId] }], { limit: 200, signal })
+): Promise<NostrEvent[]> {
+  return await store
+    .query([{ kinds: [1], '#e': [eventId], limit: 200 }], { signal })
     .then((events) => events.filter(({ tags }) => findReplyTag(tags)?.[1] === eventId));
-
-  return hydrateEvents({ events, store, signal });
 }
 
 /** Returns whether the pubkey is followed by a local user. */

src/storages/UserStore.ts

@@ -4,6 +4,8 @@ import { DittoEvent } from '@/interfaces/DittoEvent.ts';
 import { getTagSet } from '@/utils/tags.ts';
 
 export class UserStore implements NStore {
+  private promise: Promise<DittoEvent[]> | undefined;
+
   constructor(private pubkey: string, private store: NStore) {}
 
   async event(event: NostrEvent, opts?: { signal?: AbortSignal }): Promise<void> {
@@ -24,7 +26,10 @@ export class UserStore implements NStore {
   }
 
   private async getMuteList(): Promise<DittoEvent | undefined> {
-    const [muteList] = await this.store.query([{ authors: [this.pubkey], kinds: [10000], limit: 1 }]);
+    if (!this.promise) {
+      this.promise = this.store.query([{ authors: [this.pubkey], kinds: [10000], limit: 1 }]);
+    }
+    const [muteList] = await this.promise;
     return muteList;
   }