dkforest

commit e6650b3c263f428ff6f9c7f684edda28e9e6fe6e
parent 19aac4d449a834b8610fa7fd46e1b2ca7c0aaae5
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 11 Jun 2023 16:43:03 -0700

cleanup

Diffstat:
M
pkg/web/handlers/handlers.go
 | 
28
++++++++++++----------------

1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -5216,29 +5216,25 @@ Loop:
 		}
 
 		animate(payload.Move.S1(), payload.Move.S2(), payload.IDStr1)
-		if payload.IDStr2 != "" {
-			send(fmt.Sprintf(`<style>#%s { z-index: 2; }</style>`, payload.IDStr2))
-			send(fmt.Sprintf(`<style>#%s { z-index: 3; }</style>`, payload.IDStr1))
-			go func(payload interceptors.ChessMove, c echo.Context) {
-				select {
-				case <-time.After(animationMs * time.Millisecond):
-				case <-quit:
-					return
-				}
-				send(fmt.Sprintf(`<style>#%s { display: none; }</style>`, payload.IDStr2))
-				c.Response().Flush()
-			}(payload, c)
-		}
 
-		if payload.Move.Promo() != chess.NoPieceType {
+		if payload.Move.Promo() != chess.NoPieceType || payload.IDStr2 != "" {
+			if payload.IDStr2 != "" {
+				send(fmt.Sprintf(`<style>#%s { z-index: 2; }</style>`, payload.IDStr2))
+				send(fmt.Sprintf(`<style>#%s { z-index: 3; }</style>`, payload.IDStr1))
+			}
 			go func(payload interceptors.ChessMove, c echo.Context) {
 				select {
 				case <-time.After(animationMs * time.Millisecond):
 				case <-quit:
 					return
 				}
-				promoImg := "/public/img/chess/" + payload.Turn.String() + strings.ToUpper(payload.Move.Promo().String()) + ".png"
-				send(fmt.Sprintf(`<style>#%s { background-image: url("%s") !important; }</style>`, payload.IDStr1, promoImg))
+				if payload.IDStr2 != "" {
+					send(fmt.Sprintf(`<style>#%s { display: none; }</style>`, payload.IDStr2))
+				}
+				if payload.Move.Promo() != chess.NoPieceType {
+					promoImg := "/public/img/chess/" + payload.Turn.String() + strings.ToUpper(payload.Move.Promo().String()) + ".png"
+					send(fmt.Sprintf(`<style>#%s { background-image: url("%s") !important; }</style>`, payload.IDStr1, promoImg))
+				}
 				c.Response().Flush()
 			}(payload, c)
 		}