dkforest

commit e24088fd53cec0dc8b4ae3b0d8848b24dd7ae5ef
parent 8b1adb41f6a05847128b292d3535ce1cd303a243
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 12 Jun 2023 13:41:21 -0700

cleanup

Diffstat:
M
pkg/web/handlers/interceptors/chess.go
 | 
23
++++++++++++++---------

1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/pkg/web/handlers/interceptors/chess.go b/pkg/web/handlers/interceptors/chess.go
@@ -394,8 +394,10 @@ func (g *ChessGame) drawPlayerCard(key string, isBlack, isSpectator, isYourTurn,
 </table>
 `
 
+	player1 := g.Player1
+	player2 := g.Player2
 	game := g.Game
-	enemy := utils.Ternary(isBlack, g.Player1, g.Player2)
+	enemy := utils.Ternary(isBlack, player1, player2)
 	imgB64 := g.renderBoardB64(isBlack)
 	whiteAdvantage, whiteScore, blackAdvantage, blackScore := CalcAdvantage(game.Position())
 
@@ -404,8 +406,8 @@ func (g *ChessGame) drawPlayerCard(key string, isBlack, isSpectator, isYourTurn,
 		"Key":            key,
 		"IsFlipped":      isBlack,
 		"IsSpectator":    isSpectator,
-		"White":          g.Player1,
-		"Black":          g.Player2,
+		"White":          player1,
+		"Black":          player2,
 		"Username":       enemy.Username,
 		"Table":          template.HTML(g.renderBoardHTML(isBlack, imgB64)),
 		"ImgB64":         imgB64,
@@ -482,19 +484,22 @@ func (b *Chess) newGame(gameKey string, user1, user2 database.User) *ChessGame {
 }
 
 func (b *Chess) SendMove(gameKey string, userID database.UserID, g *ChessGame, c echo.Context) error {
+	player1 := g.Player1
+	player2 := g.Player2
 	game := g.Game
-	if (game.Position().Turn() == chess.White && userID != g.Player1.ID) ||
-		(game.Position().Turn() == chess.Black && userID != g.Player2.ID) {
+
+	if (game.Position().Turn() == chess.White && userID != player1.ID) ||
+		(game.Position().Turn() == chess.Black && userID != player2.ID) {
 		return errors.New("not your turn")
 	}
 
 	piecesCache := g.piecesCache
 
-	currentPlayer := g.Player1
-	opponentPlayer := g.Player2
+	currentPlayer := player1
+	opponentPlayer := player2
 	if game.Position().Turn() == chess.Black {
-		currentPlayer = g.Player2
-		opponentPlayer = g.Player1
+		currentPlayer = player2
+		opponentPlayer = player1
 	}
 
 	selectedSquares := make([]chess.Square, 0)