diff options
Diffstat (limited to 'internal/template/functions.go')
| -rw-r--r-- | internal/template/functions.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/internal/template/functions.go b/internal/template/functions.go index f8aa2bbd..54e787cf 100644 --- a/internal/template/functions.go +++ b/internal/template/functions.go @@ -16,8 +16,8 @@ import ( "miniflux.app/v2/internal/crypto" "miniflux.app/v2/internal/http/route" "miniflux.app/v2/internal/locale" + "miniflux.app/v2/internal/mediaproxy" "miniflux.app/v2/internal/model" - "miniflux.app/v2/internal/proxy" "miniflux.app/v2/internal/timezone" "miniflux.app/v2/internal/urllib" @@ -57,19 +57,19 @@ func (f *funcMap) Map() template.FuncMap { return template.HTML(str) }, "proxyFilter": func(data string) string { - return proxy.ProxyRewriter(f.router, data) + return mediaproxy.RewriteDocumentWithRelativeProxyURL(f.router, data) }, "proxyURL": func(link string) string { - proxyOption := config.Opts.ProxyOption() + mediaProxyMode := config.Opts.MediaProxyMode() - if proxyOption == "all" || (proxyOption != "none" && !urllib.IsHTTPS(link)) { - return proxy.ProxifyURL(f.router, link) + if mediaProxyMode == "all" || (mediaProxyMode != "none" && !urllib.IsHTTPS(link)) { + return mediaproxy.ProxifyRelativeURL(f.router, link) } return link }, "mustBeProxyfied": func(mediaType string) bool { - return slices.Contains(config.Opts.ProxyMediaTypes(), mediaType) + return slices.Contains(config.Opts.MediaProxyResourceTypes(), mediaType) }, "domain": urllib.Domain, "hasPrefix": strings.HasPrefix, |