diff options
author | 2023-08-13 19:09:01 -0700 | |
---|---|---|
committer | 2023-08-13 19:57:04 -0700 | |
commit | e5d9f2f5a05453043ed29c79f3f1a8865f26d99d (patch) | |
tree | 86e6888a2c02d3daec4f2b3f0c2d633db96ea063 /internal/reader/atom/atom_10.go | |
parent | 9f465fd70db9368e87e2dac77f4ea2d2a27c7c14 (diff) | |
download | v2-e5d9f2f5a05453043ed29c79f3f1a8865f26d99d.tar.gz v2-e5d9f2f5a05453043ed29c79f3f1a8865f26d99d.tar.zst v2-e5d9f2f5a05453043ed29c79f3f1a8865f26d99d.zip |
Rename internal url package to avoid overlap with net/url
Diffstat (limited to 'internal/reader/atom/atom_10.go')
-rw-r--r-- | internal/reader/atom/atom_10.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/internal/reader/atom/atom_10.go b/internal/reader/atom/atom_10.go index 4b0d0dfe..2c6edf17 100644 --- a/internal/reader/atom/atom_10.go +++ b/internal/reader/atom/atom_10.go @@ -16,7 +16,7 @@ import ( "miniflux.app/v2/internal/reader/date" "miniflux.app/v2/internal/reader/media" "miniflux.app/v2/internal/reader/sanitizer" - "miniflux.app/v2/internal/url" + "miniflux.app/v2/internal/urllib" ) // Specs: @@ -38,13 +38,13 @@ func (a *atom10Feed) Transform(baseURL string) *model.Feed { feed := new(model.Feed) feedURL := a.Links.firstLinkWithRelation("self") - feed.FeedURL, err = url.AbsoluteURL(baseURL, feedURL) + feed.FeedURL, err = urllib.AbsoluteURL(baseURL, feedURL) if err != nil { feed.FeedURL = feedURL } siteURL := a.Links.originalLink() - feed.SiteURL, err = url.AbsoluteURL(baseURL, siteURL) + feed.SiteURL, err = urllib.AbsoluteURL(baseURL, siteURL) if err != nil { feed.SiteURL = siteURL } @@ -58,7 +58,7 @@ func (a *atom10Feed) Transform(baseURL string) *model.Feed { for _, entry := range a.Entries { item := entry.Transform() - entryURL, err := url.AbsoluteURL(feed.SiteURL, item.URL) + entryURL, err := urllib.AbsoluteURL(feed.SiteURL, item.URL) if err == nil { item.URL = entryURL } @@ -237,7 +237,7 @@ func (r *atom10Entry) entryCategories() []string { // We accept only HTML or XHTML documents for now since the intention is to have the same behavior as RSS. func (a *atom10Entry) entryCommentsURL() string { commentsURL := a.Links.firstLinkWithRelationAndType("replies", "text/html", "application/xhtml+xml") - if url.IsAbsoluteURL(commentsURL) { + if urllib.IsAbsoluteURL(commentsURL) { return commentsURL } return "" |