WoT implemented, plus other fixes #160

Merged
freakoverse merged 36 commits from staging into master 2024-11-20 16:39:08 +00:00
2 changed files with 7 additions and 3 deletions
Showing only changes of commit 8d20678c75 - Show all commits

View File

@ -245,7 +245,7 @@ export const NDKContextProvider = ({ children }: { children: ReactNode }) => {
// Find the user's relays (10s timeout). // Find the user's relays (10s timeout).
const relayUrls = await Promise.race([ const relayUrls = await Promise.race([
getRelayListForUser(hexKey, ndk), getRelayListForUser(hexKey, ndk),
timeout(10000) timeout(3000)
]) ])
.then((ndkRelayList) => { .then((ndkRelayList) => {
if (ndkRelayList) return ndkRelayList[userRelaysType] if (ndkRelayList) return ndkRelayList[userRelaysType]
@ -265,7 +265,9 @@ export const NDKContextProvider = ({ children }: { children: ReactNode }) => {
.fetchEvents( .fetchEvents(
filter, filter,
{ closeOnEose: true, cacheUsage: NDKSubscriptionCacheUsage.PARALLEL }, { closeOnEose: true, cacheUsage: NDKSubscriptionCacheUsage.PARALLEL },
NDKRelaySet.fromRelayUrls(relayUrls, ndk, true) relayUrls.length
? NDKRelaySet.fromRelayUrls(relayUrls, ndk, true)
: undefined
) )
.then((ndkEventSet) => { .then((ndkEventSet) => {
const ndkEvents = Array.from(ndkEventSet) const ndkEvents = Array.from(ndkEventSet)

View File

@ -66,7 +66,9 @@ export const useComments = (
closeOnEose: false, closeOnEose: false,
cacheUsage: NDKSubscriptionCacheUsage.CACHE_FIRST cacheUsage: NDKSubscriptionCacheUsage.CACHE_FIRST
}, },
NDKRelaySet.fromRelayUrls(Array.from(relayUrls), ndk) relayUrls.size
? NDKRelaySet.fromRelayUrls(Array.from(relayUrls), ndk)
: undefined
) )
subscription.on('event', (ndkEvent) => { subscription.on('event', (ndkEvent) => {