dkforest

commit 317c872a63bca8e96b5b6c2ae66fb6196cbd047b
parent 1803123ebf8454d1b92b5202d580d61cf830c92e
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Fri, 15 Dec 2023 20:46:53 -0500

cleanup

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

1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -129,7 +129,7 @@ func (p *PokerPlayer) isAllIn() bool {
 	return p.Cash == 0
 }
 
-func (p *PokerPlayer) doBet(db *database.DkfDB, bet database.PokerChip, pokerTableID int64) {
+func (p *PokerPlayer) doBet(db *database.DkfDB, bet database.PokerChip, pokerTableID int64, roomTopic string) {
 	account, _ := db.GetPokerTableAccount(p.UserID, pokerTableID)
 	account.Amount -= bet
 	account.AmountBet += bet
@@ -137,6 +137,7 @@ func (p *PokerPlayer) doBet(db *database.DkfDB, bet database.PokerChip, pokerTab
 	p.RoundTotalBet += bet
 	p.Bet += bet
 	p.Cash -= bet
+	PokerPubSub.Pub(roomTopic, PlayerBetEvent{PlayerSeatIdx: p.SeatIdx, Player: p.Username, Bet: bet, TotalBet: p.Bet, Cash: p.Cash})
 }
 
 type PlayerCard struct {
@@ -601,8 +602,7 @@ RoundIsSettledLoop:
 					if bet == 0 {
 						newLogEvent(g, roomLogsTopic, fmt.Sprintf("%s check", pUsername))
 					} else {
-						p.doBet(db, bet, g.PokerTableID)
-						PokerPubSub.Pub(roomTopic, PlayerBetEvent{PlayerSeatIdx: p.SeatIdx, Player: pUsername, Bet: bet, TotalBet: p.Bet, Cash: p.Cash})
+						p.doBet(db, bet, g.PokerTableID, roomTopic)
 						logMsg := fmt.Sprintf("%s call (%d)", pUsername, bet)
 						if p.isAllIn() {
 							logMsg += " (all-in)"
@@ -617,8 +617,7 @@ RoundIsSettledLoop:
 						lastRaisePlayerIdx = playerToPlayIdx
 					}
 					minBet = utils.MaxInt(p.Bet+bet, minBet)
-					p.doBet(db, bet, g.PokerTableID)
-					PokerPubSub.Pub(roomTopic, PlayerBetEvent{PlayerSeatIdx: p.SeatIdx, Player: pUsername, Bet: bet, TotalBet: p.Bet, Cash: p.Cash})
+					p.doBet(db, bet, g.PokerTableID, roomTopic)
 					logMsg := fmt.Sprintf("%s all-in (%d)", pUsername, bet)
 					if p.isAllIn() {
 						newlyAllInPlayers = append(newlyAllInPlayers, p)
@@ -648,8 +647,7 @@ RoundIsSettledLoop:
 						lastRaisePlayerIdx = playerToPlayIdx
 					}
 					minBet = utils.MaxInt(p.Bet+bet, minBet)
-					p.doBet(db, bet, g.PokerTableID)
-					PokerPubSub.Pub(roomTopic, PlayerBetEvent{PlayerSeatIdx: p.SeatIdx, Player: pUsername, Bet: bet, TotalBet: p.Bet, Cash: p.Cash})
+					p.doBet(db, bet, g.PokerTableID, roomTopic)
 					logMsg := fmt.Sprintf("%s bet %d", pUsername, bet)
 					if p.isAllIn() {
 						logMsg += " (all-in)"
@@ -838,8 +836,7 @@ func dealerThread(db *database.DkfDB, g *PokerGame, roomID RoomID) {
 	p := g.Ongoing.Players[g.smallBlindIdx]
 	pUsername := p.Username
 	bet := bigBlindBet / 2
-	p.doBet(db, bet, g.PokerTableID)
-	PokerPubSub.Pub(roomTopic, PlayerBetEvent{PlayerSeatIdx: p.SeatIdx, Player: pUsername, Bet: bet, TotalBet: p.Bet, Cash: p.Cash})
+	p.doBet(db, bet, g.PokerTableID, roomTopic)
 	newLogEvent(g, roomLogsTopic, fmt.Sprintf("%s small blind %d", pUsername, bet))
 
 	time.Sleep(time.Second)
@@ -847,8 +844,7 @@ func dealerThread(db *database.DkfDB, g *PokerGame, roomID RoomID) {
 	p = g.Ongoing.Players[g.bigBlindIdx]
 	pUsername = p.Username
 	bet = bigBlindBet
-	p.doBet(db, bet, g.PokerTableID)
-	PokerPubSub.Pub(roomTopic, PlayerBetEvent{PlayerSeatIdx: p.SeatIdx, Player: pUsername, Bet: bet, TotalBet: p.Bet, Cash: p.Cash})
+	p.doBet(db, bet, g.PokerTableID, roomTopic)
 	newLogEvent(g, roomLogsTopic, fmt.Sprintf("%s big blind %d", pUsername, bet))
 
 	time.Sleep(time.Second)