Browse Source

fix: reply count

imwald
codytseng 10 months ago
parent
commit
c777a1564e
  1. 6
      src/components/NoteStats/ReplyButton.tsx
  2. 4
      src/components/NotificationList/index.tsx
  3. 15
      src/providers/UserTrustProvider.tsx

6
src/components/NoteStats/ReplyButton.tsx

@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
import { useNostr } from '@/providers/NostrProvider'
import { useReply } from '@/providers/ReplyProvider'
import { useUserTrust } from '@/providers/UserTrustProvider'
import { MessageCircle } from 'lucide-react'
import { Event } from 'nostr-tools'
import { useMemo, useState } from 'react'
@ -11,9 +12,10 @@ export default function ReplyButton({ event }: { event: Event }) { @@ -11,9 +12,10 @@ export default function ReplyButton({ event }: { event: Event }) {
const { t } = useTranslation()
const { checkLogin } = useNostr()
const { repliesMap } = useReply()
const { isUserTrusted } = useUserTrust()
const replyCount = useMemo(
() => repliesMap.get(event.id)?.events.length || 0,
[repliesMap, event.id]
() => repliesMap.get(event.id)?.events.filter((evt) => isUserTrusted(evt.pubkey)).length || 0,
[repliesMap, event.id, isUserTrusted]
)
const [open, setOpen] = useState(false)

4
src/components/NotificationList/index.tsx

@ -23,7 +23,7 @@ const NotificationList = forwardRef((_, ref) => { @@ -23,7 +23,7 @@ const NotificationList = forwardRef((_, ref) => {
const { t } = useTranslation()
const { current } = usePrimaryPage()
const { pubkey } = useNostr()
const { enabled: hideUntrustedEvents, isUserTrusted } = useUserTrust()
const { isUserTrusted } = useUserTrust()
const { clearNewNotifications, getNotificationsSeenAt } = useNotification()
const { updateNoteStatsByEvents } = useNoteStats()
const [notificationType, setNotificationType] = useState<TNotificationType>('all')
@ -135,7 +135,7 @@ const NotificationList = forwardRef((_, ref) => { @@ -135,7 +135,7 @@ const NotificationList = forwardRef((_, ref) => {
setNewNotifications(visibleNotifications.slice(0, index))
setOldNotifications(visibleNotifications.slice(index))
}
}, [notifications, lastReadTime, showCount, hideUntrustedEvents])
}, [notifications, lastReadTime, showCount, isUserTrusted])
useEffect(() => {
const options = {

15
src/providers/UserTrustProvider.tsx

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import client from '@/services/client.service'
import { createContext, useContext, useEffect, useState } from 'react'
import { createContext, useCallback, useContext, useEffect, useState } from 'react'
import { useNostr } from './NostrProvider'
import storage from '@/services/local-storage.service'
@ -41,16 +41,19 @@ export function UserTrustProvider({ children }: { children: React.ReactNode }) { @@ -41,16 +41,19 @@ export function UserTrustProvider({ children }: { children: React.ReactNode }) {
initWoT()
}, [currentPubkey])
const isUserTrusted = useCallback(
(pubkey: string) => {
if (!currentPubkey || !enabled) return true
return wotSet.has(pubkey)
},
[enabled]
)
const updateEnabled = (enabled: boolean) => {
setEnabled(enabled)
storage.setHideUntrustedEvents(enabled)
}
const isUserTrusted = (pubkey: string) => {
if (!currentPubkey || !enabled) return true
return wotSet.has(pubkey)
}
return (
<UserTrustContext.Provider value={{ enabled, updateEnabled, isUserTrusted }}>
{children}

Loading…
Cancel
Save