From d86b25e7da0c4f402f4afab5b6a80b97db59be2e Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 11 Jun 2022 22:51:27 +0200 Subject: [PATCH] address review --- server/database/mock.go | 2 +- server/upstream/domains.go | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/server/database/mock.go b/server/database/mock.go index 8104049..e6c1b5a 100644 --- a/server/database/mock.go +++ b/server/database/mock.go @@ -40,7 +40,7 @@ func (p tmpDB) Delete(key string) error { func (p tmpDB) Compact() (string, error) { p.intern.Truncate() - return "Turncate done", nil + return "Truncate done", nil } func (p tmpDB) Items() *pogreb.ItemIterator { diff --git a/server/upstream/domains.go b/server/upstream/domains.go index 8d06630..553c148 100644 --- a/server/upstream/domains.go +++ b/server/upstream/domains.go @@ -25,12 +25,10 @@ func CheckCanonicalDomain(giteaClient *gitea.Client, targetOwner, targetRepo, ta body, err := giteaClient.GiteaRawContent(targetOwner, targetRepo, targetBranch, canonicalDomainConfig) if err == nil { for _, domain := range strings.Split(string(body), "\n") { - domain = strings.TrimPrefix( - strings.TrimPrefix( - strings.TrimSpace( - strings.ToLower(domain)), - "http://"), - "https://") + domain = strings.ToLower(domain) + domain = strings.TrimSpace(domain) + domain = strings.TrimPrefix(domain, "http://") + domain = strings.TrimPrefix(domain, "https://") if len(domain) > 0 && !strings.HasPrefix(domain, "#") && !strings.ContainsAny(domain, "\t /") && strings.ContainsRune(domain, '.') { domains = append(domains, domain) }