dkforest

commit aab78b4f5e2cf6ce9ac661df13cf65725d7fbca9
parent c7e1482c2ae351d7d1835e312d605d4263782693
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 17 Dec 2023 04:30:17 -0500

cleanup

Diffstat:
M
pkg/database/tablePokerTables.go
 | 
8
+-------
M
pkg/web/handlers/poker/poker.go
 | 
5
++---

2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/pkg/database/tablePokerTables.go b/pkg/database/tablePokerTables.go
@@ -102,12 +102,6 @@ func (d *DkfDB) PokerTableAccountBet(userID UserID, pokerTableID int64, bet Poke
 	return
 }
 
-func (d *DkfDB) PokerTableAccountRefundBet(userID UserID, pokerTableID int64) (err error) {
-	err = d.db.Exec(`UPDATE poker_table_accounts SET amount = amount + amount_bet, amount_bet = 0 WHERE user_id = ? AND poker_table_id = ?`,
-		userID, pokerTableID).Error
-	return
-}
-
 func (d *DkfDB) PokerTableAccountRefundPartialBet(userID UserID, pokerTableID int64, diff PokerChip) (err error) {
 	err = d.db.Exec(`UPDATE poker_table_accounts SET amount = amount + ?, amount_bet = amount_bet - ? WHERE user_id = ? AND poker_table_id = ?`,
 		diff, diff, userID, pokerTableID).Error
@@ -115,7 +109,7 @@ func (d *DkfDB) PokerTableAccountRefundPartialBet(userID UserID, pokerTableID in
 }
 
 func (d *DkfDB) PokerTableAccountGain(userID UserID, pokerTableID int64, gain PokerChip) (err error) {
-	err = d.db.Exec(`UPDATE poker_table_accounts SET amount = amount + ? WHERE user_id = ? AND poker_table_id = ?`,
+	err = d.db.Exec(`UPDATE poker_table_accounts SET amount = amount + ?, amount_bet = 0 WHERE user_id = ? AND poker_table_id = ?`,
 		gain, userID, pokerTableID).Error
 	return
 }
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -148,6 +148,7 @@ func (p *PokerPlayer) doBet(db *database.DkfDB, pokerTableID int64, bet database
 func (p *PokerPlayer) gain(db *database.DkfDB, pokerTableID int64, gain database.PokerChip) {
 	_ = db.PokerTableAccountGain(p.UserID, pokerTableID, gain)
 	p.Cash += gain
+	p.Bet = 0
 }
 
 func (p *PokerPlayer) resetBet(db *database.DkfDB, pokerTableID int64) {
@@ -156,9 +157,7 @@ func (p *PokerPlayer) resetBet(db *database.DkfDB, pokerTableID int64) {
 }
 
 func (p *PokerPlayer) refundBet(db *database.DkfDB, pokerTableID int64) {
-	_ = db.PokerTableAccountRefundBet(p.UserID, pokerTableID)
-	p.Cash += p.GetBet()
-	p.Bet = 0
+	p.gain(db, pokerTableID, p.GetBet())
 }
 
 func (p *PokerPlayer) doBetAndNotif(db *database.DkfDB, pokerTableID int64, bet database.PokerChip, roomTopic string) {