degmods/degmods.com
6
0
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 3 Releases Wiki Activity

Merge pull request 'comment fetching in mod posts fix' (#102) from staging into master
All checks were successful
Release to Production / build_and_release (push) Successful in 45s
Details

Browse Source 
Reviewed-on: #102
This commit is contained in:
freakoverse 2024-10-25 10:16:43 +00:00
commit e8833e72db
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hooks/useComments.ts
View File

@ -8,7 +8,7 @@ import {
} from '@nostr-dev-kit/ndk' } from '@nostr-dev-kit/ndk'
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
import { CommentEvent, ModDetails, UserRelaysType } from 'types' import { CommentEvent, ModDetails, UserRelaysType } from 'types'
import { log, LogType } from 'utils' import { log, LogType, timeout } from 'utils'
import { useNDKContext } from './useNDKContext' import { useNDKContext } from './useNDKContext'
export const useComments = (mod: ModDetails) => { export const useComments = (mod: ModDetails) => {
@ -20,7 +20,11 @@ export const useComments = (mod: ModDetails) => {
const setupSubscription = async () => { const setupSubscription = async () => {
// Find the mod author's relays. // Find the mod author's relays.
const authorReadRelays = await getRelayListForUser(mod.author, ndk)
const authorReadRelays = await Promise.race([
getRelayListForUser(mod.author, ndk),
timeout(10 * 1000) // add a 10 sec timeout
])
.then((ndkRelayList) => { .then((ndkRelayList) => {
if (ndkRelayList) return ndkRelayList[UserRelaysType.Read] if (ndkRelayList) return ndkRelayList[UserRelaysType.Read]
return [] // Return an empty array if ndkRelayList is undefined return [] // Return an empty array if ndkRelayList is undefined
@ -40,13 +44,21 @@ export const useComments = (mod: ModDetails) => {
'#a': [mod.aTag] '#a': [mod.aTag]
} }
const relayUrls = new Set<string>()
ndk.pool.urls().forEach((relayUrl) => {
relayUrls.add(relayUrl)
})
authorReadRelays.forEach((relayUrl) => relayUrls.add(relayUrl))
subscription = ndk.subscribe( subscription = ndk.subscribe(
filter, filter,
{ {
closeOnEose: false, closeOnEose: false,
cacheUsage: NDKSubscriptionCacheUsage.CACHE_FIRST cacheUsage: NDKSubscriptionCacheUsage.CACHE_FIRST
}, },
NDKRelaySet.fromRelayUrls(authorReadRelays, ndk, true) NDKRelaySet.fromRelayUrls(Array.from(relayUrls), ndk)
) )
subscription.on('event', (ndkEvent) => { subscription.on('event', (ndkEvent) => {