aboutsummaryrefslogtreecommitdiff
path: root/internal/reader/rss/rss.go
diff options
context:
space:
mode:
authorGravatar Frédéric Guillot <f@miniflux.net> 2023-08-13 19:09:01 -0700
committerGravatar Frédéric Guillot <f@miniflux.net> 2023-08-13 19:57:04 -0700
commite5d9f2f5a05453043ed29c79f3f1a8865f26d99d (patch)
tree86e6888a2c02d3daec4f2b3f0c2d633db96ea063 /internal/reader/rss/rss.go
parent9f465fd70db9368e87e2dac77f4ea2d2a27c7c14 (diff)
downloadv2-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/rss/rss.go')
-rw-r--r--internal/reader/rss/rss.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/internal/reader/rss/rss.go b/internal/reader/rss/rss.go
index 7edf91db..93584bf0 100644
--- a/internal/reader/rss/rss.go
+++ b/internal/reader/rss/rss.go
@@ -17,7 +17,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: https://cyber.harvard.edu/rss/rss.html
@@ -42,13 +42,13 @@ func (r *rssFeed) Transform(baseURL string) *model.Feed {
feed := new(model.Feed)
siteURL := r.siteURL()
- feed.SiteURL, err = url.AbsoluteURL(baseURL, siteURL)
+ feed.SiteURL, err = urllib.AbsoluteURL(baseURL, siteURL)
if err != nil {
feed.SiteURL = siteURL
}
feedURL := r.feedURL()
- feed.FeedURL, err = url.AbsoluteURL(baseURL, feedURL)
+ feed.FeedURL, err = urllib.AbsoluteURL(baseURL, feedURL)
if err != nil {
feed.FeedURL = feedURL
}
@@ -69,7 +69,7 @@ func (r *rssFeed) Transform(baseURL string) *model.Feed {
if entry.URL == "" {
entry.URL = feed.SiteURL
} else {
- entryURL, err := url.AbsoluteURL(feed.SiteURL, entry.URL)
+ entryURL, err := urllib.AbsoluteURL(feed.SiteURL, entry.URL)
if err == nil {
entry.URL = entryURL
}
@@ -406,7 +406,7 @@ func (r *rssItem) entryCommentsURL() string {
commentsURL := strings.TrimSpace(commentLink.Data)
// The comments URL is supposed to be absolute (some feeds publishes incorrect comments URL)
// See https://cyber.harvard.edu/rss/rss.html#ltcommentsgtSubelementOfLtitemgt
- if url.IsAbsoluteURL(commentsURL) {
+ if urllib.IsAbsoluteURL(commentsURL) {
return commentsURL
}
}