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

fix: handle JSON parse error for repost event content

Browse Source
This commit is contained in:
codytseng
2025-11-02 22:02:01 +08:00
parent 2ae223b552
commit dab47e9a69
2 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/components/NoteCard/RepostNoteCard.tsx
View File

@@ -33,44 +33,47 @@ export default function RepostNoteCard({
}, [targetEvent, filterMutedNotes, hideContentMentioningMutedUsers, mutePubkeySet]) }, [targetEvent, filterMutedNotes, hideContentMentioningMutedUsers, mutePubkeySet])
useEffect(() => { useEffect(() => {
const fetch = async () => { const fetch = async () => {
try { let eventFromContent: Event | null = null
const eventFromContent = event.content ? (JSON.parse(event.content) as Event) : null if (event.content) {
if (eventFromContent && verifyEvent(eventFromContent)) { try {
if (eventFromContent.kind === kinds.Repost) { eventFromContent = JSON.parse(event.content) as Event
return } catch {
} eventFromContent = null
client.addEventToCache(eventFromContent) }
const targetSeenOn = client.getSeenEventRelays(eventFromContent.id) }
if (targetSeenOn.length === 0) { if (eventFromContent && verifyEvent(eventFromContent)) {
const seenOn = client.getSeenEventRelays(event.id) if (eventFromContent.kind === kinds.Repost) {
seenOn.forEach((relay) => {
client.trackEventSeenOn(eventFromContent.id, relay)
})
}
setTargetEvent(eventFromContent)
return return
} }
client.addEventToCache(eventFromContent)
const targetSeenOn = client.getSeenEventRelays(eventFromContent.id)
if (targetSeenOn.length === 0) {
const seenOn = client.getSeenEventRelays(event.id)
seenOn.forEach((relay) => {
client.trackEventSeenOn(eventFromContent.id, relay)
})
}
setTargetEvent(eventFromContent)
return
}
let targetEventId: string | undefined let targetEventId: string | undefined
const aTag = event.tags.find(tagNameEquals('a')) const aTag = event.tags.find(tagNameEquals('a'))
if (aTag) { if (aTag) {
targetEventId = generateBech32IdFromATag(aTag) targetEventId = generateBech32IdFromATag(aTag)
} else { } else {
const eTag = event.tags.find(tagNameEquals('e')) const eTag = event.tags.find(tagNameEquals('e'))
if (eTag) { if (eTag) {
targetEventId = generateBech32IdFromETag(eTag) targetEventId = generateBech32IdFromETag(eTag)
}
}
if (!targetEventId) {
return
} }
}
if (!targetEventId) {
return
}
const targetEvent = await client.fetchEvent(targetEventId) const targetEvent = await client.fetchEvent(targetEventId)
if (targetEvent) { if (targetEvent) {
setTargetEvent(targetEvent) setTargetEvent(targetEvent)
}
} catch {
// ignore
} }
} }
fetch() fetch()

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

@@ -133,7 +133,14 @@ const NoteList = forwardRef(
return return
} }
const eventFromContent = evt.content ? (JSON.parse(evt.content) as Event) : null let eventFromContent: Event | null = null
if (evt.content) {
try {
eventFromContent = JSON.parse(evt.content) as Event
} catch {
eventFromContent = null
}
}
if (eventFromContent && verifyEvent(eventFromContent)) { if (eventFromContent && verifyEvent(eventFromContent)) {
if (eventFromContent.kind === kinds.Repost) { if (eventFromContent.kind === kinds.Repost) {
return return