dkforest

commit 7d9cc181832c01db80de1f46f35079c58751c163
parent d3290893074763196b6a30b771434617ed2bb33c
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 24 Dec 2023 17:00:03 -0500

cleanup

Diffstat:
M
pkg/web/handlers/poker/events.go
 | 
4
++++
M
pkg/web/handlers/poker/poker.go
 | 
22
+++++++++++-----------

2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/pkg/web/handlers/poker/events.go b/pkg/web/handlers/poker/events.go
@@ -52,6 +52,10 @@ type ErrorMsgEvent struct {
 	Message string
 }
 
+func NewErrorMsgEvent(msg string) ErrorMsgEvent {
+	return ErrorMsgEvent{Message: msg}
+}
+
 type PlayerFoldEvent struct {
 	Card1Idx, Card2Idx int
 }
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -605,7 +605,7 @@ func (g *PokerGame) Sit(userID database.UserID, username database.Username, pos 
 
 		return nil
 	}); err != nil {
-		PokerPubSub.Pub(g.roomID.UserTopic(userID), ErrorMsgEvent{Message: err.Error()})
+		PokerPubSub.Pub(g.roomID.UserTopic(userID), NewErrorMsgEvent(err.Error()))
 		return
 	}
 }
@@ -799,7 +799,7 @@ func doCheck(g *PokerGame, p *pokerPlayer) int {
 	minBet := g.ongoing.MinBet.Get()
 	if p.GetBet() < minBet {
 		msg := fmt.Sprintf("Need to bet %d", minBet-p.GetBet())
-		PokerPubSub.Pub(g.roomID.UserTopic(p.userID), ErrorMsgEvent{Message: msg})
+		PokerPubSub.Pub(g.roomID.UserTopic(p.userID), NewErrorMsgEvent(msg))
 		return continueGetPlayerEventLoop
 	}
 	p.hasChecked = true
@@ -812,7 +812,7 @@ func doFold(g *PokerGame, p *pokerPlayer, playerAlive *int) int {
 	roomUserTopic := g.roomID.UserTopic(p.userID)
 	if p.GetBet() == g.ongoing.MinBet.Get() {
 		msg := fmt.Sprintf("Cannot fold if there is no bet; check")
-		PokerPubSub.Pub(roomUserTopic, ErrorMsgEvent{Message: msg})
+		PokerPubSub.Pub(roomUserTopic, NewErrorMsgEvent(msg))
 		return doCheck(g, p)
 	}
 	foldPlayer(g, p)
@@ -821,7 +821,7 @@ func doFold(g *PokerGame, p *pokerPlayer, playerAlive *int) int {
 
 	*playerAlive--
 	if *playerAlive == 1 {
-		PokerPubSub.Pub(roomUserTopic, ErrorMsgEvent{Message: ""})
+		PokerPubSub.Pub(roomUserTopic, NewErrorMsgEvent(""))
 		return breakRoundIsSettledLoop
 	}
 	return doNothing
@@ -887,7 +887,7 @@ func doBet(g *PokerGame, p *pokerPlayer,
 	// Ensure the player cannot bet below the table minimum bet (amount of the big blind)
 	if evt.Bet < minRaise {
 		msg := fmt.Sprintf("%s (%d) is too low. Must %s at least %d", betLbl, evt.Bet, betLbl, minRaise)
-		PokerPubSub.Pub(roomUserTopic, ErrorMsgEvent{Message: msg})
+		PokerPubSub.Pub(roomUserTopic, NewErrorMsgEvent(msg))
 		return continueGetPlayerEventLoop
 	}
 	*lastBetPlayerIdx = playerToPlayIdx
@@ -1073,7 +1073,7 @@ RoundIsSettledLoop:
 				case breakRoundIsSettledLoop:
 					break RoundIsSettledLoop
 				}
-				PokerPubSub.Pub(roomUserTopic, ErrorMsgEvent{Message: ""})
+				PokerPubSub.Pub(roomUserTopic, NewErrorMsgEvent(""))
 				PokerPubSub.Pub(roomTopic, RedrawSeatsEvent{})
 				break GetPlayerEventLoop
 			} // End of repeat until we get an event from the player we're interested in
@@ -1087,7 +1087,7 @@ RoundIsSettledLoop:
 RoundIsSettled:
 
 	setAutoAction(g, roomTopic, "")
-	PokerPubSub.Pub(roomTopic, ErrorMsgEvent{Message: ""})
+	PokerPubSub.Pub(roomTopic, NewErrorMsgEvent(""))
 	g.newLogEvent(fmt.Sprintf("--"))
 	setWaitTurn(g, -1)
 
@@ -1617,19 +1617,19 @@ func (g *PokerGame) Deal(userID database.UserID) {
 	roomUserTopic := g.roomID.UserTopic(userID)
 	eligiblePlayers := g.getEligibles()
 	if !g.IsSeated(userID) {
-		PokerPubSub.Pub(roomUserTopic, ErrorMsgEvent{Message: "you need to be seated"})
+		PokerPubSub.Pub(roomUserTopic, NewErrorMsgEvent("you need to be seated"))
 		return
 	}
 	if len(eligiblePlayers) < 2 {
-		PokerPubSub.Pub(roomUserTopic, ErrorMsgEvent{Message: "need at least 2 players"})
+		PokerPubSub.Pub(roomUserTopic, NewErrorMsgEvent("need at least 2 players"))
 		return
 	}
 	if !g.isGameStarted.CompareAndSwap(false, true) {
-		PokerPubSub.Pub(roomUserTopic, ErrorMsgEvent{Message: "game already ongoing"})
+		PokerPubSub.Pub(roomUserTopic, NewErrorMsgEvent("game already ongoing"))
 		return
 	}
 
-	PokerPubSub.Pub(roomUserTopic, ErrorMsgEvent{Message: ""})
+	PokerPubSub.Pub(roomUserTopic, NewErrorMsgEvent(""))
 	PokerPubSub.Pub(roomTopic, ResetCardsEvent{})
 	time.Sleep(animationTime)