From e71b45c2e8ba1572df88d8c38e2a7f138dde3e34 Mon Sep 17 00:00:00 2001
From: Kichiyaki <xyztojajestem@gmail.com>
Date: Sat, 30 May 2020 19:58:25 +0200
Subject: [PATCH] remove EXPOSE instruction from Dockerfile, rename
 cron.checkConquers -> cron.checkEnnoblements

---
 Dockerfile   |  2 --
 cron/cron.go | 14 +++++++-------
 mode/mode.go |  3 +--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ef6a236..5b9aa28 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,6 @@ COPY . .
 
 RUN go build -o main .
 
-EXPOSE 8080
-
 ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.2.1/wait ./wait
 RUN chmod +x ./wait
 
diff --git a/cron/cron.go b/cron/cron.go
index c65d7a3..e9c1929 100644
--- a/cron/cron.go
+++ b/cron/cron.go
@@ -33,25 +33,25 @@ func AttachHandlers(c *cron.Cron, cfg Config) {
 		tribeRepo:  cfg.TribeRepo,
 		discord:    cfg.Discord,
 	}
-	c.AddFunc("@every 1m", h.checkConquers)
+	c.AddFunc("@every 1m", h.checkEnnoblements)
 }
 
-func (h *handler) checkConquers() {
+func (h *handler) checkEnnoblements() {
 	worlds, err := h.tribeRepo.FetchWorlds(context.Background())
 	if err != nil {
-		log.Print("checkConquers: " + err.Error())
+		log.Print("checkEnnoblements: " + err.Error())
 		return
 	}
-	log.Print("checkConquers: worlds: ", worlds)
+	log.Print("checkEnnoblements: worlds: ", worlds)
 	servers, total, err := h.serverRepo.Fetch(context.Background(), nil)
 	if err != nil {
-		log.Print("checkConquers: " + err.Error())
+		log.Print("checkEnnoblements: " + err.Error())
 		return
 	}
-	log.Print("checkConquers: total number of servers: ", total)
+	log.Print("checkEnnoblements: total number of servers: ", total)
 	data := scraper.New(worlds, h.since).Scrap()
 	h.since = time.Now()
-	log.Print("checkConquers: scrapped data: ", data)
+	log.Print("checkEnnoblements: scrapped data: ", data)
 	for _, server := range servers {
 		if server.ConqueredVillagesChannelID == "" && server.LostVillagesChannelID == "" {
 			continue
diff --git a/mode/mode.go b/mode/mode.go
index b4a57dc..f6d586d 100644
--- a/mode/mode.go
+++ b/mode/mode.go
@@ -12,8 +12,7 @@ const (
 var mode = DevelopmentMode
 
 func init() {
-	mode := os.Getenv(EnvMode)
-	Set(mode)
+	Set(os.Getenv(EnvMode))
 }
 
 func Set(value string) {