diff options
| author |  Frédéric Guillot <f@miniflux.net>
| 2024-03-15 18:04:24 -0700 |
|---|---|---|
| committer | Frédéric Guillot <f@miniflux.net>
| 2024-03-15 18:40:06 -0700 |
| commit | 4834e934f2cf57b106923bd37d62d6c5f6f39f1f (patch) | |
| tree | 0674e4bfb3210aef67d3afd4a51a9cd07fb31fc6 /internal/reader/rss/adapter.go | |
| parent | dd4fb660c19fd1f6ce5716f9f5783eb7565fed2d (diff) | |
| download | v2-4834e934f2cf57b106923bd37d62d6c5f6f39f1f.tar.gz v2-4834e934f2cf57b106923bd37d62d6c5f6f39f1f.tar.zst v2-4834e934f2cf57b106923bd37d62d6c5f6f39f1f.zip | |
Remove some duplicated code in RSS parser
Diffstat (limited to 'internal/reader/rss/adapter.go')
| -rw-r--r-- | internal/reader/rss/adapter.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/internal/reader/rss/adapter.go b/internal/reader/rss/adapter.go index 2909fc6b..531cc53f 100644 --- a/internal/reader/rss/adapter.go +++ b/internal/reader/rss/adapter.go @@ -39,7 +39,7 @@ func (r *RSSAdapter) BuildFeed(feedURL string) *model.Feed { // Try to find the feed URL from the Atom links. for _, atomLink := range r.rss.Channel.AtomLinks.Links { - atomLinkHref := strings.TrimSpace(atomLink.URL) + atomLinkHref := strings.TrimSpace(atomLink.Href) if atomLinkHref != "" && atomLink.Rel == "self" { if absoluteFeedURL, err := urllib.AbsoluteURL(feedURL, atomLinkHref); err == nil { feed.FeedURL = absoluteFeedURL @@ -170,8 +170,8 @@ func findEntryURL(rssItem *RSSItem) string { } for _, atomLink := range rssItem.AtomLinks.Links { - if atomLink.URL != "" && (strings.EqualFold(atomLink.Rel, "alternate") || atomLink.Rel == "") { - return strings.TrimSpace(atomLink.URL) + if atomLink.Href != "" && (strings.EqualFold(atomLink.Rel, "alternate") || atomLink.Rel == "") { + return strings.TrimSpace(atomLink.Href) } } @@ -233,8 +233,8 @@ func findEntryAuthor(rssItem *RSSItem) string { author = rssItem.ItunesAuthor case rssItem.DublinCoreCreator != "": author = rssItem.DublinCoreCreator - case rssItem.AtomAuthor.String() != "": - author = rssItem.AtomAuthor.String() + case rssItem.AtomAuthor.PersonName() != "": + author = rssItem.AtomAuthor.PersonName() case strings.Contains(rssItem.Author.Inner, "<![CDATA["): author = rssItem.Author.Data default: |