From e5d9f2f5a05453043ed29c79f3f1a8865f26d99d Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sun, 13 Aug 2023 19:09:01 -0700 Subject: Rename internal url package to avoid overlap with net/url --- internal/template/functions.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'internal/template/functions.go') diff --git a/internal/template/functions.go b/internal/template/functions.go index 08b02411..97ca0f3d 100644 --- a/internal/template/functions.go +++ b/internal/template/functions.go @@ -18,7 +18,7 @@ import ( "miniflux.app/v2/internal/model" "miniflux.app/v2/internal/proxy" "miniflux.app/v2/internal/timezone" - "miniflux.app/v2/internal/url" + "miniflux.app/v2/internal/urllib" "github.com/gorilla/mux" ) @@ -65,7 +65,7 @@ func (f *funcMap) Map() template.FuncMap { "proxyURL": func(link string) string { proxyOption := config.Opts.ProxyOption() - if proxyOption == "all" || (proxyOption != "none" && !url.IsHTTPS(link)) { + if proxyOption == "all" || (proxyOption != "none" && !urllib.IsHTTPS(link)) { return proxy.ProxifyURL(f.router, link) } @@ -80,7 +80,7 @@ func (f *funcMap) Map() template.FuncMap { return false }, "domain": func(websiteURL string) string { - return url.Domain(websiteURL) + return urllib.Domain(websiteURL) }, "hasPrefix": func(str, prefix string) bool { return strings.HasPrefix(str, prefix) -- cgit v1.2.3