Implemented signal chat on the client side along with adding a user id

in the user signals

1 files changed, 16 insertions, 16 deletions

diff --git a/internal/client/ui/core/core.go b/internal/client/ui/core/core.go
index 6e53fbe..4aa5d5d 100644
--- a/internal/client/ui/core/core.go
+++ b/internal/client/ui/core/core.go
@@ -340,22 +340,18 @@ func (m *Model) updateConnected(msg tea.Msg) tea.Cmd {
 					return nil
 				}
 			case FocusLeftSidebar:
-				if !m.HasPopup() {
-					if m.networkList.Index() == networklist.PeersIndex {
-						// TODO: add n keybind for receiver
-					} else {
-						networkId := state.NetworkId(m.networkList.Index())
-						if networkId == nil {
-							return nil
-						}
-						member := state.State.Members[*networkId][*state.UserID]
-						if !member.IsAdmin {
-							return nil
-						}
-						popup := frequencycreation.New(*networkId)
-						m.frequencyCreationPopup = &popup
+				if !m.HasPopup() && m.networkList.Index() != networklist.PeersIndex {
+					networkId := state.NetworkId(m.networkList.Index())
+					if networkId == nil {
 						return nil
 					}
+					member := state.State.Members[*networkId][*state.UserID]
+					if !member.IsAdmin {
+						return nil
+					}
+					popup := frequencycreation.New(*networkId)
+					m.frequencyCreationPopup = &popup
+					return nil
 				}
 			}
 
@@ -550,18 +546,22 @@ func (m *Model) updateConnected(msg tea.Msg) tea.Cmd {
 	if m.networkList.Index() == networklist.PeersIndex {
 		m.peerList, cmd = m.peerList.Update(msg)
 		cmds = append(cmds, cmd)
+
+		cmd = m.chat.SetReceiver(m.peerList.Index())
+		cmds = append(cmds, cmd)
 	} else {
 		m.frequencyList.SetNetworkIndex(m.networkList.Index())
 		m.frequencyList, cmd = m.frequencyList.Update(msg)
 		cmds = append(cmds, cmd)
+
+		cmd = m.chat.SetFrequency(m.networkList.Index(), m.frequencyList.Index())
+		cmds = append(cmds, cmd)
 	}
 
 	m.memberList.SetNetworkAndFrequency(m.networkList.Index(), m.frequencyList.Index())
 	m.memberList, cmd = m.memberList.Update(msg)
 	cmds = append(cmds, cmd)
 
-	cmd = m.chat.SetFrequency(m.networkList.Index(), m.frequencyList.Index())
-	cmds = append(cmds, cmd)
 	m.chat, cmd = m.chat.Update(msg)
 	cmds = append(cmds, cmd)