dkforest

commit 85891383d808bd656806d59d2f9268156efdfc16
parent c5020f5f5fd85c6ed115bf7947cc5e2b7057900d
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 17 Dec 2023 02:24:07 -0500

cleanup

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

1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -156,11 +156,15 @@ func (p *PokerPlayer) refundBet(db *database.DkfDB, pokerTableID int64) {
 	p.Bet = 0
 }
 
-func (p *PokerPlayer) doBet(db *database.DkfDB, bet database.PokerChip, pokerTableID int64, roomTopic string) {
+func (p *PokerPlayer) doBet(db *database.DkfDB, pokerTableID int64, bet database.PokerChip) {
 	_ = db.PokerTableAccountBet(p.UserID, pokerTableID, bet)
-	p.RoundTotalBet += bet
 	p.Bet += bet
 	p.Cash -= bet
+}
+
+func (p *PokerPlayer) doBetAndNotif(db *database.DkfDB, pokerTableID int64, bet database.PokerChip, roomTopic string) {
+	p.doBet(db, pokerTableID, bet)
+	p.RoundTotalBet += bet
 	PokerPubSub.Pub(roomTopic, PlayerBetEvent{PlayerSeatIdx: p.SeatIdx, Player: p.Username, Bet: bet, TotalBet: p.GetBet(), Cash: p.GetCash()})
 }
 
@@ -638,7 +642,7 @@ RoundIsSettledLoop:
 				if bet == 0 {
 					newLogEvent(g, roomLogsTopic, fmt.Sprintf("%s check", pUsername))
 				} else {
-					p.doBet(db, bet, g.PokerTableID, roomTopic)
+					p.doBetAndNotif(db, g.PokerTableID, bet, roomTopic)
 					logMsg := fmt.Sprintf("%s call (%d)", pUsername, bet)
 					if p.isAllIn() {
 						logMsg += " (all-in)"
@@ -655,7 +659,7 @@ RoundIsSettledLoop:
 					lastRaisePlayerIdx = playerToPlayIdx
 				}
 				minBet = utils.MaxInt(p.GetBet()+bet, minBet)
-				p.doBet(db, bet, g.PokerTableID, roomTopic)
+				p.doBetAndNotif(db, g.PokerTableID, bet, roomTopic)
 				logMsg := fmt.Sprintf("%s all-in (%d)", pUsername, bet)
 				if p.isAllIn() {
 					newlyAllInPlayers = append(newlyAllInPlayers, p)
@@ -687,7 +691,7 @@ RoundIsSettledLoop:
 					lastRaisePlayerIdx = playerToPlayIdx
 				}
 				minBet = utils.MaxInt(p.GetBet()+bet, minBet)
-				p.doBet(db, bet, g.PokerTableID, roomTopic)
+				p.doBetAndNotif(db, g.PokerTableID, bet, roomTopic)
 				logMsg := fmt.Sprintf("%s bet %d", pUsername, bet)
 				if p.isAllIn() {
 					logMsg += " (all-in)"
@@ -1079,7 +1083,7 @@ func applyBigBlindBet(db *database.DkfDB, g *PokerGame, bigBlindBet database.Pok
 
 func applyBlindBet(db *database.DkfDB, g *PokerGame, playerIdx int, bet database.PokerChip, roomID RoomID, name string) {
 	p := g.Ongoing.Players[playerIdx]
-	p.doBet(db, bet, g.PokerTableID, roomID.Topic())
+	p.doBetAndNotif(db, g.PokerTableID, bet, roomID.Topic())
 	newLogEvent(g, roomID.LogsTopic(), fmt.Sprintf("%s %s %d", p.Username, name, bet))
 }