dkforest

commit 78495befd238a8b28bbcc301b53db9cfa047dfeb
parent b460d1ac99af29f46dce95c8afbbf2eedb24c7f6
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 17 Dec 2023 05:52:08 -0500

cleanup

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

1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -407,6 +407,7 @@ func (g *PokerGame) UnSitPlayer(username database.Username) error {
 
 func (g *PokerGame) UnSitPlayer1(seatedPlayer *SeatedPlayer) error {
 	db := g.DB
+	pokerTableID := g.PokerTableID
 	roomTopic := g.RoomID.Topic()
 	seatedPlayerUsername := seatedPlayer.Username
 
@@ -414,7 +415,7 @@ func (g *PokerGame) UnSitPlayer1(seatedPlayer *SeatedPlayer) error {
 	if err != nil {
 		return err
 	}
-	account, err := db.GetPokerTableAccount(user.ID, g.PokerTableID)
+	account, err := db.GetPokerTableAccount(user.ID, pokerTableID)
 	if err != nil {
 		return err
 	}
@@ -551,6 +552,7 @@ type AutoAction struct {
 // Return either or not the game ended because only 1 player left playing (or none)
 func execBettingRound(g *PokerGame, skip int, minBet database.PokerChip) bool {
 	db := g.DB
+	pokerTableID := g.PokerTableID
 	roomID := g.RoomID
 	roomTopic := roomID.Topic()
 	dealerIdx := g.Ongoing.getPlayerIdxBySeatIdx(int(g.DealerSeatIdx.Load()))
@@ -654,7 +656,7 @@ RoundIsSettledLoop:
 				if bet == 0 {
 					g.newLogEvent(fmt.Sprintf("%s check", pUsername))
 				} else {
-					p.doBetAndNotif(db, g.PokerTableID, bet, roomTopic)
+					p.doBetAndNotif(db, pokerTableID, bet, roomTopic)
 					logMsg := fmt.Sprintf("%s call (%d)", pUsername, bet)
 					if p.isAllIn() {
 						logMsg += " (all-in)"
@@ -671,7 +673,7 @@ RoundIsSettledLoop:
 					lastRaisePlayerIdx = playerToPlayIdx
 				}
 				minBet = utils.MaxInt(p.GetBet()+bet, minBet)
-				p.doBetAndNotif(db, g.PokerTableID, bet, roomTopic)
+				p.doBetAndNotif(db, pokerTableID, bet, roomTopic)
 				logMsg := fmt.Sprintf("%s all-in (%d)", pUsername, bet)
 				if p.isAllIn() {
 					newlyAllInPlayers = append(newlyAllInPlayers, p)
@@ -703,7 +705,7 @@ RoundIsSettledLoop:
 					lastRaisePlayerIdx = playerToPlayIdx
 				}
 				minBet = utils.MaxInt(p.GetBet()+bet, minBet)
-				p.doBetAndNotif(db, g.PokerTableID, bet, roomTopic)
+				p.doBetAndNotif(db, pokerTableID, bet, roomTopic)
 				logMsg := fmt.Sprintf("%s bet %d", pUsername, bet)
 				if p.isAllIn() {
 					logMsg += " (all-in)"
@@ -859,7 +861,7 @@ RoundIsSettled:
 		firstPlayer := newArray[0]
 		secondPlayer := newArray[1]
 		diff := firstPlayer.GetBet() - secondPlayer.GetBet()
-		firstPlayer.refundPartialBet(db, g.PokerTableID, diff)
+		firstPlayer.refundPartialBet(db, pokerTableID, diff)
 	}
 
 	// Transfer players bets into the main pot
@@ -1134,6 +1136,7 @@ func autoUnsitInactivePlayers(g *PokerGame) {
 }
 
 func applyGains(g *PokerGame, playersGain []PlayerGain, mainPot, rake database.PokerChip) (winnersStr, winnerHand string) {
+	pokerTableID := g.PokerTableID
 	nbPlayersGain := len(playersGain)
 	tx := g.DB.Begin()
 	if nbPlayersGain >= 1 {
@@ -1147,7 +1150,7 @@ func applyGains(g *PokerGame, playersGain []PlayerGain, mainPot, rake database.P
 		for _, el := range playersGain {
 			g.newLogEvent(fmt.Sprintf("Winner #%d: %s %s -> %d", el.Group, el.Player.Username, el.HandStr, el.Gain))
 			winnersStr += el.Player.Username.String() + " "
-			el.Player.gain(tx, g.PokerTableID, el.Gain)
+			el.Player.gain(tx, pokerTableID, el.Gain)
 		}
 		for _, op := range g.Ongoing.Players {
 			op.resetBet()
@@ -1156,7 +1159,7 @@ func applyGains(g *PokerGame, playersGain []PlayerGain, mainPot, rake database.P
 	} else if nbPlayersGain == 0 {
 		// No winners, refund bets
 		for _, op := range g.Ongoing.Players {
-			op.refundBet(tx, g.PokerTableID)
+			op.refundBet(tx, pokerTableID)
 		}
 	}
 	tx.Commit()