dkforest

commit ed82386e955355e3b951de4ea91b0a6b3b69d6a9
parent 988b558671778cd34ee5474ea112ca0096b8fc1c
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 17 Dec 2023 05:18:42 -0500

cleanup

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

1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -390,23 +390,23 @@ func (g *PokerGame) incrDealerIdx() {
 	g.bigBlindIdx = (dealerIdx + startIDx + 1) % nbPlayers
 }
 
-func (g *PokerGame) UnSitPlayer(roomID RoomID, authUser *database.User) error {
+func (g *PokerGame) UnSitPlayer(username database.Username) error {
 	if g.Ongoing != nil {
-		if p := g.Ongoing.GetPlayer(authUser.Username); p != nil {
+		if p := g.Ongoing.GetPlayer(username); p != nil {
 			p.Unsit.Store(true)
 		}
 	}
 
 	g.PlayersMtx.Lock()
 	defer g.PlayersMtx.Unlock()
-	if p := g.getPlayer(authUser.Username); p != nil {
-		return g.UnSitPlayer1(roomID, p)
+	if p := g.getPlayer(username); p != nil {
+		return g.UnSitPlayer1(p)
 	}
 	return errors.New("player is not sit")
 }
 
-func (g *PokerGame) UnSitPlayer1(roomID RoomID, seatedPlayer *SeatedPlayer) error {
-	roomTopic := roomID.Topic()
+func (g *PokerGame) UnSitPlayer1(seatedPlayer *SeatedPlayer) error {
+	roomTopic := g.RoomID.Topic()
 	seatedPlayerUsername := seatedPlayer.Username
 
 	user, err := g.DB.GetUserByUsername(seatedPlayerUsername)
@@ -1072,7 +1072,7 @@ END:
 	winners := g.Ongoing.computeWinners()
 	mainPot := g.Ongoing.getMainPot()
 	playersGain, rake := processPot(winners, mainPot, g.PokerTableMinBet, collectRake)
-	winnersStr, winnerHand := applyGains(g, playersGain, mainPot, rake, roomID)
+	winnersStr, winnerHand := applyGains(g, playersGain, mainPot, rake)
 
 	g.Ongoing.setMainPot(0)
 
@@ -1083,7 +1083,7 @@ END:
 	time.Sleep(MinTimeAfterGame * time.Second)
 
 	// Auto unsit inactive players
-	autoUnsitInactivePlayers(g, roomID)
+	autoUnsitInactivePlayers(g)
 
 	g.IsGameStarted.Store(false)
 }
@@ -1102,8 +1102,8 @@ func applyBlindBet(g *PokerGame, playerIdx int, bet database.PokerChip, roomID R
 	g.newLogEvent(fmt.Sprintf("%s %s %d", p.Username, name, bet))
 }
 
-func autoUnsitInactivePlayers(g *PokerGame, roomID RoomID) {
-	roomTopic := roomID.Topic()
+func autoUnsitInactivePlayers(g *PokerGame) {
+	roomTopic := g.RoomID.Topic()
 	g.PlayersMtx.Lock()
 	defer g.PlayersMtx.Unlock()
 	for _, p := range g.Players {
@@ -1119,7 +1119,7 @@ func autoUnsitInactivePlayers(g *PokerGame, roomID RoomID) {
 					(op == nil && !p.isEligible(g.PokerTableMinBet))
 			}
 			if playerShallBeBooted {
-				if err := g.UnSitPlayer1(roomID, p); err == nil {
+				if err := g.UnSitPlayer1(p); err == nil {
 					PokerPubSub.Pub(roomTopic, PokerSeatLeftEvent{})
 					g.newLogEvent(fmt.Sprintf("%s auto un-sit", p.Username))
 				} else {
@@ -1130,7 +1130,7 @@ func autoUnsitInactivePlayers(g *PokerGame, roomID RoomID) {
 	}
 }
 
-func applyGains(g *PokerGame, playersGain []PlayerGain, mainPot, rake database.PokerChip, roomID RoomID) (winnersStr, winnerHand string) {
+func applyGains(g *PokerGame, playersGain []PlayerGain, mainPot, rake database.PokerChip) (winnersStr, winnerHand string) {
 	nbPlayersGain := len(playersGain)
 	tx := g.DB.Begin()
 	if nbPlayersGain >= 1 {
@@ -1476,7 +1476,7 @@ func PokerUnSitHandler(c echo.Context) error {
 		return c.NoContent(http.StatusNotFound)
 	}
 	if c.Request().Method == http.MethodPost {
-		if err := g.UnSitPlayer(roomID, authUser); err == nil {
+		if err := g.UnSitPlayer(authUser.Username); err == nil {
 			PokerPubSub.Pub(roomTopic, PokerSeatLeftEvent{})
 			g.newLogEvent(fmt.Sprintf("%s un-sit", authUser.Username.String()))
 		} else {