dkforest

commit 1fcd699724fe458c8d781018da31049354ed30f9
parent cae20006f4bd615f1977423f63a81ffd91adc0d2
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 11 Dec 2023 15:02:34 -0500

cleanup

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

1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -1232,6 +1232,23 @@ func buildBaseHtml(g *PokerGame, authUser *database.User, roomID string) (html s
 	html += buildMainPotHtml(g)
 	html += buildWinnerHtml()
 	html += buildCountdownsHtml()
+
+	if g.Ongoing != nil {
+		g.Ongoing.WaitTurnEventMtx.RLock()
+		html += drawCountDownStyle(g.Ongoing.WaitTurnEvent)
+		g.Ongoing.WaitTurnEventMtx.RUnlock()
+
+		g.Ongoing.EventsMtx.RLock()
+		for _, evt := range g.Ongoing.Events {
+			if evt.Player == "" {
+				html += getPokerEventHtml(evt, "0s")
+			}
+			if evt.Player == authUser.Username.String() {
+				html += getPokerEventHtml(evt, "0s")
+			}
+		}
+		g.Ongoing.EventsMtx.RUnlock()
+	}
 	return
 }
 
@@ -1857,23 +1874,6 @@ func PokerHandler(c echo.Context) error {
 
 	send(buildBaseHtml(g, authUser, roomID))
 
-	if g.Ongoing != nil {
-		g.Ongoing.WaitTurnEventMtx.RLock()
-		send(drawCountDownStyle(g.Ongoing.WaitTurnEvent))
-		g.Ongoing.WaitTurnEventMtx.RUnlock()
-
-		g.Ongoing.EventsMtx.RLock()
-		for _, evt := range g.Ongoing.Events {
-			if evt.Player == "" {
-				send(getPokerEventHtml(evt, "0s"))
-			}
-			if evt.Player == authUser.Username.String() {
-				send(getPokerEventHtml(evt, "0s"))
-			}
-		}
-		g.Ongoing.EventsMtx.RUnlock()
-
-	}
 	c.Response().Flush()
 
 Loop: