dkforest

commit 692d9327f0f12a32238a2d6abd8e75fafaac8a49
parent 9a4c6ad590a9ea0eabdcfbf7b6702da583096ab4
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Tue,  5 Dec 2023 21:08:58 -0500

cleanup

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

1 file changed, 22 insertions(+), 17 deletions(-)
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -158,6 +158,27 @@ func (g *PokerGame) SitPlayer(authUser *database.User, pos int) error {
 	return nil
 }
 
+func NewOngoing(g *PokerGame) *Ongoing {
+	deck := []string{
+		"A♠", "2♠", "3♠", "4♠", "5♠", "6♠", "7♠", "8♠", "9♠", "10♠", "J♠", "Q♠", "K♠",
+		"A♥", "2♥", "3♥", "4♥", "5♥", "6♥", "7♥", "8♥", "9♥", "10♥", "J♥", "Q♥", "K♥",
+		"A♣", "2♣", "3♣", "4♣", "5♣", "6♣", "7♣", "8♣", "9♣", "10♣", "J♣", "Q♣", "K♣",
+		"A♦", "2♦", "3♦", "4♦", "5♦", "6♦", "7♦", "8♦", "9♦", "10♦", "J♦", "Q♦", "K♦",
+	}
+	utils.Shuffle(deck)
+
+	players := make([]*PokerPlayer, NbPlayers)
+	for idx, p := range g.Players {
+		var player *PokerPlayer
+		if p != nil {
+			player = &PokerPlayer{Username: p.Username, Cash: p.Cash}
+		}
+		players[idx] = player
+	}
+
+	return &Ongoing{Deck: deck, Players: players, WaitTurnEvent: PokerWaitTurnEvent{Idx: -1}}
+}
+
 func (g *PokerGame) Deal(roomID string) {
 	roomTopic := "room_" + roomID
 
@@ -175,24 +196,8 @@ func (g *PokerGame) Deal(roomID string) {
 		fmt.Println("need at least 2 players")
 		return
 	}
-	deck := []string{
-		"A♠", "2♠", "3♠", "4♠", "5♠", "6♠", "7♠", "8♠", "9♠", "10♠", "J♠", "Q♠", "K♠",
-		"A♥", "2♥", "3♥", "4♥", "5♥", "6♥", "7♥", "8♥", "9♥", "10♥", "J♥", "Q♥", "K♥",
-		"A♣", "2♣", "3♣", "4♣", "5♣", "6♣", "7♣", "8♣", "9♣", "10♣", "J♣", "Q♣", "K♣",
-		"A♦", "2♦", "3♦", "4♦", "5♦", "6♦", "7♦", "8♦", "9♦", "10♦", "J♦", "Q♦", "K♦",
-	}
-	utils.Shuffle(deck)
-
-	players := make([]*PokerPlayer, NbPlayers)
-	for idx := range g.Players {
-		var player *PokerPlayer
-		if g.Players[idx] != nil {
-			player = &PokerPlayer{Username: g.Players[idx].Username, Cash: g.Players[idx].Cash}
-		}
-		players[idx] = player
-	}
 
-	g.Ongoing = &Ongoing{Deck: deck, Players: players, WaitTurnEvent: PokerWaitTurnEvent{Idx: -1}}
+	g.Ongoing = NewOngoing(g)
 
 	go func() {
 		waitPlayersActionFn := func() bool {