From 9aa57c1adf2f09be3780ac2469e2948d5be2ea56 Mon Sep 17 00:00:00 2001 From: daniyal Date: Thu, 24 Oct 2024 20:29:57 +0500 Subject: [PATCH] fix: no need to pass relay set to subscribe function, just include p tag with authors pubkey --- src/hooks/useComments.ts | 38 +++++++++----------------------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/src/hooks/useComments.ts b/src/hooks/useComments.ts index 6be5932..355a01a 100644 --- a/src/hooks/useComments.ts +++ b/src/hooks/useComments.ts @@ -1,14 +1,11 @@ import { - getRelayListForUser, NDKFilter, NDKKind, - NDKRelaySet, NDKSubscription, NDKSubscriptionCacheUsage } from '@nostr-dev-kit/ndk' import { useEffect, useState } from 'react' -import { CommentEvent, ModDetails, UserRelaysType } from 'types' -import { log, LogType } from 'utils' +import { CommentEvent, ModDetails } from 'types' import { useNDKContext } from './useNDKContext' export const useComments = (mod: ModDetails) => { @@ -19,35 +16,18 @@ export const useComments = (mod: ModDetails) => { let subscription: NDKSubscription // Define the subscription variable here for cleanup const setupSubscription = async () => { - // Find the mod author's relays. - const authorReadRelays = await getRelayListForUser(mod.author, ndk) - .then((ndkRelayList) => { - if (ndkRelayList) return ndkRelayList[UserRelaysType.Read] - return [] // Return an empty array if ndkRelayList is undefined - }) - .catch((err) => { - log( - true, - LogType.Error, - `An error occurred in fetching user's (${mod.author}) ${UserRelaysType.Read}`, - err - ) - return [] as string[] - }) - const filter: NDKFilter = { kinds: [NDKKind.Text], - '#a': [mod.aTag] + '#a': [mod.aTag], + '#p': [mod.author] } - subscription = ndk.subscribe( - filter, - { - closeOnEose: false, - cacheUsage: NDKSubscriptionCacheUsage.CACHE_FIRST - }, - NDKRelaySet.fromRelayUrls(authorReadRelays, ndk, true) - ) + subscription = ndk.subscribe(filter, { + closeOnEose: false, + cacheUsage: NDKSubscriptionCacheUsage.CACHE_FIRST + }) + + console.log('ndk.pool.urls() :>> ', ndk.pool.urls()) subscription.on('event', (ndkEvent) => { setCommentEvents((prev) => {