improve replies in threads

neb-b · Jan 22, 2023 · 87589f6 · 87589f6
1 parent f6e85b4
commit 87589f6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/core/nostr.ts b/src/core/nostr.ts
@@ -175,13 +175,21 @@ const getRelatedEvents = async (
       }
     })
 
-    const relatedNotes = await getNostrEvents(relays, {
+    const relatedRes = getNostrEvents(relays, {
       kinds: [nostrEventKinds.note, nostrEventKinds.repost],
       limit: repliesSet.size,
-      ids: Array.from(new Set([...repliesSet, ...repostsSet])),
+      ids: Array.from(repostsSet),
       "#e": [...repliesSet, ...repostsSet, ...notes.map((note) => note.id)],
     })
 
+    const replyRes = getNostrEvents(relays, {
+      kinds: [nostrEventKinds.note],
+      limit: repliesSet.size,
+      ids: Array.from(repliesSet),
+    })
+
+    const [relatedNotes, replyNotes] = await Promise.all([relatedRes, replyRes])
+
     // Get profiles from all the events
     const profilePubkeysSet = new Set<string>()
     notes.forEach((event) => {
@@ -195,6 +203,9 @@ const getRelatedEvents = async (
     relatedNotes.forEach((event) => {
       profilePubkeysSet.add(event.pubkey)
     })
+    replyNotes.forEach((event) => {
+      profilePubkeysSet.add(event.pubkey)
+    })
 
     const profilesEvents = (await getNostrEvents(relays, {
       kinds: [nostrEventKinds.profile],
@@ -217,7 +228,7 @@ const getRelatedEvents = async (
     })
 
     resolve({
-      related: [...alreadyFetchedReposts, ...relatedNotes],
+      related: [...alreadyFetchedReposts, ...relatedNotes, ...replyNotes],
       profiles: userProfileInfos,
     })
   })

diff --git a/src/store/hooks.ts b/src/store/hooks.ts
@@ -103,7 +103,7 @@ export const useThread = (noteId: string) => {
     .reduce((acc, noteFromNoteById) => {
       const noteTags = noteFromNoteById.tags.filter((tag) => tag[0] === "e").map((tag) => tag[1])
 
-      if (noteTags[0] === noteToDisplay.id && noteFromNoteById.kind !== nostrEventKinds.repost) {
+      if (noteTags.includes(noteToDisplay.id) && noteFromNoteById.kind !== nostrEventKinds.repost) {
         acc.push(noteFromNoteById)
       }