refactor: 🏗️

This commit is contained in:
codytseng
2025-01-23 15:53:02 +08:00
parent 0f2f82b3ac
commit ee21e19625
6 changed files with 120 additions and 104 deletions

View File

@@ -1,7 +1,7 @@
import { Button } from '@/components/ui/button'
import { PICTURE_EVENT_KIND } from '@/constants'
import { useFetchRelayInfos } from '@/hooks'
import { isReplyNoteEvent } from '@/lib/event'
import { checkAlgoRelay } from '@/lib/relay'
import { cn } from '@/lib/utils'
import { useMuteList } from '@/providers/MuteListProvider'
import { useNostr } from '@/providers/NostrProvider'
@@ -11,7 +11,7 @@ import storage from '@/services/storage.service'
import { TNoteListMode } from '@/types'
import dayjs from 'dayjs'
import { Event, Filter, kinds } from 'nostr-tools'
import { ReactNode, useEffect, useMemo, useRef, useState } from 'react'
import { ReactNode, useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
import PullToRefresh from 'react-simple-pull-to-refresh'
import NoteCard from '../NoteCard'
@@ -36,7 +36,6 @@ export default function NoteList({
const { isLargeScreen } = useScreenSize()
const { signEvent, checkLogin } = useNostr()
const { mutePubkeys } = useMuteList()
const { areAlgoRelays } = useFetchRelayInfos([...relayUrls])
const [refreshCount, setRefreshCount] = useState(0)
const [timelineKey, setTimelineKey] = useState<string | undefined>(undefined)
const [events, setEvents] = useState<Event[]>([])
@@ -56,10 +55,10 @@ export default function NoteList({
}
return {
kinds: [kinds.ShortTextNote, kinds.Repost, PICTURE_EVENT_KIND],
limit: areAlgoRelays ? ALGO_RELAY_LIMIT : NORMAL_RELAY_LIMIT,
limit: NORMAL_RELAY_LIMIT,
...filter
}
}, [JSON.stringify(filter), areAlgoRelays, isPictures])
}, [JSON.stringify(filter), isPictures])
useEffect(() => {
if (relayUrls.length === 0) return
@@ -70,10 +69,14 @@ export default function NoteList({
setNewEvents([])
setHasMore(true)
const relayInfos = await client.fetchRelayInfos(relayUrls)
const areAlgoRelays = relayInfos.every((relayInfo) => checkAlgoRelay(relayInfo))
const filter = areAlgoRelays ? { ...noteFilter, limit: ALGO_RELAY_LIMIT } : noteFilter
let eventCount = 0
const { closer, timelineKey } = await client.subscribeTimeline(
[...relayUrls],
noteFilter,
filter,
{
onEvents: (events, eosed) => {
if (eventCount > events.length) return
@@ -112,7 +115,22 @@ export default function NoteList({
return () => {
promise.then((closer) => closer())
}
}, [JSON.stringify(relayUrls), noteFilter, areAlgoRelays, refreshCount])
}, [JSON.stringify(relayUrls), noteFilter, refreshCount])
const loadMore = useCallback(async () => {
if (!timelineKey || refreshing || !hasMore) return
const newEvents = await client.loadMoreTimeline(
timelineKey,
events.length ? events[events.length - 1].created_at - 1 : dayjs().unix(),
noteFilter.limit
)
if (newEvents.length === 0) {
setHasMore(false)
return
}
setEvents((oldEvents) => [...oldEvents, ...newEvents])
}, [timelineKey, refreshing, hasMore, events, noteFilter])
useEffect(() => {
if (refreshing) return
@@ -140,22 +158,7 @@ export default function NoteList({
observerInstance.unobserve(currentBottomRef)
}
}
}, [refreshing, hasMore, events, timelineKey, bottomRef])
const loadMore = async () => {
if (!timelineKey || refreshing) return
const newEvents = await client.loadMoreTimeline(
timelineKey,
events.length ? events[events.length - 1].created_at - 1 : dayjs().unix(),
noteFilter.limit
)
if (newEvents.length === 0) {
setHasMore(false)
return
}
setEvents((oldEvents) => [...oldEvents, ...newEvents])
}
}, [refreshing, loadMore])
const showNewEvents = () => {
setEvents((oldEvents) => [...newEvents, ...oldEvents])