dkforest

commit cc16d35f8d7556aca8ecb065975da4b6bd29780c
parent 72aa7980f38dd3ec061b6fc7257ef92fbb3c8cc0
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Tue, 19 Dec 2023 01:50:57 -0500

cleanup

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

1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -492,13 +492,10 @@ func (g *PokerGame) Sit(userID database.UserID, username database.Username, pos 
 
 func (g *PokerGame) UnSitPlayer(userID database.UserID) {
 	g.Players.With(func(gPlayers *[]*seatedPlayer) {
-		p := getPlayer(*gPlayers, userID)
-		if p == nil {
-			return
+		if p := getPlayer(*gPlayers, userID); p != nil {
+			g.unSitPlayer1(gPlayers, p)
+			g.newLogEvent(fmt.Sprintf("%s un-sit", p.username.String()))
 		}
-		g.unSitPlayer1(gPlayers, p)
-		PokerPubSub.Pub(g.roomID.Topic(), PokerSeatLeftEvent{})
-		g.newLogEvent(fmt.Sprintf("%s un-sit", p.username.String()))
 	})
 }
 
@@ -519,6 +516,7 @@ func (g *PokerGame) unSitPlayer1(gPlayers *[]*seatedPlayer, seatedPlayer *seated
 		}
 	}
 	(*gPlayers)[seatedPlayer.seatIdx] = nil
+	PokerPubSub.Pub(g.roomID.Topic(), PokerSeatLeftEvent{})
 }
 
 func generateDeck() []string {
@@ -1222,12 +1220,10 @@ func applyBlindBet(g *PokerGame, playerIdx int, bet database.PokerChip, name str
 func autoUnsitInactivePlayers(g *PokerGame) {
 	ongoing := g.Ongoing
 	pokerTableMinBet := g.PokerTableMinBet
-	roomTopic := g.roomID.Topic()
 	g.Players.With(func(gPlayers *[]*seatedPlayer) {
 		for _, p := range *gPlayers {
 			if playerShouldBeBooted(p, ongoing, pokerTableMinBet) {
 				g.unSitPlayer1(gPlayers, p)
-				PokerPubSub.Pub(roomTopic, PokerSeatLeftEvent{})
 				g.newLogEvent(fmt.Sprintf("%s auto un-sit", p.username))
 			}
 		}