From 760f4bcccb8c2641418c1eb9b3d371e0c7852219 Mon Sep 17 00:00:00 2001
From: codytseng <codytseng@outlook.com>
Date: Thu, 6 Feb 2025 10:04:43 +0800
Subject: [PATCH] fix: muted

---
 src/components/NoteCard/RepostNoteCard.tsx | 15 +++++++++++-
 src/components/NoteCard/index.tsx          | 22 +++++++++++++++---
 src/components/NoteList/index.tsx          | 27 +++++++++++++---------
 src/services/client.service.ts             | 12 +++++-----
 4 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/src/components/NoteCard/RepostNoteCard.tsx b/src/components/NoteCard/RepostNoteCard.tsx
index d98072ac..68666c94 100644
--- a/src/components/NoteCard/RepostNoteCard.tsx
+++ b/src/components/NoteCard/RepostNoteCard.tsx
@@ -1,9 +1,19 @@
+import { useMuteList } from '@/providers/MuteListProvider'
 import client from '@/services/client.service'
 import { Event, kinds, verifyEvent } from 'nostr-tools'
 import { useMemo } from 'react'
 import NormalNoteCard from './NormalNoteCard'
 
-export default function RepostNoteCard({ event, className }: { event: Event; className?: string }) {
+export default function RepostNoteCard({
+  event,
+  className,
+  filterMutedNotes = true
+}: {
+  event: Event
+  className?: string
+  filterMutedNotes?: boolean
+}) {
+  const { mutePubkeys } = useMuteList()
   const targetEvent = useMemo(() => {
     const targetEvent = event.content ? (JSON.parse(event.content) as Event) : null
     try {
@@ -18,6 +28,9 @@ export default function RepostNoteCard({ event, className }: { event: Event; cla
     return targetEvent
   }, [event])
   if (!targetEvent) return null
+  if (filterMutedNotes && mutePubkeys.includes(targetEvent.pubkey)) {
+    return null
+  }
 
   return <NormalNoteCard className={className} reposter={event.pubkey} event={targetEvent} />
 }
diff --git a/src/components/NoteCard/index.tsx b/src/components/NoteCard/index.tsx
index 25fed9d2..b6a8cafd 100644
--- a/src/components/NoteCard/index.tsx
+++ b/src/components/NoteCard/index.tsx
@@ -1,10 +1,26 @@
+import { useMuteList } from '@/providers/MuteListProvider'
 import { Event, kinds } from 'nostr-tools'
-import RepostNoteCard from './RepostNoteCard'
 import NormalNoteCard from './NormalNoteCard'
+import RepostNoteCard from './RepostNoteCard'
+
+export default function NoteCard({
+  event,
+  className,
+  filterMutedNotes = true
+}: {
+  event: Event
+  className?: string
+  filterMutedNotes?: boolean
+}) {
+  const { mutePubkeys } = useMuteList()
+  if (filterMutedNotes && mutePubkeys.includes(event.pubkey)) {
+    return null
+  }
 
-export default function NoteCard({ event, className }: { event: Event; className?: string }) {
   if (event.kind === kinds.Repost) {
-    return <RepostNoteCard event={event} className={className} />
+    return (
+      <RepostNoteCard event={event} className={className} filterMutedNotes={filterMutedNotes} />
+    )
   }
   return <NormalNoteCard event={event} className={className} />
 }
diff --git a/src/components/NoteList/index.tsx b/src/components/NoteList/index.tsx
index a14d309d..c452e069 100644
--- a/src/components/NoteList/index.tsx
+++ b/src/components/NoteList/index.tsx
@@ -167,13 +167,6 @@ export default function NoteList({
     setNewEvents([])
   }
 
-  const eventFilter = (event: Event) => {
-    return (
-      (!filterMutedNotes || !mutePubkeys.includes(event.pubkey)) &&
-      (listMode !== 'posts' || !isReplyNoteEvent(event))
-    )
-  }
-
   return (
     <div className={className}>
       <ListModeSwitch
@@ -193,7 +186,12 @@ export default function NoteList({
         pullingContent=""
       >
         <div className="space-y-2 sm:space-y-2">
-          {newEvents.filter(eventFilter).length > 0 && (
+          {newEvents.filter((event: Event) => {
+            return (
+              (!filterMutedNotes || !mutePubkeys.includes(event.pubkey)) &&
+              (listMode !== 'posts' || !isReplyNoteEvent(event))
+            )
+          }).length > 0 && (
             <div className="flex justify-center w-full mt-2">
               <Button size="lg" onClick={showNewEvents}>
                 {t('show new notes')}
@@ -208,9 +206,16 @@ export default function NoteList({
             />
           ) : (
             <div>
-              {events.filter(eventFilter).map((event) => (
-                <NoteCard key={event.id} className="w-full" event={event} />
-              ))}
+              {events
+                .filter((event: Event) => listMode !== 'posts' || !isReplyNoteEvent(event))
+                .map((event) => (
+                  <NoteCard
+                    key={event.id}
+                    className="w-full"
+                    event={event}
+                    filterMutedNotes={filterMutedNotes}
+                  />
+                ))}
             </div>
           )}
           <div className="text-center text-sm text-muted-foreground">
diff --git a/src/services/client.service.ts b/src/services/client.service.ts
index 8c027839..f3edcc9d 100644
--- a/src/services/client.service.ts
+++ b/src/services/client.service.ts
@@ -46,17 +46,17 @@ class ClientService extends EventTarget {
   private profileEventCache = new LRUCache<string, Promise<NEvent | undefined>>({ max: 10000 })
   private profileEventDataloader = new DataLoader<string, NEvent | undefined>(
     (ids) => Promise.all(ids.map((id) => this._fetchProfileEvent(id))),
-    { cacheMap: this.profileEventCache, maxBatchSize: 20 }
+    { cacheMap: this.profileEventCache, maxBatchSize: 10 }
   )
   private fetchProfileEventFromDefaultRelaysDataloader = new DataLoader<string, NEvent | undefined>(
     this.profileEventBatchLoadFn.bind(this),
-    { cache: false, maxBatchSize: 20 }
+    { cache: false, maxBatchSize: 10 }
   )
   private relayListEventDataLoader = new DataLoader<string, NEvent | undefined>(
     this.relayListEventBatchLoadFn.bind(this),
     {
       cacheMap: new LRUCache<string, Promise<NEvent | undefined>>({ max: 10000 }),
-      maxBatchSize: 20
+      maxBatchSize: 10
     }
   )
   private relayInfoDataLoader = new DataLoader<string, TRelayInfo | undefined>(async (urls) => {
@@ -531,9 +531,9 @@ class ClientService extends EventTarget {
 
   async initUserIndexFromFollowings(pubkey: string) {
     const followings = await this.fetchFollowings(pubkey)
-    for (let i = 0; i * 20 < followings.length; i++) {
-      await this.profileEventDataloader.loadMany(followings.slice(i * 20, (i + 1) * 20))
-      await new Promise((resolve) => setTimeout(resolve, 200))
+    for (let i = 0; i * 10 < followings.length; i++) {
+      await this.profileEventDataloader.loadMany(followings.slice(i * 10, (i + 1) * 10))
+      await new Promise((resolve) => setTimeout(resolve, 100))
     }
   }