dkforest

commit 008fab0a4e5831cf79dcf434e3c70c2b430c5e8b
parent bf76ff1eea95319e5c8614e06f167373d710e4f5
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon,  4 Dec 2023 03:13:35 -0500

cleanup

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

1 file changed, 37 insertions(+), 105 deletions(-)
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -812,116 +812,47 @@ func PokerHandler(c echo.Context) error {
 			//{Top: 150, Left: 550},
 		}
 
-		var card string
-		idx := 0
-
-		// Seat 1
-		select {
-		case <-time.After(time.Second):
-		case <-quit:
-			return
-		}
-		idx++
-		card, deck = deck[0], deck[1:]
-		PokerPubSub.Pub(myTopic, PokerEvent{
-			ID:    "card" + strconv.Itoa(idx),
-			Name:  "",
-			Idx:   idx,
-			Top:   seats[0].Top,
-			Left:  seats[0].Left,
-			Angle: seats[0].Angle,
-			Burn:  true,
-		})
-
-		// Seat 2
-		select {
-		case <-time.After(time.Second):
-		case <-quit:
-			return
+		type Data struct {
+			Top    int
+			Left   int
+			Angle  string
+			Reveal bool
 		}
-		idx++
-		card, deck = deck[0], deck[1:]
-		PokerPubSub.Pub(myTopic, PokerEvent{
-			ID:    "card" + strconv.Itoa(idx),
-			Name:  "",
-			Idx:   idx,
-			Top:   seats[1].Top,
-			Left:  seats[1].Left,
-			Angle: seats[1].Angle,
-			Burn:  true,
-		})
 
-		// Seat 3
-		select {
-		case <-time.After(time.Second):
-		case <-quit:
-			return
-		}
-		idx++
-		card, deck = deck[0], deck[1:]
-		PokerPubSub.Pub(myTopic, PokerEvent{
-			ID:    "card" + strconv.Itoa(idx),
-			Name:  "",
-			Idx:   idx,
-			Top:   seats[2].Top,
-			Left:  seats[2].Left,
-			Angle: seats[2].Angle,
-			Burn:  true,
-		})
-
-		// Seat 1
-		select {
-		case <-time.After(time.Second):
-		case <-quit:
-			return
+		data := []Data{
+			{seats[0].Top, seats[0].Left, seats[0].Angle, false},
+			{seats[1].Top, seats[1].Left, seats[1].Angle, false},
+			{seats[2].Top, seats[2].Left, seats[2].Angle, false},
+			{seats[0].Top + 5, seats[0].Left, seats[0].Angle, false},
+			{seats[1].Top + 5, seats[1].Left, seats[1].Angle, false},
+			{seats[2].Top + 5, seats[2].Left, seats[2].Angle, false},
 		}
-		idx++
-		card, deck = deck[0], deck[1:]
-		PokerPubSub.Pub(myTopic, PokerEvent{
-			ID:    "card" + strconv.Itoa(idx),
-			Name:  "",
-			Idx:   idx,
-			Top:   seats[0].Top + 5,
-			Left:  seats[0].Left,
-			Angle: seats[0].Angle,
-			Burn:  true,
-		})
 
-		// Seat 2
-		select {
-		case <-time.After(time.Second):
-		case <-quit:
-			return
-		}
-		idx++
-		card, deck = deck[0], deck[1:]
-		PokerPubSub.Pub(myTopic, PokerEvent{
-			ID:    "card" + strconv.Itoa(idx),
-			Name:  "",
-			Idx:   idx,
-			Top:   seats[1].Top + 5,
-			Left:  seats[1].Left,
-			Angle: seats[1].Angle,
-			Burn:  true,
-		})
+		var card string
+		idx := 0
 
-		// Seat 3
-		select {
-		case <-time.After(time.Second):
-		case <-quit:
-			return
+		for _, d := range data {
+			select {
+			case <-time.After(time.Second):
+			case <-quit:
+				return
+			}
+			idx++
+			card, deck = deck[0], deck[1:]
+			name := ""
+			if d.Reveal {
+				name = card
+			}
+			PokerPubSub.Pub(myTopic, PokerEvent{
+				ID:    "card" + strconv.Itoa(idx),
+				Name:  name,
+				Idx:   idx,
+				Top:   d.Top,
+				Left:  d.Left,
+				Angle: d.Angle,
+				Burn:  !d.Reveal,
+			})
 		}
-		idx++
-		card, deck = deck[0], deck[1:]
-		PokerPubSub.Pub(myTopic, PokerEvent{
-			ID:    "card" + strconv.Itoa(idx),
-			Name:  "",
-			Idx:   idx,
-			Top:   seats[2].Top + 5,
-			Left:  seats[2].Left,
-			Angle: seats[2].Angle,
-			Burn:  true,
-		})
 
 		// Burn
 		select {
@@ -950,7 +881,8 @@ func PokerHandler(c echo.Context) error {
 			idx++
 			card, deck = deck[0], deck[1:]
 			PokerPubSub.Pub(myTopic, PokerEvent{
-				ID: "card" + strconv.Itoa(idx), Name: card,
+				ID:   "card" + strconv.Itoa(idx),
+				Name: card,
 				Idx:  idx,
 				Top:  150,
 				Left: 100 + (i * 55),