dkforest

commit c5e649205b80169f7dc17a9ef6511c861ed3c5ea
parent ee247b09d1d9f9f1a6e8fa6375ef15137ce081cf
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 11 Jun 2023 19:58:31 -0700

cleanup

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

1 file changed, 10 insertions(+), 20 deletions(-)
diff --git a/pkg/web/handlers/interceptors/chess.go b/pkg/web/handlers/interceptors/chess.go
@@ -508,25 +508,10 @@ func (b *Chess) SendMove(gameKey string, userID database.UserID, g *ChessGame, c
 	turn := g.Game.Position().Turn()
 	_ = g.Game.MoveStr(moveStr)
 	g.lastUpdated = time.Now()
-
-	idStr1 := g.PiecesCache[mov.S1()]
 	idStr2 := g.PiecesCache[mov.S2()]
-	delete(g.PiecesCache, mov.S1())
-	delete(g.PiecesCache, mov.S2())
-	g.PiecesCache[mov.S2()] = idStr1
-	if mov.S1() == chess.E1 && mov.HasTag(chess.KingSideCastle) {
-		delete(g.PiecesCache, chess.H1)
-		g.PiecesCache[chess.F1] = "img_7"
-	} else if mov.S1() == chess.E8 && mov.HasTag(chess.KingSideCastle) {
-		delete(g.PiecesCache, chess.H8)
-		g.PiecesCache[chess.F8] = "img_63"
-	} else if mov.S1() == chess.E1 && mov.HasTag(chess.QueenSideCastle) {
-		delete(g.PiecesCache, chess.A1)
-		g.PiecesCache[chess.D1] = "img_0"
-	} else if mov.S1() == chess.E8 && mov.HasTag(chess.QueenSideCastle) {
-		delete(g.PiecesCache, chess.A8)
-		g.PiecesCache[chess.D8] = "img_56"
-	}
+	idStr1 := g.PiecesCache[mov.S1()]
+
+	g.updatePiecesCache(mov)
 
 	chessMov := ChessMove{
 		IDStr1: idStr1,
@@ -562,6 +547,13 @@ func (g *ChessGame) MoveStr(m string) {
 			break
 		}
 	}
+
+	g.updatePiecesCache(mov)
+
+	_ = g.Game.MoveStr(m)
+}
+
+func (g *ChessGame) updatePiecesCache(mov chess.Move) {
 	idStr1 := g.PiecesCache[mov.S1()]
 	delete(g.PiecesCache, mov.S1())
 	delete(g.PiecesCache, mov.S2())
@@ -579,6 +571,4 @@ func (g *ChessGame) MoveStr(m string) {
 		delete(g.PiecesCache, chess.A8)
 		g.PiecesCache[chess.D8] = "img_56"
 	}
-
-	_ = g.Game.MoveStr(m)
 }