From 8d0ab6d8c0a3be60ba0e9ede805aee48f559a5bc Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 15 May 2022 22:35:39 +0200 Subject: [PATCH] refactor --- server/upstream/domains.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/server/upstream/domains.go b/server/upstream/domains.go index 28a2d9c..040451b 100644 --- a/server/upstream/domains.go +++ b/server/upstream/domains.go @@ -8,10 +8,6 @@ import ( // CheckCanonicalDomain returns the canonical domain specified in the repo (using the `.domains` file). func CheckCanonicalDomain(targetOwner, targetRepo, targetBranch, actualDomain, mainDomainSuffix, giteaRoot, giteaAPIToken string, canonicalDomainCache cache.SetGetKey) (string, bool) { - return checkCanonicalDomain(targetOwner, targetRepo, targetBranch, actualDomain, mainDomainSuffix, giteaRoot, giteaAPIToken, canonicalDomainCache) -} - -func checkCanonicalDomain(targetOwner, targetRepo, targetBranch, actualDomain, mainDomainSuffix, giteaRoot, giteaAPIToken string, canonicalDomainCache cache.SetGetKey) (string, bool) { var ( domains []string valid bool @@ -25,13 +21,15 @@ func checkCanonicalDomain(targetOwner, targetRepo, targetBranch, actualDomain, m } } } else { - body, err := giteaRawContent(giteaRoot, targetRepo, targetBranch, giteaRoot, giteaAPIToken, canonicalDomainConfig) + body, err := giteaRawContent(targetOwner, targetRepo, targetBranch, giteaRoot, giteaAPIToken, canonicalDomainConfig) if err == nil { for _, domain := range strings.Split(string(body), "\n") { - domain = strings.ToLower(domain) - domain = strings.TrimSpace(domain) - domain = strings.TrimPrefix(domain, "http://") - domain = strings.TrimPrefix(domain, "https://") + domain = strings.TrimPrefix( + strings.TrimPrefix( + strings.TrimSpace( + strings.ToLower(domain)), + "http://"), + "https://") if len(domain) > 0 && !strings.HasPrefix(domain, "#") && !strings.ContainsAny(domain, "\t /") && strings.ContainsRune(domain, '.') { domains = append(domains, domain) }