dkforest

commit f07485c8332697d50e002cb14af90efc95fe57be
parent f8175f706efe08a965691f276bf33c590df71ee4
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Tue, 12 Dec 2023 16:56:30 -0500

cleanup

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

1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -97,6 +97,7 @@ type Ongoing struct {
 }
 
 type PokerStandingPlayer struct {
+	UserID       database.UserID
 	Username     string
 	Cash         int
 	LastActionTS time.Time
@@ -133,9 +134,8 @@ func (p *PokerPlayer) isAllIn() bool {
 }
 
 func (p *PokerPlayer) doBet(db *database.DkfDB, roomID string, bet int) {
-	user, _ := db.GetUserByUsername(database.Username(p.Username))
 	pokerTable, _ := db.GetPokerTableBySlug(roomID)
-	account, _ := db.GetPokerTableAccount(user.ID, pokerTable.ID)
+	account, _ := db.GetPokerTableAccount(p.UserID, pokerTable.ID)
 	account.Amount -= int64(bet)
 	account.AmountBet += int64(bet)
 	account.DoSave(db)
@@ -413,7 +413,7 @@ func (g *PokerGame) SitPlayer(authUser *database.User, pos int, chips int64) err
 	if g.Players[pos] != nil {
 		return errors.New("seat already taken")
 	}
-	g.Players[pos] = &PokerStandingPlayer{Username: authUser.Username.String(), Cash: int(chips), LastActionTS: time.Now()}
+	g.Players[pos] = &PokerStandingPlayer{UserID: authUser.ID, Username: authUser.Username.String(), Cash: int(chips), LastActionTS: time.Now()}
 	return nil
 }
 
@@ -898,8 +898,7 @@ END:
 		tx := db.Begin()
 		for _, el := range playersGain {
 			newLogEvent(g, roomLogsTopic, fmt.Sprintf("Winner #%d: %s %s -> %d", el.Group, el.Player.Username, el.HandStr, el.Gain))
-			user, _ := tx.GetUserByUsername(database.Username(el.Player.Username))
-			account, _ := tx.GetPokerTableAccount(user.ID, pokerTable.ID)
+			account, _ := tx.GetPokerTableAccount(el.Player.UserID, pokerTable.ID)
 			account.Amount += int64(el.Gain)
 			account.AmountBet = 0
 			account.DoSave(tx)
@@ -907,8 +906,7 @@ END:
 			el.Player.Cash += el.Gain
 		}
 		for _, p := range g.Ongoing.Players {
-			user, _ := tx.GetUserByUsername(database.Username(p.Username))
-			account, _ := tx.GetPokerTableAccount(user.ID, pokerTable.ID)
+			account, _ := tx.GetPokerTableAccount(p.UserID, pokerTable.ID)
 			account.AmountBet = 0
 			account.DoSave(tx)
 		}
@@ -918,8 +916,7 @@ END:
 		// No winners, refund bets
 		tx := db.Begin()
 		for _, p := range g.Ongoing.Players {
-			user, _ := tx.GetUserByUsername(database.Username(p.Username))
-			account, _ := tx.GetPokerTableAccount(user.ID, pokerTable.ID)
+			account, _ := tx.GetPokerTableAccount(p.UserID, pokerTable.ID)
 			account.Amount += account.AmountBet
 			account.AmountBet = 0
 			account.DoSave(tx)