oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-26 18:21:01 +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

10
internal/reader/sanitizer/sanitizer.go
View file

@ -12,7 +12,7 @@ import (
"strings"
"miniflux.app/v2/internal/config"
"miniflux.app/v2/internal/url"
"miniflux.app/v2/internal/urllib"
"golang.org/x/net/html"
)
@ -141,7 +141,7 @@ func sanitizeAttributes(baseURL, tagName string, attributes []html.Attribute) ([
value = attribute.Val
isAnchorLink = true
} else {
value, err = url.AbsoluteURL(baseURL, value)
value, err = urllib.AbsoluteURL(baseURL, value)
if err != nil {
continue
}
@ -350,12 +350,12 @@ func isValidIframeSource(baseURL, src string) bool {
}
// allow iframe from same origin
if url.Domain(baseURL) == url.Domain(src) {
if urllib.Domain(baseURL) == urllib.Domain(src) {
return true
}
// allow iframe from custom invidious instance
if config.Opts != nil && config.Opts.InvidiousInstance() == url.Domain(src) {
if config.Opts != nil && config.Opts.InvidiousInstance() == urllib.Domain(src) {
return true
}
@ -467,7 +467,7 @@ func sanitizeSrcsetAttr(baseURL, value string) string {
imageCandidates := ParseSrcSetAttribute(value)
for _, imageCandidate := range imageCandidates {
absoluteURL, err := url.AbsoluteURL(baseURL, imageCandidate.ImageURL)
absoluteURL, err := urllib.AbsoluteURL(baseURL, imageCandidate.ImageURL)
if err == nil {
imageCandidate.ImageURL = absoluteURL
}