From e3ee2a5e0804f5fa189853d658879c80aa4c22fe Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Sun, 15 May 2022 14:22:15 +0200
Subject: [PATCH] code cleanup

---
 csgo/sharecode.go |  2 +-
 utils/utils.go    | 19 +++----------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/csgo/sharecode.go b/csgo/sharecode.go
index 55e7f68..4e41bdd 100644
--- a/csgo/sharecode.go
+++ b/csgo/sharecode.go
@@ -10,7 +10,7 @@ import (
 
 //goland:noinspection SpellCheckingInspection
 var DICT = "ABCDEFGHJKLMNOPQRSTUVWXYZabcdefhijkmnopqrstuvwxyz23456789"
-var sharecodeRexEx = regexp.MustCompile("^CSGO(?:-?[\\w]{5}){5}$")
+var sharecodeRexEx = regexp.MustCompile("^CSGO(?:-?\\w{5}){5}$")
 
 func DecodeSharecode(code string) (uint64, uint64, uint16, error) {
 	if !sharecodeRexEx.MatchString(code) {
diff --git a/utils/utils.go b/utils/utils.go
index 1882013..8f2199a 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -244,21 +244,6 @@ var (
 	AuthCodeRegEx  = regexp.MustCompile(`^[ABCDEFGHJKLMNOPQRSTUVWXYZ23456789]{4}-[ABCDEFGHJKLMNOPQRSTUVWXYZ23456789]{5}-[ABCDEFGHJKLMNOPQRSTUVWXYZ23456789]{4}$`)
 )
 
-func SendJSON(data interface{}, w http.ResponseWriter) error {
-	w.Header().Set("content-type", "application/json")
-	playerJson, err := json.Marshal(data)
-	if err != nil {
-		return err
-	}
-	w.WriteHeader(http.StatusOK)
-	_, err = w.Write(playerJson)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func GetMetaStats(dbPlayer *ent.Player) (*MetaStatsResponse, error) {
 	mResponse := new(MetaStatsResponse)
 	mResponse.Player = &PlayerResponse{SteamID64: dbPlayer.ID}
@@ -711,7 +696,9 @@ func TranslateWithDeepL(text string, language string, baseURL string, apiKey str
 		return "", "", fmt.Errorf("deepl response %d", dlResp.StatusCode)
 	} else {
 		respBytes, err := io.ReadAll(dlResp.Body)
-		defer dlResp.Body.Close()
+		defer func(Body io.ReadCloser) {
+			_ = Body.Close()
+		}(dlResp.Body)
 		if err != nil {
 			return "", "", fmt.Errorf("error reading deepl response: %w", err)
 		}