summaryrefslogtreecommitdiff
path: root/internal/client/ui
diff options
context:
space:
mode:
authorKyren223 <Kyren223@proton.me>2025-02-05 19:51:00 +0200
committerKyren223 <Kyren223@proton.me>2025-02-05 19:51:00 +0200
commitb96118f59bb4ec7e416558046d5808aa38b1834f (patch)
tree7818b050493fe53b972bbc2d246437214f2fe3d0 /internal/client/ui
parent0bf5515629f1cfe1557dba4f8d588ac64b77d408 (diff)
Removed all instances of setting the user data, this is retrieved once
on start, then managed by the client and stored once on client exit
Diffstat (limited to 'internal/client/ui')
-rw-r--r--internal/client/ui/core/networklist/networklist.go12
-rw-r--r--internal/client/ui/core/signaladd/signaladd.go8
-rw-r--r--internal/client/ui/core/signallist/signallist.go5
3 files changed, 4 insertions, 21 deletions
diff --git a/internal/client/ui/core/networklist/networklist.go b/internal/client/ui/core/networklist/networklist.go
index a7713b5..0c8300a 100644
--- a/internal/client/ui/core/networklist/networklist.go
+++ b/internal/client/ui/core/networklist/networklist.go
@@ -136,11 +136,11 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
switch key {
case "K":
if 0 < m.index {
- return m.Swap(-1)
+ m.Swap(-1)
}
case "J":
if 0 <= m.index && m.index < len(state.State.Networks)-1 {
- return m.Swap(1)
+ m.Swap(1)
}
case "k":
m.SetIndex(m.index - 1)
@@ -183,17 +183,11 @@ func (m *Model) Blur() {
m.focus = false
}
-func (m *Model) Swap(dir int) (Model, tea.Cmd) {
+func (m *Model) Swap(dir int) {
tmp := state.Data.Networks[m.index]
state.Data.Networks[m.index] = state.Data.Networks[m.index+dir]
state.Data.Networks[m.index+dir] = tmp
m.SetIndex(m.index + dir)
-
- data := state.JsonUserData()
- return *m, gateway.Send(&packet.SetUserData{
- Data: &data,
- User: nil,
- })
}
func (m Model) Index() int {
diff --git a/internal/client/ui/core/signaladd/signaladd.go b/internal/client/ui/core/signaladd/signaladd.go
index 781b16a..2979f4f 100644
--- a/internal/client/ui/core/signaladd/signaladd.go
+++ b/internal/client/ui/core/signaladd/signaladd.go
@@ -9,12 +9,10 @@ import (
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"
- "github.com/kyren223/eko/internal/client/gateway"
"github.com/kyren223/eko/internal/client/ui/colors"
"github.com/kyren223/eko/internal/client/ui/core/state"
"github.com/kyren223/eko/internal/client/ui/field"
"github.com/kyren223/eko/internal/client/ui/layouts/flex"
- "github.com/kyren223/eko/internal/packet"
"github.com/kyren223/eko/pkg/assert"
"github.com/kyren223/eko/pkg/snowflake"
)
@@ -182,9 +180,5 @@ func (m *Model) Select() (tea.Cmd, int) {
state.Data.Signals = slices.Insert(state.Data.Signals, 0, id)
log.Println("Signals:", state.Data.Signals)
- data := state.JsonUserData()
- return gateway.Send(&packet.SetUserData{
- Data: &data,
- User: nil,
- }), 0
+ return nil, 0
}
diff --git a/internal/client/ui/core/signallist/signallist.go b/internal/client/ui/core/signallist/signallist.go
index c9fad95..894d652 100644
--- a/internal/client/ui/core/signallist/signallist.go
+++ b/internal/client/ui/core/signallist/signallist.go
@@ -167,11 +167,6 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
if m.index == len(state.Data.Signals) {
m.SetIndex(m.index - 1)
}
- data := state.JsonUserData()
- return m, gateway.Send(&packet.SetUserData{
- Data: &data,
- User: nil,
- })
case "T":
if m.index == -1 {