From b675e4cc826b6fb7df457ab407839342611b1c21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 28 Nov 2020 15:03:38 +0100 Subject: [PATCH] member name refactor. --- internal/session/session.go | 4 ---- internal/types/message/messages.go | 5 ++--- internal/types/session.go | 1 - internal/websocket/handler/signal.go | 1 - 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/internal/session/session.go b/internal/session/session.go index 1799d767..52f1b16b 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -43,10 +43,6 @@ func (session *SessionCtx) Connected() bool { return session.websocket_connected && session.webrtc_connected } -func (session *SessionCtx) SetName(name string) { - session.profile.Name = name -} - func (session *SessionCtx) SetWebSocketPeer(websocket_peer types.WebSocketPeer) { session.websocket_peer = websocket_peer session.manager.emmiter.Emit("created", session) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index 078bf4b4..9de7bd37 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -23,7 +23,6 @@ type SignalProvide struct { type SignalAnswer struct { Event string `json:"event"` - Name string `json:"displayname"` // TODO: Change. SDP string `json:"sdp"` } @@ -34,14 +33,14 @@ type MembersList struct { type MembersListEntry struct { ID string `json:"id"` - Name string `json:"displayname"` // TODO: Change. + Name string `json:"name"` Admin bool `json:"admin"` } type Member struct { Event string `json:"event"` ID string `json:"id"` - Name string `json:"displayname"` // TODO: Change. + Name string `json:"name"` Admin bool `json:"admin"` } diff --git a/internal/types/session.go b/internal/types/session.go index cc54a828..cf525f51 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -20,7 +20,6 @@ type Session interface { IsHost() bool Connected() bool VerifySecret(secret string) bool - SetName(name string) SetWebSocketPeer(websocket_peer WebSocketPeer) SetWebSocketConnected(connected bool) SetWebRTCPeer(webrtc_peer WebRTCPeer) diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index 377a4578..62027629 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -23,6 +23,5 @@ func (h *MessageHandlerCtx) signalProvide(session types.Session) error { } func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalAnswer) error { - session.SetName(payload.Name) return session.SignalAnswer(payload.SDP) }