From 0e16dda8bb908df022c848c081f548b855dc1cf3 Mon Sep 17 00:00:00 2001
From: Nathan13888 <29968201+Nathan13888@users.noreply.github.com>
Date: Mon, 31 May 2021 17:57:50 -0400
Subject: [PATCH] refactor badge options into separate struct

Signed-off-by: Nathan13888 <29968201+Nathan13888@users.noreply.github.com>
---
 badges.go | 51 +++++++++++++++++++++++++++++++++------------------
 server.go | 15 ++++++++++++---
 2 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/badges.go b/badges.go
index 3a0e157..ad74fe0 100644
--- a/badges.go
+++ b/badges.go
@@ -10,16 +10,24 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-// TODO: add struct to handle badge input
-func generateBadge(SHIELDS_URL string, text string, cnt string, colour string,
-	leftColour string, style string, logo string, logoColour string) []byte {
+type BadgeOptions struct {
+	Text        string
+	Count       string
+	Colour      string // I'm Canadian...
+	LabelColour string
+	Style       string
+	Logo        string
+	LogoColour  string
+}
+
+func generateBadge(SHIELDS_URL string, options BadgeOptions) []byte {
 	if badgeErrorCount > 5 && badgeErrorCount < 10 {
 		SHIELDS_URL = DEFAULT_SHIELDS
 		log.Err(fmt.Errorf("experienced %d errors when generating badges", badgeErrorCount)).Msg("reseting SHIELDS_URL")
 	}
-	data, err := createBadge(SHIELDS_URL, text, cnt, colour, leftColour, style, logo, logoColour)
+	data, err := createBadge(SHIELDS_URL, options)
 	if err != nil {
-		fb, err := getFallBackBadge(err, text, cnt, colour, leftColour, style, logo, logoColour)
+		fb, err := getFallBackBadge(err, options)
 		if err != nil {
 			logError(err)
 			badgeErrorCount++
@@ -29,21 +37,29 @@ func generateBadge(SHIELDS_URL string, text string, cnt string, colour string,
 	}
 	return data
 }
-func createBadge(SHIELDS_URL string, text string, cnt string, colour string,
-	leftColour string, style string, logo string, logoColour string) ([]byte, error) {
+
+func createBadge(SHIELDS_URL string, o BadgeOptions) ([]byte, error) {
 	log.Debug().
 		Str("shields_url", SHIELDS_URL).
-		Str("text", text).
-		Str("count", cnt).
-		Str("colour", colour).
-		Str("leftColour", leftColour).
-		Str("style", style).
-		Str("logo", logo).
-		Str("logo_colour", logoColour).
+		Str("text", o.Text).
+		Str("count", o.Count).
+		Str("colour", o.Colour).
+		Str("labelColour", o.LabelColour).
+		Str("style", o.Style).
+		Str("logo", o.Logo).
+		Str("logo_colour", o.LogoColour).
 		Msg("Generating badge")
 
 	url := fmt.Sprintf("%s/badge/%s-%s-%s?labelColor=%s&style=%s&logo=%s&logoColor=%s",
-		SHIELDS_URL, text, cnt, colour, leftColour, style, logo, logoColour)
+		SHIELDS_URL,
+		o.Text,
+		o.Count,
+		o.Colour,
+		o.LabelColour,
+		o.Style,
+		o.Logo,
+		o.LogoColour,
+	)
 	client := &http.Client{}
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
@@ -69,12 +85,11 @@ func createBadge(SHIELDS_URL string, text string, cnt string, colour string,
 	return body, nil
 }
 
-func getFallBackBadge(err error, text string, cnt string, colour string,
-	leftColour string, style string, logo string, logoColour string) ([]byte, error) {
+func getFallBackBadge(err error, options BadgeOptions) ([]byte, error) {
 	logError(err)
 	badgeErrorCount++
 	// FALLBACK if local shields fail
-	return createBadge(DEFAULT_SHIELDS, text, cnt, colour, leftColour, style, logo, logoColour)
+	return createBadge(DEFAULT_SHIELDS, options)
 }
 
 func getErrorBadge() []byte {
diff --git a/server.go b/server.go
index 0b5dcd6..552d1e5 100644
--- a/server.go
+++ b/server.go
@@ -17,7 +17,7 @@ import (
 // defaults
 const (
 	colour          = "blue"
-	leftColour	= "grey"
+	leftColour      = "grey"
 	style           = "flat"
 	text            = "Visitors"
 	logo            = "" // https://simpleicons.org/
@@ -118,7 +118,7 @@ func getBadge(w http.ResponseWriter, r *http.Request) {
 	hash := getHash(page)
 
 	colour := qryParam("color", r, colour)
-	leftColour := qryParam("lcolor", r, leftColour)
+	labelColour := qryParam("lcolor", r, leftColour)
 	style := qryParam("style", r, style)
 	text := qryParam("text", r, text)
 	logo := qryParam("logo", r, logo)
@@ -130,7 +130,16 @@ func getBadge(w http.ResponseWriter, r *http.Request) {
 
 	cnt := updateCounter(useCache, hash)
 
-	badge := generateBadge(SHIELDS_URL, text, cnt, colour, leftColour, style, logo, logoColour)
+	badge := generateBadge(SHIELDS_URL,
+		BadgeOptions{
+			Text:        text,
+			Count:       cnt,
+			Colour:      colour,
+			LabelColour: labelColour,
+			Style:       style,
+			Logo:        logo,
+			LogoColour:  logoColour,
+		})
 
 	date := time.Now().Add(time.Minute * -10).Format(http.TimeFormat)
 	w.Header().Set("Content-Type", "image/svg+xml")