oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-11 17:51:01 +00:00
Code Wiki Activity

Fix incorrect parsing of Atom entry content of type HTML

Browse source
This commit is contained in:
Frédéric Guillot 2021-03-18 21:34:09 -07:00 • committed by fguillot
parent 49171c5e8c
commit 14888f1cb8
2 changed files with 154 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

23
reader/atom/atom_10.go
View file

@ -48,7 +48,7 @@ func (a *atom10Feed) Transform(baseURL string) *model.Feed {
feed.SiteURL = siteURL
}
feed.Title = a.Title.String()
feed.Title = html.UnescapeString(a.Title.String())
if feed.Title == "" {
feed.Title = feed.SiteURL
}
@ -100,7 +100,7 @@ func (a *atom10Entry) Transform() *model.Entry {
}
func (a *atom10Entry) entryTitle() string {
return a.Title.String()
return html.UnescapeString(a.Title.String())
}
func (a *atom10Entry) entryContent() string {
@ -221,20 +221,19 @@ func (a *atom10Entry) entryCommentsURL() string {
}
type atom10Text struct {
Type string `xml:"type,attr"`
Data string `xml:",chardata"`
XML string `xml:",innerxml"`
Type string `xml:"type,attr"`
CharData string `xml:",chardata"`
InnerXML string `xml:",innerxml"`
}
func (a *atom10Text) String() string {
content := ""
var content string
switch {
case a.Type == "xhtml":
content = a.XML
default:
content = a.Data
if a.Type == "xhtml" {
content = a.InnerXML
} else {
content = a.CharData
}
return html.UnescapeString(strings.TrimSpace(content))
return strings.TrimSpace(content)
}