mleku/smesh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: hide relay reviews from spammer

Browse Source
This commit is contained in:
codytseng
2025-12-09 22:35:06 +08:00
parent d90348dd97
commit ac196cd662
10 changed files with 202 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/NormalFeed/index.tsx
View File

@@ -6,7 +6,6 @@ import { useKindFilter } from '@/providers/KindFilterProvider'
import { useUserTrust } from '@/providers/UserTrustProvider'
import storage from '@/services/local-storage.service'
import { TFeedSubRequest, TNoteListMode } from '@/types'
import { Event } from 'nostr-tools'
import { useMemo, useRef, useState } from 'react'
import KindFilter from '../KindFilter'
import { RefreshButton } from '../RefreshButton'
@@ -16,14 +15,12 @@ export default function NormalFeed({
areAlgoRelays = false,
isMainFeed = false,
showRelayCloseReason = false,
filterFn,
disable24hMode = false
}: {
subRequests: TFeedSubRequest[]
areAlgoRelays?: boolean
isMainFeed?: boolean
showRelayCloseReason?: boolean
filterFn?: (event: Event) => boolean
disable24hMode?: boolean
}) {
const { hideUntrustedNotes } = useUserTrust()
@@ -91,7 +88,6 @@ export default function NormalFeed({
ref={userAggregationListRef}
showKinds={temporaryShowKinds}
subRequests={subRequests}
filterFn={filterFn}
areAlgoRelays={areAlgoRelays}
showRelayCloseReason={showRelayCloseReason}
/>

205
src/components/NoteList/index.tsx
View File

@@ -46,6 +46,7 @@ const NoteList = forwardRef<
filterMutedNotes?: boolean
hideReplies?: boolean
hideUntrustedNotes?: boolean
hideSpam?: boolean
areAlgoRelays?: boolean
showRelayCloseReason?: boolean
pinnedEventIds?: string[]
@@ -60,6 +61,7 @@ const NoteList = forwardRef<
filterMutedNotes = true,
hideReplies = false,
hideUntrustedNotes = false,
hideSpam = false,
areAlgoRelays = false,
showRelayCloseReason = false,
pinnedEventIds,
@@ -70,7 +72,7 @@ const NoteList = forwardRef<
) => {
const { t } = useTranslation()
const { startLogin } = useNostr()
const { isUserTrusted } = useUserTrust()
const { isUserTrusted, isSpammer } = useUserTrust()
const { mutePubkeySet } = useMuteList()
const { hideContentMentioningMutedUsers } = useContentPolicy()
const { isEventDeleted } = useDeletedEvent()
@@ -79,7 +81,12 @@ const NoteList = forwardRef<
const [newEvents, setNewEvents] = useState<Event[]>([])
const [hasMore, setHasMore] = useState<boolean>(true)
const [loading, setLoading] = useState(true)
const [filtering, setFiltering] = useState(false)
const [timelineKey, setTimelineKey] = useState<string | undefined>(undefined)
const [filteredNotes, setFilteredNotes] = useState<
{ key: string; event: Event; reposters: string[] }[]
>([])
const [filteredNewEvents, setFilteredNewEvents] = useState<Event[]>([])
const [refreshCount, setRefreshCount] = useState(0)
const [showCount, setShowCount] = useState(SHOW_COUNT)
const supportTouch = useMemo(() => isTouchDevice(), [])
@@ -120,98 +127,132 @@ const NoteList = forwardRef<
[hideUntrustedNotes, mutePubkeySet, JSON.stringify(pinnedEventIds), isEventDeleted, filterFn]
)
const filteredNotes = useMemo(() => {
// Store processed event keys to avoid duplicates
const keySet = new Set<string>()
// Map to track reposters for each event key
const repostersMap = new Map<string, Set<string>>()
// Final list of filtered events
const filteredEvents: Event[] = []
const keys: string[] = []
useEffect(() => {
const processEvents = async () => {
// Store processed event keys to avoid duplicates
const keySet = new Set<string>()
// Map to track reposters for each event key
const repostersMap = new Map<string, Set<string>>()
// Final list of filtered events
const filteredEvents: Event[] = []
const keys: string[] = []
events.forEach((evt) => {
const key = getEventKey(evt)
if (keySet.has(key)) return
keySet.add(key)
events.forEach((evt) => {
const key = getEventKey(evt)
if (keySet.has(key)) return
keySet.add(key)
if (shouldHideEvent(evt)) return
if (hideReplies && isReplyNoteEvent(evt)) return
if (evt.kind !== kinds.Repost && evt.kind !== kinds.GenericRepost) {
filteredEvents.push(evt)
keys.push(key)
return
}
let targetEventKey: string | undefined
let eventFromContent: Event | null = null
const targetTag = evt.tags.find(tagNameEquals('a')) ?? evt.tags.find(tagNameEquals('e'))
if (targetTag) {
targetEventKey = getKeyFromTag(targetTag)
} else {
// Attempt to extract the target event from the repost content
if (evt.content) {
try {
eventFromContent = JSON.parse(evt.content) as Event
} catch {
eventFromContent = null
}
}
if (eventFromContent) {
if (
eventFromContent.kind === kinds.Repost ||
eventFromContent.kind === kinds.GenericRepost
) {
return
}
if (shouldHideEvent(evt)) return
targetEventKey = getEventKey(eventFromContent)
}
}
if (targetEventKey) {
// Add to reposters map
const reposters = repostersMap.get(targetEventKey)
if (reposters) {
reposters.add(evt.pubkey)
} else {
repostersMap.set(targetEventKey, new Set([evt.pubkey]))
}
// If the target event is not already included, add it now
if (!keySet.has(targetEventKey)) {
if (shouldHideEvent(evt)) return
if (hideReplies && isReplyNoteEvent(evt)) return
if (evt.kind !== kinds.Repost && evt.kind !== kinds.GenericRepost) {
filteredEvents.push(evt)
keys.push(targetEventKey)
keySet.add(targetEventKey)
keys.push(key)
return
}
}
})
return filteredEvents.map((evt, i) => {
const key = keys[i]
return { key, event: evt, reposters: Array.from(repostersMap.get(key) ?? []) }
})
}, [events, shouldHideEvent, hideReplies])
let targetEventKey: string | undefined
let eventFromContent: Event | null = null
const targetTag = evt.tags.find(tagNameEquals('a')) ?? evt.tags.find(tagNameEquals('e'))
if (targetTag) {
targetEventKey = getKeyFromTag(targetTag)
} else {
// Attempt to extract the target event from the repost content
if (evt.content) {
try {
eventFromContent = JSON.parse(evt.content) as Event
} catch {
eventFromContent = null
}
}
if (eventFromContent) {
if (
eventFromContent.kind === kinds.Repost ||
eventFromContent.kind === kinds.GenericRepost
) {
return
}
if (shouldHideEvent(evt)) return
targetEventKey = getEventKey(eventFromContent)
}
}
if (targetEventKey) {
// Add to reposters map
const reposters = repostersMap.get(targetEventKey)
if (reposters) {
reposters.add(evt.pubkey)
} else {
repostersMap.set(targetEventKey, new Set([evt.pubkey]))
}
// If the target event is not already included, add it now
if (!keySet.has(targetEventKey)) {
filteredEvents.push(evt)
keys.push(targetEventKey)
keySet.add(targetEventKey)
}
}
})
const _filteredNotes = (
await Promise.all(
filteredEvents.map(async (evt, i) => {
if (hideSpam && (await isSpammer(evt.pubkey))) {
return null
}
const key = keys[i]
return { key, event: evt, reposters: Array.from(repostersMap.get(key) ?? []) }
})
)
).filter(Boolean) as {
key: string
event: Event
reposters: string[]
}[]
setFilteredNotes(_filteredNotes)
}
setFiltering(true)
processEvents().finally(() => setFiltering(false))
}, [events, shouldHideEvent, hideReplies, isSpammer, hideSpam])
const slicedNotes = useMemo(() => {
return filteredNotes.slice(0, showCount)
}, [filteredNotes, showCount])
const filteredNewEvents = useMemo(() => {
const keySet = new Set<string>()
useEffect(() => {
const processNewEvents = async () => {
const keySet = new Set<string>()
const filteredEvents: Event[] = []
return newEvents.filter((event: Event) => {
if (shouldHideEvent(event)) return false
if (hideReplies && isReplyNoteEvent(event)) return false
newEvents.forEach((event) => {
if (shouldHideEvent(event)) return
if (hideReplies && isReplyNoteEvent(event)) return
const key = getEventKey(event)
if (keySet.has(key)) {
return false
}
keySet.add(key)
return true
})
}, [newEvents, shouldHideEvent])
const key = getEventKey(event)
if (keySet.has(key)) {
return
}
keySet.add(key)
filteredEvents.push(event)
})
const _filteredNotes = (
await Promise.all(
filteredEvents.map(async (evt) => {
if (hideSpam && (await isSpammer(evt.pubkey))) {
return null
}
return evt
})
)
).filter(Boolean) as Event[]
setFilteredNewEvents(_filteredNotes)
}
processNewEvents()
}, [newEvents, shouldHideEvent, isSpammer, hideSpam])
const scrollToTop = (behavior: ScrollBehavior = 'instant') => {
setTimeout(() => {
@@ -381,7 +422,7 @@ const NoteList = forwardRef<
reposters={reposters}
/>
))}
{hasMore || loading ? (
{hasMore || loading || filtering ? (
<div ref={bottomRef}>
<NoteCardLoadingSkeleton />
</div>

22
src/components/RelayInfo/RelayReviewsPreview.tsx
View File

@@ -29,7 +29,7 @@ export default function RelayReviewsPreview({ relayUrl }: { relayUrl: string })
const { t } = useTranslation()
const { push } = useSecondaryPage()
const { pubkey, checkLogin } = useNostr()
const { hideUntrustedNotes, isUserTrusted } = useUserTrust()
const { hideUntrustedNotes, isUserTrusted, isSpammer } = useUserTrust()
const { mutePubkeySet } = useMuteList()
const [showEditor, setShowEditor] = useState(false)
const [myReview, setMyReview] = useState<NostrEvent | null>(null)
@@ -69,12 +69,9 @@ export default function RelayReviewsPreview({ relayUrl }: { relayUrl: string })
let myReview: NostrEvent | null = null
events.sort((a, b) => compareEvents(b, a))
for (const evt of events) {
if (
mutePubkeySet.has(evt.pubkey) ||
pubkeySet.has(evt.pubkey) ||
(hideUntrustedNotes && !isUserTrusted(evt.pubkey))
) {
if (mutePubkeySet.has(evt.pubkey) || pubkeySet.has(evt.pubkey)) {
continue
}
const stars = getStarsFromRelayReviewEvent(evt)
@@ -90,8 +87,19 @@ export default function RelayReviewsPreview({ relayUrl }: { relayUrl: string })
}
}
const filteredReviews = (
await Promise.all(
reviews.map(async (evt) => {
if (await isSpammer(evt.pubkey)) {
return null
}
return evt
})
)
).filter(Boolean) as NostrEvent[]
setMyReview(myReview)
setReviews(reviews)
setReviews(filteredReviews)
setInitialized(true)
}
init()

8
src/components/TrustScoreBadge/index.tsx
View File

@@ -1,7 +1,7 @@
import { cn } from '@/lib/utils'
import { useNostr } from '@/providers/NostrProvider'
import { useUserTrust } from '@/providers/UserTrustProvider'
import trustScoreService from '@/services/trust-score.service'
import fayan from '@/services/fayan.service'
import { AlertTriangle, ShieldAlert } from 'lucide-react'
import { useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
@@ -34,9 +34,9 @@ export default function TrustScoreBadge({
const fetchScore = async () => {
try {
const data = await trustScoreService.fetchTrustScore(pubkey)
if (data) {
setPercentile(data.percentile)
const percentile = await fayan.fetchUserPercentile(pubkey)
if (percentile !== null) {
setPercentile(percentile)
}
} catch (error) {
console.error('Failed to fetch trust score:', error)

6
src/components/UserAggregationList/index.tsx
View File

@@ -48,7 +48,6 @@ const UserAggregationList = forwardRef<
{
subRequests: TFeedSubRequest[]
showKinds?: number[]
filterFn?: (event: Event) => boolean
filterMutedNotes?: boolean
areAlgoRelays?: boolean
showRelayCloseReason?: boolean
@@ -58,7 +57,6 @@ const UserAggregationList = forwardRef<
{
subRequests,
showKinds,
filterFn,
filterMutedNotes = true,
areAlgoRelays = false,
showRelayCloseReason = false
@@ -242,9 +240,6 @@ const UserAggregationList = forwardRef<
) {
return true
}
if (filterFn && !filterFn(evt)) {
return true
}
return false
},
@@ -252,7 +247,6 @@ const UserAggregationList = forwardRef<
hideUntrustedNotes,
mutePubkeySet,
isEventDeleted,
filterFn,
currentPubkey,
filterMutedNotes,
isUserTrusted,

4
src/pages/primary/ExplorePage/index.tsx
View File

@@ -45,9 +45,9 @@ const ExplorePage = forwardRef<TPageRef>((_, ref) => {
<NoteList
showKinds={[ExtendedKind.RELAY_REVIEW]}
subRequests={[{ urls: BIG_RELAY_URLS, filter: {} }]}
filterMutedNotes
hideUntrustedNotes={hideUntrustedNotes}
filterFn={relayReviewFilterFn}
filterMutedNotes
hideSpam
/>
) : (
<FollowingFavoriteRelayList />

1
src/pages/secondary/RelayReviewsPage/index.tsx
View File

@@ -28,6 +28,7 @@ const RelayReviewsPage = forwardRef(({ url, index }: { url?: string; index?: num
filter: { '#d': [normalizedUrl] }
}
]}
hideSpam
/>
</SecondaryPageLayout>
)

15
src/providers/UserTrustProvider.tsx
View File

@@ -1,4 +1,5 @@
import client from '@/services/client.service'
import fayan from '@/services/fayan.service'
import storage from '@/services/local-storage.service'
import { createContext, useCallback, useContext, useEffect, useState } from 'react'
import { useNostr } from './NostrProvider'
@@ -11,6 +12,7 @@ type TUserTrustContext = {
updateHideUntrustedNotifications: (hide: boolean) => void
updateHideUntrustedNotes: (hide: boolean) => void
isUserTrusted: (pubkey: string) => boolean
isSpammer: (pubkey: string) => Promise<boolean>
}
const UserTrustContext = createContext<TUserTrustContext | undefined>(undefined)
@@ -69,6 +71,16 @@ export function UserTrustProvider({ children }: { children: React.ReactNode }) {
[currentPubkey]
)
const isSpammer = useCallback(
async (pubkey: string) => {
if (isUserTrusted(pubkey)) return false
const percentile = await fayan.fetchUserPercentile(pubkey)
if (percentile === null) return false
return percentile < 60
},
[isUserTrusted]
)
const updateHideUntrustedInteractions = (hide: boolean) => {
setHideUntrustedInteractions(hide)
storage.setHideUntrustedInteractions(hide)
@@ -93,7 +105,8 @@ export function UserTrustProvider({ children }: { children: React.ReactNode }) {
updateHideUntrustedInteractions,
updateHideUntrustedNotifications,
updateHideUntrustedNotes,
isUserTrusted
isUserTrusted,
isSpammer
}}
>
{children}

43
src/services/fayan.service.ts Normal file
View File

@@ -0,0 +1,43 @@
import DataLoader from 'dataloader'
class FayanService {
static instance: FayanService
private userPercentileDataLoader = new DataLoader<string, number | null>(async (userIds) => {
return await Promise.all(
userIds.map(async (userId) => {
try {
const res = await fetch(`https://fayan.jumble.social/${userId}`)
if (!res.ok) {
if (res.status === 404) {
return 0
}
return null
}
const data = await res.json()
if (typeof data.percentile === 'number') {
return data.percentile
}
return null
} catch {
return null
}
})
)
})
constructor() {
if (!FayanService.instance) {
FayanService.instance = this
}
return FayanService.instance
}
// null means server error
async fetchUserPercentile(userId: string): Promise<number | null> {
return await this.userPercentileDataLoader.load(userId)
}
}
const instance = new FayanService()
export default instance

47
src/services/trust-score.service.ts
View File

@@ -1,47 +0,0 @@
import DataLoader from 'dataloader'
export interface TrustScoreData {
percentile: number
}
class TrustScoreService {
static instance: TrustScoreService
private trustScoreDataLoader = new DataLoader<string, TrustScoreData | null>(async (userIds) => {
return await Promise.all(
userIds.map(async (userId) => {
try {
const res = await fetch(`https://fayan.jumble.social/${userId}`)
if (!res.ok) {
if (res.status === 404) {
return { percentile: 0 }
}
return null
}
const data = await res.json()
if (typeof data.percentile === 'number') {
return { percentile: data.percentile }
}
return null
} catch {
return null
}
})
)
})
constructor() {
if (!TrustScoreService.instance) {
TrustScoreService.instance = this
}
return TrustScoreService.instance
}
async fetchTrustScore(userId: string): Promise<TrustScoreData | null> {
return await this.trustScoreDataLoader.load(userId)
}
}
const instance = new TrustScoreService()
export default instance