dkforest

commit b460d1ac99af29f46dce95c8afbbf2eedb24c7f6
parent 725d543f5b93f23f0392fa538a184cd8aa597707
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 17 Dec 2023 05:49:27 -0500

cleanup

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

1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -406,18 +406,19 @@ func (g *PokerGame) UnSitPlayer(username database.Username) error {
 }
 
 func (g *PokerGame) UnSitPlayer1(seatedPlayer *SeatedPlayer) error {
+	db := g.DB
 	roomTopic := g.RoomID.Topic()
 	seatedPlayerUsername := seatedPlayer.Username
 
-	user, err := g.DB.GetUserByUsername(seatedPlayerUsername)
+	user, err := db.GetUserByUsername(seatedPlayerUsername)
 	if err != nil {
 		return err
 	}
-	account, err := g.DB.GetPokerTableAccount(user.ID, g.PokerTableID)
+	account, err := db.GetPokerTableAccount(user.ID, g.PokerTableID)
 	if err != nil {
 		return err
 	}
-	tx := g.DB.Begin()
+	tx := db.Begin()
 	incrUserChips(&user, g.PokerTableIsTest, account.Amount, false)
 	account.Amount = 0
 	account.DoSave(tx)
@@ -549,6 +550,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
 	roomID := g.RoomID
 	roomTopic := roomID.Topic()
 	dealerIdx := g.Ongoing.getPlayerIdxBySeatIdx(int(g.DealerSeatIdx.Load()))
@@ -652,7 +654,7 @@ RoundIsSettledLoop:
 				if bet == 0 {
 					g.newLogEvent(fmt.Sprintf("%s check", pUsername))
 				} else {
-					p.doBetAndNotif(g.DB, g.PokerTableID, bet, roomTopic)
+					p.doBetAndNotif(db, g.PokerTableID, bet, roomTopic)
 					logMsg := fmt.Sprintf("%s call (%d)", pUsername, bet)
 					if p.isAllIn() {
 						logMsg += " (all-in)"
@@ -669,7 +671,7 @@ RoundIsSettledLoop:
 					lastRaisePlayerIdx = playerToPlayIdx
 				}
 				minBet = utils.MaxInt(p.GetBet()+bet, minBet)
-				p.doBetAndNotif(g.DB, g.PokerTableID, bet, roomTopic)
+				p.doBetAndNotif(db, g.PokerTableID, bet, roomTopic)
 				logMsg := fmt.Sprintf("%s all-in (%d)", pUsername, bet)
 				if p.isAllIn() {
 					newlyAllInPlayers = append(newlyAllInPlayers, p)
@@ -701,7 +703,7 @@ RoundIsSettledLoop:
 					lastRaisePlayerIdx = playerToPlayIdx
 				}
 				minBet = utils.MaxInt(p.GetBet()+bet, minBet)
-				p.doBetAndNotif(g.DB, g.PokerTableID, bet, roomTopic)
+				p.doBetAndNotif(db, g.PokerTableID, bet, roomTopic)
 				logMsg := fmt.Sprintf("%s bet %d", pUsername, bet)
 				if p.isAllIn() {
 					logMsg += " (all-in)"
@@ -857,7 +859,7 @@ RoundIsSettled:
 		firstPlayer := newArray[0]
 		secondPlayer := newArray[1]
 		diff := firstPlayer.GetBet() - secondPlayer.GetBet()
-		firstPlayer.refundPartialBet(g.DB, g.PokerTableID, diff)
+		firstPlayer.refundPartialBet(db, g.PokerTableID, diff)
 	}
 
 	// Transfer players bets into the main pot