oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-07-02 16:38:37 +00:00
Code Wiki Activity

Rename internal url package to avoid overlap with net/url

Browse source
This commit is contained in:
Frédéric Guillot 2023-08-13 19:09:01 -07:00
parent 9f465fd70d
commit e5d9f2f5a0
23 changed files with 74 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/template/functions.go
View file

@ -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)