hiro/tridactyl
1
0
Fork 0
mirror of https://github.com/vale981/tridactyl synced 2025-03-05 17:41:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

excmds.ts: Make sure getRssLinks() only works with string hrefs

Browse source 
Apparently, on github,
`document.querySelectorAll("a,link[rel='alternate']")` can return
anchors that are actually svg elements. This would be fine if these
elements had string hrefs, but that's not the case. These elements have
svg hrefs and this makes getRssLinks() fail, which in turn makes opening
the command line fail because of completions. The easy solution is to
simply make sure elements have a string href. The hard solution is
creating a proper statusline where errors will be logged without taking
over the command line.
This commit is contained in:
glacambre 2019-01-21 20:04:26 +01:00
parent ddfb5b5135
commit beaefa444b
No known key found for this signature in database
GPG key ID: B9625DB1767553AC
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/excmds.ts
View file

@ -134,23 +134,25 @@ export async function getNativeVersion(): Promise<void> {
//#content
export async function getRssLinks(): Promise<{ type: string; url: string; title: string }[]> {
let seen = new Set<string>()
return Array.from(document.querySelectorAll("a, link[rel='alternate']")).reduce((acc, e: any) => {
let type = ""
// Start by detecting type because url doesn't necessarily contain the words "rss" or "atom"
if (e.type) {
// if type doesn't match either rss or atom, don't include link
if (e.type.indexOf("rss") < 0 && e.type.indexOf("atom") < 0) return acc
type = e.type
} else {
// Making sure that we match either a dot or "xml" because "urss" and "atom" are actual words
if (e.href.match(/(\.rss)|(rss\.xml)/i)) type = "application/rss+xml"
else if (e.href.match(/(\.atom)|(atom\.xml)/i)) type = "application/atom+xml"
else return acc
}
if (seen.has(e.href)) return acc
seen.add(e.href)
return acc.concat({ type, url: e.href, title: e.title || e.innerText } as { type: string; url: string; title: string })
}, [])
return Array.from(document.querySelectorAll("a, link[rel='alternate']"))
.filter((e: any) => typeof e.href == "string")
.reduce((acc, e: any) => {
let type = ""
// Start by detecting type because url doesn't necessarily contain the words "rss" or "atom"
if (e.type) {
// if type doesn't match either rss or atom, don't include link
if (e.type.indexOf("rss") < 0 && e.type.indexOf("atom") < 0) return acc
type = e.type
} else {
// Making sure that we match either a dot or "xml" because "urss" and "atom" are actual words
if (e.href.match(/(\.rss)|(rss\.xml)/i)) type = "application/rss+xml"
else if (e.href.match(/(\.atom)|(atom\.xml)/i)) type = "application/atom+xml"
else return acc
}
if (seen.has(e.href)) return acc
seen.add(e.href)
return acc.concat({ type, url: e.href, title: e.title || e.innerText } as { type: string; url: string; title: string })
}, [])
}
/**