diff options
Diffstat (limited to 'internal/client/ui/core')
| -rw-r--r-- | internal/client/ui/core/core.go | 29 | ||||
| -rw-r--r-- | internal/client/ui/core/networkjoin/networkjoin.go | 2 |
2 files changed, 13 insertions, 18 deletions
diff --git a/internal/client/ui/core/core.go b/internal/client/ui/core/core.go index ef31c27..69bffec 100644 --- a/internal/client/ui/core/core.go +++ b/internal/client/ui/core/core.go @@ -203,7 +203,7 @@ func (m *Model) updateConnected(msg tea.Msg) tea.Cmd { } networks = slices.DeleteFunc(networks, func(network packet.FullNetwork) bool { - return slices.Contains(msg.RemoveNetworks, network.ID) + return slices.Contains(msg.RemovedNetworks, network.ID) }) slices.SortFunc(networks, func(a, b packet.FullNetwork) int { return a.Position - b.Position @@ -219,24 +219,19 @@ func (m *Model) updateConnected(msg tea.Msg) tea.Cmd { network = &state.State.Networks[i] } } - - if msg.Set { - network.Frequencies = msg.Frequencies - } else { - frequencies := network.Frequencies - frequencies = append(frequencies, msg.Frequencies...) - frequencies = slices.DeleteFunc(frequencies, func(frequency data.Frequency) bool { - return slices.Contains(msg.RemoveFrequencies, frequency.ID) - }) - slices.SortFunc(frequencies, func(a, b data.Frequency) int { - return int(a.Position - b.Position) - }) - log.Println(frequencies) - network.Frequencies = frequencies - } + frequencies := network.Frequencies + frequencies = append(frequencies, msg.Frequencies...) + frequencies = slices.DeleteFunc(frequencies, func(frequency data.Frequency) bool { + return slices.Contains(msg.RemovedFrequencies, frequency.ID) + }) + slices.SortFunc(frequencies, func(a, b data.Frequency) int { + return int(a.Position - b.Position) + }) + log.Println(frequencies) + network.Frequencies = frequencies case *packet.MessagesInfo: - for _, id := range msg.RemoveMessages { + for _, id := range msg.RemovedMessages { for _, btree := range state.State.Messages { btree.Delete(data.Message{ID: id}) } diff --git a/internal/client/ui/core/networkjoin/networkjoin.go b/internal/client/ui/core/networkjoin/networkjoin.go index 8f8200b..347d69d 100644 --- a/internal/client/ui/core/networkjoin/networkjoin.go +++ b/internal/client/ui/core/networkjoin/networkjoin.go @@ -165,7 +165,7 @@ func (m *Model) Select() tea.Cmd { assert.NoError(err, "input is already validated to be valid") yes := true - request := packet.SetNetworkUser{ + request := packet.SetMember{ Member: &yes, Admin: nil, Muted: nil, |