diff options
author | Santo Cariotti <santo@dcariotti.me> | 2025-04-27 12:52:51 +0200 |
---|---|---|
committer | Santo Cariotti <santo@dcariotti.me> | 2025-04-27 12:52:51 +0200 |
commit | 5a3ce746e00393fbb2c676e3d9c037e0e3014fc8 (patch) | |
tree | 8a42a1d08c3fe6db768e7569e31800081714ae36 | |
parent | 85a6b4c2915fbfb42978fd7d2e3f7bd67e650314 (diff) |
Use the multiplayer's type instead of simple string to send messages
-rw-r--r-- | pkg/ui/views/game.go | 4 | ||||
-rw-r--r-- | pkg/ui/views/game_api.go | 5 | ||||
-rw-r--r-- | pkg/ui/views/game_moves.go | 2 | ||||
-rw-r--r-- | pkg/ui/views/game_restore.go | 5 |
4 files changed, 9 insertions, 7 deletions
diff --git a/pkg/ui/views/game.go b/pkg/ui/views/game.go index 12f4fcb..425d047 100644 --- a/pkg/ui/views/game.go +++ b/pkg/ui/views/game.go @@ -118,7 +118,7 @@ func (m GameModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) { m.err = m.network.Close() case RestoreGameMsg: - m.network.SendAll([]byte("restore"), []byte(m.network.Me())) + m.network.SendAll([]byte(string(multiplayer.RestoreGameMessage)), []byte(m.network.Me())) m.restore = false case error: @@ -138,7 +138,7 @@ func (m GameModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) { if err != nil { m.err = err } else { - m.network.SendAll([]byte("new-move"), []byte(moveStr)) + m.network.SendAll([]byte(string(multiplayer.MoveGameMessage)), []byte(moveStr)) m.err = nil } cmds = append(cmds, m.getMoves(), m.updateMovesListCmd(), m.sendNewTurnCmd()) diff --git a/pkg/ui/views/game_api.go b/pkg/ui/views/game_api.go index 32ea873..5ae03c4 100644 --- a/pkg/ui/views/game_api.go +++ b/pkg/ui/views/game_api.go @@ -9,6 +9,7 @@ import ( "github.com/boozec/rahanna/internal/api/database" "github.com/boozec/rahanna/pkg/p2p" + "github.com/boozec/rahanna/pkg/ui/multiplayer" tea "github.com/charmbracelet/bubbletea" "github.com/notnil/chess" ) @@ -56,7 +57,7 @@ func (m GameModel) handleDatabaseGameMsg(msg database.Game) (GameModel, tea.Cmd) } else { m.turn = m.playerPeer(1) } - m.network.SendAll([]byte("define-turn"), []byte(string(m.turn))) + m.network.SendAll([]byte(string(multiplayer.DefineTurnMessage)), []byte(string(m.turn))) } @@ -135,7 +136,7 @@ func (m *GameModel) endGame(outcome string, abandon bool) tea.Cmd { } if abandon { - m.network.SendAll([]byte("abandon"), []byte("🏳️")) + m.network.SendAll([]byte(string(multiplayer.AbandonGameMessage)), []byte("🏳️")) } return game diff --git a/pkg/ui/views/game_moves.go b/pkg/ui/views/game_moves.go index fefdf85..fe4a728 100644 --- a/pkg/ui/views/game_moves.go +++ b/pkg/ui/views/game_moves.go @@ -127,7 +127,7 @@ func (m GameModel) handleDefineTurnMsg() (GameModel, tea.Cmd) { } } - m.network.SendAll([]byte("define-turn"), []byte(string(m.turn))) + m.network.SendAll([]byte(string(multiplayer.DefineTurnMessage)), []byte(string(m.turn))) return m, tea.Batch(cmds...) } diff --git a/pkg/ui/views/game_restore.go b/pkg/ui/views/game_restore.go index 9879233..e9e9b59 100644 --- a/pkg/ui/views/game_restore.go +++ b/pkg/ui/views/game_restore.go @@ -7,6 +7,7 @@ import ( "github.com/boozec/rahanna/internal/api/database" "github.com/boozec/rahanna/pkg/p2p" + "github.com/boozec/rahanna/pkg/ui/multiplayer" tea "github.com/charmbracelet/bubbletea" ) @@ -59,8 +60,8 @@ func (m GameModel) handleSendRestoreMsg(source p2p.NetworkID) tea.Cmd { payload += fmt.Sprintf("%s\n", move.String()) } - m.err = m.network.Send(source, []byte("restore-ack"), []byte(payload)) - m.err = m.network.Send(source, []byte("define-turn"), []byte(string(m.turn))) + m.err = m.network.Send(source, []byte(string(multiplayer.RestoreAckGameMessage)), []byte(payload)) + m.err = m.network.Send(source, []byte(string(multiplayer.DefineTurnMessage)), []byte(string(m.turn))) return nil } |