diff options
| author |  Frédéric Guillot <f@miniflux.net>
| 2023-08-13 19:09:01 -0700 |
|---|---|---|
| committer | Frédéric Guillot <f@miniflux.net>
| 2023-08-13 19:57:04 -0700 |
| commit | e5d9f2f5a05453043ed29c79f3f1a8865f26d99d (patch) | |
| tree | 86e6888a2c02d3daec4f2b3f0c2d633db96ea063 /internal/reader/json/json.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/json/json.go')
| -rw-r--r-- | internal/reader/json/json.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/internal/reader/json/json.go b/internal/reader/json/json.go index 48879541..48f64c23 100644 --- a/internal/reader/json/json.go +++ b/internal/reader/json/json.go @@ -12,7 +12,7 @@ import ( "miniflux.app/v2/internal/model" "miniflux.app/v2/internal/reader/date" "miniflux.app/v2/internal/reader/sanitizer" - "miniflux.app/v2/internal/url" + "miniflux.app/v2/internal/urllib" ) type jsonFeed struct { @@ -67,12 +67,12 @@ func (j *jsonFeed) Transform(baseURL string) *model.Feed { feed := new(model.Feed) - feed.FeedURL, err = url.AbsoluteURL(baseURL, j.FeedURL) + feed.FeedURL, err = urllib.AbsoluteURL(baseURL, j.FeedURL) if err != nil { feed.FeedURL = j.FeedURL } - feed.SiteURL, err = url.AbsoluteURL(baseURL, j.SiteURL) + feed.SiteURL, err = urllib.AbsoluteURL(baseURL, j.SiteURL) if err != nil { feed.SiteURL = j.SiteURL } @@ -90,7 +90,7 @@ func (j *jsonFeed) Transform(baseURL string) *model.Feed { for _, item := range j.Items { entry := item.Transform() - entryURL, err := url.AbsoluteURL(feed.SiteURL, entry.URL) + entryURL, err := urllib.AbsoluteURL(feed.SiteURL, entry.URL) if err == nil { entry.URL = entryURL } |