dkforest

commit e458e986db49bd5f28c0914bfd50be25ed0a729f
parent 2f985b4c398d67b0c02d6a760583cc3a9e5aee8f
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Tue,  5 Dec 2023 18:24:28 -0500

cleanup

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

1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/pkg/web/handlers/poker.go b/pkg/web/handlers/poker.go
@@ -691,15 +691,27 @@ func PokerSitHandler(c echo.Context) error {
 	return c.HTML(http.StatusOK, `<form method="post"><button>SIT</button></form>`)
 }
 
+func isHeartOrDiamond(name string) bool {
+	return strings.Contains(name, "♥") ||
+		strings.Contains(name, "♦")
+}
+
 func colorForCard(name string) string {
 	color := "black"
-	if strings.Contains(name, "♥") ||
-		strings.Contains(name, "♦") {
+	if isHeartOrDiamond(name) {
 		color = "darkred"
 	}
 	return color
 }
 
+func colorForCard1(name string) string {
+	color := "black"
+	if isHeartOrDiamond(name) {
+		color = "red"
+	}
+	return color
+}
+
 func buildYourCardsHtml(authUser *database.User, g *PokerGame) string {
 	html := `<div style="position: absolute; top: 450px; left: 200px;"><div id="yourCard1"></div><div id="yourCard2"></div></div>`
 	if g.Ongoing != nil {
@@ -954,11 +966,6 @@ func PokerHandler(c echo.Context) error {
 	}
 
 	getPokerEventHtml := func(payload PokerEvent, animationTime string) string {
-		color := "black"
-		if strings.Contains(payload.Name, "♥") ||
-			strings.Contains(payload.Name, "♦") {
-			color = "red"
-		}
 		transform := `transform: translate(` + strconv.Itoa(payload.Left) + `px, ` + strconv.Itoa(payload.Top) + `px)`
 		if payload.Angle != "" {
 			transform += ` rotateZ(` + payload.Angle + `)`
@@ -973,7 +980,7 @@ func PokerHandler(c echo.Context) error {
  	transition: ` + animationTime + ` ease-in-out;
 	` + transform + `
 }
-#` + payload.ID + ` .card .inner:before { content: "` + payload.Name + `"; color: ` + color + `; }
+#` + payload.ID + ` .card .inner:before { content: "` + payload.Name + `"; color: ` + colorForCard1(payload.Name) + `; }
 </style>`
 		return pokerEvtHtml
 	}