fix: catch some errors
This commit is contained in:
@@ -333,11 +333,15 @@ export function extractEmbeddedEventIds(event: Event) {
|
||||
const embeddedEventIds: string[] = []
|
||||
const embeddedNoteRegex = /nostr:(note1[a-z0-9]{58}|nevent1[a-z0-9]+)/g
|
||||
;(event.content.match(embeddedNoteRegex) || []).forEach((note) => {
|
||||
const { type, data } = nip19.decode(note.split(':')[1])
|
||||
if (type === 'nevent') {
|
||||
embeddedEventIds.push(data.id)
|
||||
} else if (type === 'note') {
|
||||
embeddedEventIds.push(data)
|
||||
try {
|
||||
const { type, data } = nip19.decode(note.split(':')[1])
|
||||
if (type === 'nevent') {
|
||||
embeddedEventIds.push(data.id)
|
||||
} else if (type === 'note') {
|
||||
embeddedEventIds.push(data)
|
||||
}
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
})
|
||||
EVENT_EMBEDDED_EVENT_IDS_CACHE.set(event.id, embeddedEventIds)
|
||||
|
||||
@@ -16,15 +16,23 @@ export function normalizeUrl(url: string): string {
|
||||
}
|
||||
|
||||
export function normalizeHttpUrl(url: string): string {
|
||||
if (url.indexOf('://') === -1) url = 'https://' + url
|
||||
const p = new URL(url)
|
||||
p.pathname = p.pathname.replace(/\/+/g, '/')
|
||||
if (p.pathname.endsWith('/')) p.pathname = p.pathname.slice(0, -1)
|
||||
if ((p.port === '80' && p.protocol === 'http:') || (p.port === '443' && p.protocol === 'https:'))
|
||||
p.port = ''
|
||||
p.searchParams.sort()
|
||||
p.hash = ''
|
||||
return p.toString()
|
||||
try {
|
||||
if (url.indexOf('://') === -1) url = 'https://' + url
|
||||
const p = new URL(url)
|
||||
p.pathname = p.pathname.replace(/\/+/g, '/')
|
||||
if (p.pathname.endsWith('/')) p.pathname = p.pathname.slice(0, -1)
|
||||
if (
|
||||
(p.port === '80' && p.protocol === 'http:') ||
|
||||
(p.port === '443' && p.protocol === 'https:')
|
||||
)
|
||||
p.port = ''
|
||||
p.searchParams.sort()
|
||||
p.hash = ''
|
||||
return p.toString()
|
||||
} catch {
|
||||
console.error('Invalid URL:', url)
|
||||
return url
|
||||
}
|
||||
}
|
||||
|
||||
export function simplifyUrl(url: string): string {
|
||||
|
||||
Reference in New Issue
Block a user