dkforest

commit ea132a9e82f14acde7e63ebab3548e61b4703c9b
parent 65228c184e7c22e0f131e81e01706d259386cbd5
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Tue,  5 Dec 2023 14:37:12 -0500

cleanup

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

1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/pkg/web/handlers/poker.go b/pkg/web/handlers/poker.go
@@ -105,7 +105,7 @@ func (g *Ongoing) GetPlayer(player string) *PokerPlayer {
 }
 
 func (g *PokerGame) Deal(roomID string) {
-	myTopic := "room_" + roomID
+	roomTopic := "room_" + roomID
 
 	if g.Ongoing != nil {
 		if !g.IsGameOver {
@@ -113,7 +113,7 @@ func (g *PokerGame) Deal(roomID string) {
 			return
 		} else {
 			g.IsGameOver = false
-			PokerPubSub.Pub(myTopic, ResetCardsEvent{})
+			PokerPubSub.Pub(roomTopic, ResetCardsEvent{})
 			time.Sleep(time.Second)
 		}
 	}
@@ -151,7 +151,7 @@ func (g *PokerGame) Deal(roomID string) {
 					continue
 				}
 				evt := PokerWaitTurnEvent{Idx: i}
-				PokerPubSub.Pub(myTopic, evt)
+				PokerPubSub.Pub(roomTopic, evt)
 				g.Ongoing.WaitTurnEvent = evt
 				fmt.Println("WAIT FOR ACTION", p)
 				waitCh := time.After(MaxUserCountdown * time.Second)
@@ -170,13 +170,13 @@ func (g *PokerGame) Deal(roomID string) {
 					fmt.Println("GOT FROM", evt.Player, evt)
 					if evt.Fold {
 						player.Folded = true
-						PokerPubSub.Pub(myTopic, PlayerFoldEvent{Card1Idx: player.Cards[0].Idx, Card2Idx: player.Cards[1].Idx})
+						PokerPubSub.Pub(roomTopic, PlayerFoldEvent{Card1Idx: player.Cards[0].Idx, Card2Idx: player.Cards[1].Idx})
 					} else if evt.Check {
 					} else if evt.Call {
 					} else if evt.Bet > 0 {
 						g.Ongoing.Players[i].Bet += evt.Bet
 						g.Ongoing.Players[i].Cash -= evt.Bet
-						PokerPubSub.Pub(myTopic, PlayerBetEvent{PlayerIdx: i, Player: p.Username, Bet: evt.Bet, TotalBet: g.Ongoing.Players[i].Bet, Cash: g.Ongoing.Players[i].Cash})
+						PokerPubSub.Pub(roomTopic, PlayerBetEvent{PlayerIdx: i, Player: p.Username, Bet: evt.Bet, TotalBet: g.Ongoing.Players[i].Bet, Cash: g.Ongoing.Players[i].Cash})
 					}
 					break
 				}
@@ -190,7 +190,7 @@ func (g *PokerGame) Deal(roomID string) {
 			}
 
 			evt := PokerWaitTurnEvent{Idx: -1, MainPot: g.Ongoing.MainPot}
-			PokerPubSub.Pub(myTopic, evt)
+			PokerPubSub.Pub(roomTopic, evt)
 			g.Ongoing.WaitTurnEvent = evt
 		}
 
@@ -221,7 +221,7 @@ func (g *PokerGame) Deal(roomID string) {
 				Left: BurnStackX + (pos * 4),
 				Burn: true,
 			}
-			PokerPubSub.Pub(myTopic, evt)
+			PokerPubSub.Pub(roomTopic, evt)
 			g.Ongoing.Events = append(g.Ongoing.Events, evt)
 		}
 
@@ -235,11 +235,11 @@ func (g *PokerGame) Deal(roomID string) {
 				Top:  150,
 				Left: 100 + (pos * 55),
 			}
-			PokerPubSub.Pub(myTopic, evt)
+			PokerPubSub.Pub(roomTopic, evt)
 			g.Ongoing.Events = append(g.Ongoing.Events, evt)
 		}
 
-		PokerPubSub.Pub(myTopic, GameStartedEvent{DeckHash: utils.MD5([]byte(strings.Join(g.Ongoing.Deck, "")))})
+		PokerPubSub.Pub(roomTopic, GameStartedEvent{DeckHash: utils.MD5([]byte(strings.Join(g.Ongoing.Deck, "")))})
 
 		// Deal cards
 		for j := 1; j <= 2; j++ {
@@ -268,8 +268,8 @@ func (g *PokerGame) Deal(roomID string) {
 					Burn:  true,
 				}
 				g.Ongoing.Players[i].Cards = append(g.Ongoing.Players[i].Cards, PlayerCard{Idx: idx, Name: card})
-				PokerPubSub.Pub(myTopic, evt)
-				PokerPubSub.Pub(myTopic+"_"+p.Username, YourCardEvent{Idx: j, Name: card})
+				PokerPubSub.Pub(roomTopic, evt)
+				PokerPubSub.Pub(roomTopic+"_"+p.Username, YourCardEvent{Idx: j, Name: card})
 				g.Ongoing.Events = append(g.Ongoing.Events, evt)
 			}
 		}
@@ -324,7 +324,7 @@ func (g *PokerGame) Deal(roomID string) {
 
 		// TODO: evaluate hands, and crown winner
 		g.IsGameDone = true
-		PokerPubSub.Pub(myTopic, GameIsDoneEvent{DeckStr: strings.Join(g.Ongoing.Deck, "")})
+		PokerPubSub.Pub(roomTopic, GameIsDoneEvent{DeckStr: strings.Join(g.Ongoing.Deck, "")})
 
 		// Wait a minimum of X seconds before allowing a new game
 		time.Sleep(MinTimeAfterGame * time.Second)