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

fix: catch some errors

Browse Source
This commit is contained in:
codytseng
2025-02-25 17:54:01 +08:00
parent 4994b26520
commit 2f9be97178
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/event.ts
View File

@@ -333,11 +333,15 @@ export function extractEmbeddedEventIds(event: Event) {
const embeddedEventIds: string[] = [] const embeddedEventIds: string[] = []
const embeddedNoteRegex = /nostr:(note1[a-z0-9]{58}|nevent1[a-z0-9]+)/g const embeddedNoteRegex = /nostr:(note1[a-z0-9]{58}|nevent1[a-z0-9]+)/g
;(event.content.match(embeddedNoteRegex) || []).forEach((note) => { ;(event.content.match(embeddedNoteRegex) || []).forEach((note) => {
const { type, data } = nip19.decode(note.split(':')[1]) try {
if (type === 'nevent') { const { type, data } = nip19.decode(note.split(':')[1])
embeddedEventIds.push(data.id) if (type === 'nevent') {
} else if (type === 'note') { embeddedEventIds.push(data.id)
embeddedEventIds.push(data) } else if (type === 'note') {
embeddedEventIds.push(data)
}
} catch {
// ignore
} }
}) })
EVENT_EMBEDDED_EVENT_IDS_CACHE.set(event.id, embeddedEventIds) EVENT_EMBEDDED_EVENT_IDS_CACHE.set(event.id, embeddedEventIds)

26
src/lib/url.ts
View File

@@ -16,15 +16,23 @@ export function normalizeUrl(url: string): string {
} }
export function normalizeHttpUrl(url: string): string { export function normalizeHttpUrl(url: string): string {
if (url.indexOf('://') === -1) url = 'https://' + url try {
const p = new URL(url) if (url.indexOf('://') === -1) url = 'https://' + url
p.pathname = p.pathname.replace(/\/+/g, '/') const p = new URL(url)
if (p.pathname.endsWith('/')) p.pathname = p.pathname.slice(0, -1) p.pathname = p.pathname.replace(/\/+/g, '/')
if ((p.port === '80' && p.protocol === 'http:') || (p.port === '443' && p.protocol === 'https:')) if (p.pathname.endsWith('/')) p.pathname = p.pathname.slice(0, -1)
p.port = '' if (
p.searchParams.sort() (p.port === '80' && p.protocol === 'http:') ||
p.hash = '' (p.port === '443' && p.protocol === 'https:')
return p.toString() )
p.port = ''
p.searchParams.sort()
p.hash = ''
return p.toString()
} catch {
console.error('Invalid URL:', url)
return url
}
} }
export function simplifyUrl(url: string): string { export function simplifyUrl(url: string): string {