commit dd81bbaa420a44650943161b70e4a786ea7311bc
parent 07f98d1a2316cae0f1854b0a7773b59d2fcf18b4
Author: n0tr1v <n0tr1v@protonmail.com>
Date: Thu, 21 Dec 2023 12:03:28 -0500
cleanup
Diffstat:
2 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/pkg/utils/rwmtx/rwmtx.go b/pkg/utils/rwmtx/rwmtx.go
@@ -69,17 +69,17 @@ func (m *RWMtx[T]) Set(v T) {
m.v = v
}
-func (m *RWMtx[T]) RWith(clb func(v *T)) {
- _ = m.RWithE(func(tx *T) error {
+func (m *RWMtx[T]) RWith(clb func(v T)) {
+ _ = m.RWithE(func(tx T) error {
clb(tx)
return nil
})
}
-func (m *RWMtx[T]) RWithE(clb func(v *T) error) error {
+func (m *RWMtx[T]) RWithE(clb func(v T) error) error {
m.RLock()
defer m.RUnlock()
- return clb(&m.v)
+ return clb(m.v)
}
func (m *RWMtx[T]) With(clb func(v *T)) {
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -246,9 +246,9 @@ type gameResult struct {
func (g *PokerGame) GetLogs() (out []LogEvent) {
if g.ongoing != nil {
- g.ongoing.logEvents.RWith(func(logEvents *[]LogEvent) {
- out = make([]LogEvent, len(*logEvents))
- copy(out, *logEvents)
+ g.ongoing.logEvents.RWith(func(logEvents []LogEvent) {
+ out = make([]LogEvent, len(logEvents))
+ copy(out, logEvents)
})
}
return
@@ -319,9 +319,9 @@ func (g *ongoingGame) computeWinners() (winner []gameResult) {
}
var playerCard1, playerCard2 string
- p.cards.RWith(func(pCards *[]playerCard) {
- playerCard1 = (*pCards)[0].name
- playerCard2 = (*pCards)[1].name
+ p.cards.RWith(func(pCards []playerCard) {
+ playerCard1 = pCards[0].name
+ playerCard2 = pCards[1].name
})
communityCards := g.communityCards
@@ -435,7 +435,7 @@ func (g *PokerGame) IsSeated(userID database.UserID) bool {
}
func (g *PokerGame) isSeated(userID database.UserID) (out bool) {
- g.Players.RWith(func(gPlayers *[]*seatedPlayer) { out = isSeated(*gPlayers, userID) })
+ g.Players.RWith(func(gPlayers []*seatedPlayer) { out = isSeated(gPlayers, userID) })
return
}
@@ -535,8 +535,8 @@ func (g *PokerGame) unSitPlayer(gPlayers *[]*seatedPlayer, seatedPlayer *seatedP
g.sendUnsitPlayerEvent(player.userID)
player.unsit.Store(true)
player.folded.Store(true)
- player.cards.RWith(func(playerCards *[]playerCard) {
- for _, card := range *playerCards {
+ player.cards.RWith(func(playerCards []playerCard) {
+ for _, card := range playerCards {
evt := PokerEvent{ID: "card" + itoa(card.idx), Name: "", Idx: card.idx, Top: BurnStackY, Left: BurnStackX, Angle: "0deg", Reveal: false}
PokerPubSub.Pub(g.roomID.Topic(), evt)
ongoing.addEvent(evt)
@@ -562,8 +562,8 @@ func generateDeck() []string {
func newOngoing(g *PokerGame) *ongoingGame {
players := make([]*pokerPlayer, 0)
- g.Players.RWith(func(gPlayers *[]*seatedPlayer) {
- for _, p := range *gPlayers {
+ g.Players.RWith(func(gPlayers []*seatedPlayer) {
+ for _, p := range gPlayers {
if p.isEligible(g.PokerTableMinBet) {
players = append(players, &pokerPlayer{seatedPlayer: p})
}
@@ -594,9 +594,9 @@ func showCards(g *PokerGame, seats []Seat) {
for _, p := range ongoing.players {
if !p.folded.Load() {
var firstCard, secondCard playerCard
- p.cards.RWith(func(pCards *[]playerCard) {
- firstCard = (*pCards)[0]
- secondCard = (*pCards)[1]
+ p.cards.RWith(func(pCards []playerCard) {
+ firstCard = pCards[0]
+ secondCard = pCards[1]
})
seatData := seats[p.seatIdx]
if p.seatIdx == 0 {
@@ -672,9 +672,9 @@ func foldPlayer(g *PokerGame, p *pokerPlayer) {
roomTopic := g.roomID.Topic()
p.folded.Store(true)
var firstCardIdx, secondCardIdx int
- p.cards.RWith(func(pCards *[]playerCard) {
- firstCardIdx = (*pCards)[0].idx
- secondCardIdx = (*pCards)[1].idx
+ p.cards.RWith(func(pCards []playerCard) {
+ firstCardIdx = pCards[0].idx
+ secondCardIdx = pCards[1].idx
})
evt1 := PokerEvent{ID: "card" + itoa(firstCardIdx), Name: "", Idx: firstCardIdx, Top: BurnStackY, Left: BurnStackX, Angle: "0deg", Reveal: false}
evt2 := PokerEvent{ID: "card" + itoa(secondCardIdx), Name: "", Idx: secondCardIdx, Top: BurnStackY, Left: BurnStackX, Angle: "0deg", Reveal: false}
@@ -1250,9 +1250,9 @@ func (g *ongoingGame) gameStr() string {
for _, p := range g.players {
if !p.folded.Load() {
out += fmt.Sprintf(" | @%s", p.username)
- p.cards.RWith(func(pCards *[]playerCard) {
- out += " " + (*pCards)[0].name
- out += " " + (*pCards)[1].name
+ p.cards.RWith(func(pCards []playerCard) {
+ out += " " + pCards[0].name
+ out += " " + pCards[1].name
})
}
}
@@ -1499,8 +1499,8 @@ func (g *PokerGame) Deal(roomID RoomID, userID database.UserID) {
}
func (g *PokerGame) countEligibleSeated() (count int) {
- g.Players.RWith(func(gPlayers *[]*seatedPlayer) {
- for _, p := range *gPlayers {
+ g.Players.RWith(func(gPlayers []*seatedPlayer) {
+ for _, p := range gPlayers {
if p.isEligible(g.PokerTableMinBet) {
count++
}
@@ -1510,8 +1510,8 @@ func (g *PokerGame) countEligibleSeated() (count int) {
}
func (g *PokerGame) CountSeated() (count int) {
- g.Players.RWith(func(gPlayers *[]*seatedPlayer) {
- for _, p := range *gPlayers {
+ g.Players.RWith(func(gPlayers []*seatedPlayer) {
+ for _, p := range gPlayers {
if p != nil {
count++
}
@@ -1629,15 +1629,15 @@ func BuildBaseHtml(g *PokerGame, authUser *database.User, chatRoomSlug string) (
if ongoing != nil {
- ongoing.waitTurnEvent.RWith(func(v *PokerWaitTurnEvent) {
- html += drawCountDownStyle(*v)
+ ongoing.waitTurnEvent.RWith(func(v PokerWaitTurnEvent) {
+ html += drawCountDownStyle(v)
})
- ongoing.autoActionEvent.RWith(func(v *AutoActionEvent) {
- html += drawAutoActionMsgEvent(*v)
+ ongoing.autoActionEvent.RWith(func(v AutoActionEvent) {
+ html += drawAutoActionMsgEvent(v)
})
- ongoing.events.RWith(func(v *[]PokerEvent) {
- for _, evt := range *v {
+ ongoing.events.RWith(func(v []PokerEvent) {
+ for _, evt := range v {
if evt.UserID == 0 {
html += getPokerEventHtml(evt, "0s")
}
@@ -1729,12 +1729,12 @@ func simpleTmpl(htmlTmpl string, data any) string {
}
func buildSeatsHtml(g *PokerGame, authUser *database.User) (html string) {
- g.Players.RWith(func(gPlayers *[]*seatedPlayer) {
- for i := range *gPlayers {
+ g.Players.RWith(func(gPlayers []*seatedPlayer) {
+ for i := range gPlayers {
html += `<div id="seat` + itoa(i+1) + `Pot" class="seatPot"></div>`
}
html += `<div>`
- for i := range *gPlayers {
+ for i := range gPlayers {
idxStr := itoa(i + 1)
html += `<div class="seat" id="seat` + idxStr + `">`
html += ` <iframe src="/poker/` + g.roomID.String() + `/sit/` + idxStr + `" class="takeSeat takeSeat` + idxStr + `"></iframe>`
@@ -1752,8 +1752,8 @@ func drawSeatsStyle(authUser *database.User, g *PokerGame) string {
ongoing := g.ongoing
html := "<style>"
seated := g.isSeated(authUser.ID)
- g.Players.RWith(func(players *[]*seatedPlayer) {
- for i, p := range *players {
+ g.Players.RWith(func(players []*seatedPlayer) {
+ for i, p := range players {
idxStr := itoa(i + 1)
display := utils.Ternary(p != nil || seated, "none", "block")
html += fmt.Sprintf(`.takeSeat%s { display: %s; }`, idxStr, display)
@@ -1830,8 +1830,8 @@ func buildWinnerHtml() string {
func drawGameIsDoneHtml(g *PokerGame, evt GameIsDoneEvent) (html string) {
html += `<style>`
- g.Players.RWith(func(gPlayers *[]*seatedPlayer) {
- for i, p := range *gPlayers {
+ g.Players.RWith(func(gPlayers []*seatedPlayer) {
+ for i, p := range gPlayers {
if p != nil {
html += drawSeatCashLabel(itoa(i+1), itoa2(p.getCash()))
}
