oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-06-27 16:36:00 +00:00
Code Wiki Activity

refactor(internal): add an urllib.DomainWithoutWWW function

Browse source
This commit is contained in:
jvoisin 2025-06-17 16:34:13 +02:00 • committed by Frédéric Guillot
parent af15032145
commit b296f21e98
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -486,7 +486,7 @@ func isBlockedResource(absoluteURL string) bool {
} }
func isValidIframeSource(iframeSourceURL string) bool { func isValidIframeSource(iframeSourceURL string) bool {
iframeSourceDomain := strings.TrimPrefix(urllib.Domain(iframeSourceURL), "www.") iframeSourceDomain := urllib.DomainWithoutWWW(iframeSourceURL)
if _, ok := iframeAllowList[iframeSourceDomain]; ok { if _, ok := iframeAllowList[iframeSourceDomain]; ok {
return true return true

3
internal/reader/scraper/scraper.go
View file

@ -93,8 +93,7 @@ func findContentUsingCustomRules(page io.Reader, rules string) (baseURL string,
} }
func getPredefinedScraperRules(websiteURL string) string { func getPredefinedScraperRules(websiteURL string) string {
urlDomain := urllib.Domain(websiteURL) urlDomain := urllib.DomainWithoutWWW(websiteURL)
urlDomain = strings.TrimPrefix(urlDomain, "www.")
if rules, ok := predefinedRules[urlDomain]; ok { if rules, ok := predefinedRules[urlDomain]; ok {
return rules return rules

5
internal/urllib/url.go
View file

@ -83,6 +83,11 @@ func Domain(websiteURL string) string {
return parsedURL.Host return parsedURL.Host
} }
// DomainWithoutWWW returns only the domain part of the given URL, with the "www." prefix removed if present.
func DomainWithoutWWW(websiteURL string) string {
return strings.TrimPrefix(Domain(websiteURL), "www.")
}
// JoinBaseURLAndPath returns a URL string with the provided path elements joined together. // JoinBaseURLAndPath returns a URL string with the provided path elements joined together.
func JoinBaseURLAndPath(baseURL, path string) (string, error) { func JoinBaseURLAndPath(baseURL, path string) (string, error) {
if baseURL == "" { if baseURL == "" {