dkforest

commit 88e4fa20fb6a0841a05ae6f755cb11a6f3965db0
parent f0d0fe9094853b0801f0c9bf9efda61731160083
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 11 Dec 2023 20:58:12 -0500

cleanup

Diffstat:
M
pkg/web/handlers/poker/events.go
 | 
5
-----
M
pkg/web/handlers/poker/poker.go
 | 
41
++---------------------------------------

2 files changed, 2 insertions(+), 44 deletions(-)
diff --git a/pkg/web/handlers/poker/events.go b/pkg/web/handlers/poker/events.go
@@ -51,11 +51,6 @@ type PokerWaitTurnEvent struct {
 	Idx int
 }
 
-type YourCardEvent struct {
-	Idx  int
-	Name string
-}
-
 type PokerSeatTakenEvent struct {
 }
 
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -20,7 +20,7 @@ import (
 )
 
 const NbPlayers = 6
-const MaxUserCountdown = 60
+const MaxUserCountdown = 3
 const MinTimeAfterGame = 10
 const BackfacingDeg = "-180deg"
 const BurnStackX = 400
@@ -700,7 +700,6 @@ func dealPlayersCards(g *PokerGame, roomTopic string, seats []Seat, idx *int) {
 			evt1 := PokerEvent{ID: "card" + itoa(*idx), Name: card, Idx: *idx, Top: seatData1.Top, Left: seatData1.Left, Reveal: true, Player: p.Username}
 
 			PokerPubSub.Pub(roomTopic, evt)
-			PokerPubSub.Pub(roomUserTopic, YourCardEvent{Idx: cardIdx, Name: card})
 			PokerPubSub.Pub(roomUserTopic, evt1)
 
 			p.CardsMtx.Lock()
@@ -1196,31 +1195,6 @@ func buildDealerTokenHtml(g *PokerGame) (html string) {
 	return
 }
 
-func buildYourCardsHtml(authUser *database.User, g *PokerGame) string {
-	html := `
-<div style="position: absolute; top: 550px; left: 300px;">
-	<div id="yourCard1"></div>
-	<div id="yourCard2"></div>
-</div>`
-	if g.Ongoing != nil {
-		cards := make([]PlayerCard, 0)
-		if p := g.Ongoing.GetPlayer(authUser.Username.String()); p != nil {
-			p.CardsMtx.RLock()
-			cards = p.Cards
-			p.CardsMtx.RUnlock()
-		}
-		html += `<style>`
-		if len(cards) >= 1 {
-			html += `#yourCard1:before { content: "` + cards[0].Name + `"; color: ` + colorForCard(cards[0].Name) + `; }`
-		}
-		if len(cards) == 2 {
-			html += `#yourCard2:before { content: "` + cards[1].Name + `"; color: ` + colorForCard(cards[1].Name) + `; }`
-		}
-		html += `</style>`
-	}
-	return html
-}
-
 func buildDevHtml() (html string) {
 	return `<div class="dev_seat1_card1"></div>
 <div class="dev_seat2_card1"></div>
@@ -1242,8 +1216,6 @@ func buildPayloadHtml(g *PokerGame, authUser *database.User, payload any) (html 
 		html += drawGameStartedEvent(evt)
 	case GameIsDoneEvent:
 		html += drawGameIsDoneHtml(g, evt)
-	case YourCardEvent:
-		html += drawYourCardEvent(evt)
 	case PlayerBetEvent:
 		html += drawPlayerBetEvent(evt)
 	case ErrorMsgEvent:
@@ -1276,7 +1248,6 @@ func buildBaseHtml(g *PokerGame, authUser *database.User, roomID string) (html s
 	html += buildCardsHtml()
 	html += buildSeatsHtml(g, authUser, roomID)
 	html += buildActionsDiv(roomID)
-	html += buildYourCardsHtml(authUser, g)
 	html += buildDealerTokenHtml(g)
 	html += `<iframe src="/poker/` + roomID + `/logs" id="eventLogs"></iframe>`
 	html += `<div id="errorMsg"></div>`
@@ -1486,10 +1457,6 @@ func drawPlayerBetEvent(evt PlayerBetEvent) (html string) {
 	return
 }
 
-func drawYourCardEvent(evt YourCardEvent) string {
-	return `<style>#yourCard` + itoa(evt.Idx) + `:before { content: "` + evt.Name + `"; color: ` + colorForCard(evt.Name) + `; }</style>`
-}
-
 func drawGameStartedEvent(evt GameStartedEvent) string {
 	pos := dealerTokenPos[evt.DealerIdx]
 	return `<style>#dealerToken { top: ` + itoa(pos[0]) + `px; left: ` + itoa(pos[1]) + `px; }</style>`
@@ -1523,8 +1490,6 @@ func drawResetCardsEvent() (html string) {
 				#card` + itoa(i) + ` .card .inner:before { content: ""; }`
 	}
 	html += `
-				#yourCard1:before { content: ""; }
-				#yourCard2:before { content: ""; }
 				#winner:before { content: ""; }
 				#mainPot:before { content: "Pot: 0"; }
 			</style>`
@@ -1741,9 +1706,7 @@ body {
 #countdown6 { top: 404px; left: 59px; position: absolute; display: none; z-index: 100;  }
 #mainPot { position: absolute; top: 240px; left: 250px; }
 #winner { position: absolute; top: 265px; left: 250px; }
-#yourCard1 { font-size: 22px; display: inline-block; margin-right: 15px; }
-#yourCard2 { font-size: 22px; display: inline-block; }
-#errorMsg { position: absolute; top: 600px; left: 250px; color: darkred; }
+#errorMsg { position: absolute; top: 550px; left: 250px; color: darkred; }
 #eventLogs { position: absolute; bottom: 5px; right: 5px; width: 300px; height: 200px; border: 1px solid black; background-color: #ccc; padding: 3px; }
 #dealerToken { top: 125px; left: 714px; width: 20px; height: 20px; background-color: #ccc; border: 1px solid #333; border-radius: 11px; position: absolute; }
 #dealerToken .inner { padding: 2px 4px; }