From 01db2d50aee547a365aa7f1fbb2ce1428ef6936d Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Fri, 10 Feb 2023 23:03:34 +0100
Subject: [PATCH] nits

---
 cmd/main.go                | 4 ++--
 server/upstream/domains.go | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cmd/main.go b/cmd/main.go
index af4d2ce..4f0c019 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -44,7 +44,7 @@ func Serve(ctx *cli.Context) error {
 	}
 	log.Logger = zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr}).With().Timestamp().Logger().Level(logLevel)
 
-	giteaRoot := strings.TrimSuffix(ctx.String("gitea-root"), "/")
+	giteaRoot := ctx.String("gitea-root")
 	giteaAPIToken := ctx.String("gitea-api-token")
 	rawDomain := ctx.String("raw-domain")
 	mainDomainSuffix := ctx.String("pages-domain")
@@ -68,7 +68,7 @@ func Serve(ctx *cli.Context) error {
 		allowedCorsDomains = append(allowedCorsDomains, rawDomain)
 	}
 
-	// Make sure MainDomain has a trailing dot, and GiteaRoot has no trailing slash
+	// Make sure MainDomain has a trailing dot
 	if !strings.HasPrefix(mainDomainSuffix, ".") {
 		mainDomainSuffix = "." + mainDomainSuffix
 	}
diff --git a/server/upstream/domains.go b/server/upstream/domains.go
index 5b274b6..2c6920a 100644
--- a/server/upstream/domains.go
+++ b/server/upstream/domains.go
@@ -1,6 +1,7 @@
 package upstream
 
 import (
+	"errors"
 	"strings"
 	"time"
 
@@ -30,7 +31,7 @@ func (o *Options) CheckCanonicalDomain(giteaClient *gitea.Client, actualDomain,
 	}
 
 	body, err := giteaClient.GiteaRawContent(o.TargetOwner, o.TargetRepo, o.TargetBranch, canonicalDomainConfig)
-	if err == nil || err == gitea.ErrorNotFound {
+	if err != nil && !errors.Is(err, gitea.ErrorNotFound) {
 		log.Info().Err(err).Msgf("could not read %s of %s/%s", canonicalDomainConfig, o.TargetOwner, o.TargetRepo)
 	}