dkforest

commit f0cf659ffa82eed91fb01e8a1b299ff07c1357c0
parent ef64b5be37aad7202f1ff5d533b92c2cae555434
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Tue,  6 Jun 2023 22:58:00 -0700

cleanup

Diffstat:
M
pkg/web/handlers/api/v1/chess.go
 | 
10
+++++++---
M
pkg/web/handlers/handlers.go
 | 
6
+++---

2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/pkg/web/handlers/api/v1/chess.go b/pkg/web/handlers/api/v1/chess.go
@@ -273,7 +273,11 @@ func (g *ChessGame) renderBoardB64(isFlipped bool) string {
 	return imgB64
 }
 
-func (g *ChessGame) DrawPlayerCard(roomName string, inChat, isBlack, isYourTurn bool) string {
+func (g *ChessGame) DrawPlayerCard(isBlack, isYourTurn bool) string {
+	return g.drawPlayerCard("", false, isBlack, isYourTurn)
+}
+
+func (g *ChessGame) drawPlayerCard(roomName string, inChat, isBlack, isYourTurn bool) string {
 	enemy := g.Player2
 	if isBlack {
 		enemy = g.Player1
@@ -567,10 +571,10 @@ func (b *Chess) playMove(enemyUsername database.Username, pos string, authUser d
 		logrus.Error(err)
 	}
 
-	card1 := g.DrawPlayerCard(roomName, true, false, true)
+	card1 := g.drawPlayerCard(roomName, true, false, true)
 	_, _ = b.db.CreateMsg(card1, card1, roomKey, roomID, b.zeroID, &g.Player1.ID)
 
-	card1 = g.DrawPlayerCard(roomName, true, true, true)
+	card1 = g.drawPlayerCard(roomName, true, true, true)
 	_, _ = b.db.CreateMsg(card1, card1, roomKey, roomID, b.zeroID, &g.Player2.ID)
 
 	return nil
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -4858,7 +4858,7 @@ func ChessGameHandler(c echo.Context) error {
 		c.Response().Header().Set(echo.HeaderContentType, echo.MIMETextHTMLCharsetUTF8)
 		c.Response().WriteHeader(http.StatusOK)
 		_, _ = c.Response().Write([]byte(cssReset))
-		card1 := g.DrawPlayerCard("", false, isFlipped, isYourTurn)
+		card1 := g.DrawPlayerCard(isFlipped, isYourTurn)
 		_, _ = c.Response().Write([]byte(fmt.Sprintf(`<div id="div_0">%s</div>`, card1)))
 		return nil
 	}
@@ -4887,7 +4887,7 @@ func ChessGameHandler(c echo.Context) error {
 	if isSpectator {
 		card1 = g.DrawSpectatorCard(isFlipped)
 	} else {
-		card1 = g.DrawPlayerCard("", false, isFlipped, isYourTurn)
+		card1 = g.DrawPlayerCard(isFlipped, isYourTurn)
 	}
 	_, _ = c.Response().Write([]byte(fmt.Sprintf(`<div id="div_0">%s</div>`, card1)))
 
@@ -4918,7 +4918,7 @@ Loop:
 		if isSpectator {
 			card1 = g.DrawSpectatorCard(isFlipped)
 		} else {
-			card1 = g.DrawPlayerCard("", false, isFlipped, isYourTurnFn())
+			card1 = g.DrawPlayerCard(isFlipped, isYourTurnFn())
 		}
 		_, _ = c.Response().Write([]byte(fmt.Sprintf(`<style>#div_%d { display: none; }</style>`, i-1)))
 		_, _ = c.Response().Write([]byte(fmt.Sprintf(`<div id="div_%d">%s</div>`, i, card1)))