3pp-mirror/neko
1
0
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2025-05-25 23:17:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

remove redundant ID parameter in websockets.

Browse source
This commit is contained in:
Miroslav Šedivý 2020-10-31 22:43:47 +01:00
parent b6393c4396
commit b61495ac0b
7 changed files with 76 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/websocket/session.go
View file

@ -6,15 +6,15 @@ import (
"demodesk/neko/internal/types/message"
)
func (h *MessageHandler) SessionCreated(id string, session types.Session) error {
func (h *MessageHandler) SessionCreated(session types.Session) error {
// send sdp and id over to client
if err := h.signalProvide(id, session); err != nil {
if err := h.signalProvide(session); err != nil {
return err
}
if session.Admin() {
// send screen configurations if admin
if err := h.screenConfigurations(id, session); err != nil {
if err := h.screenConfigurations(session); err != nil {
return err
}
@ -27,18 +27,18 @@ func (h *MessageHandler) SessionCreated(id string, session types.Session) error
return nil
}
func (h *MessageHandler) SessionConnected(id string, session types.Session) error {
func (h *MessageHandler) SessionConnected(session types.Session) error {
// send list of members to session
if err := session.Send(message.MembersList{
Event: event.MEMBER_LIST,
Memebers: h.sessions.Members(),
}); err != nil {
h.logger.Warn().Str("id", id).Err(err).Msgf("sending event %s has failed", event.MEMBER_LIST)
h.logger.Warn().Str("id", session.ID()).Err(err).Msgf("sending event %s has failed", event.MEMBER_LIST)
return err
}
// send screen current resolution
if err := h.screenResolution(id, session); err != nil {
if err := h.screenResolution(session); err != nil {
return err
}
@ -49,7 +49,7 @@ func (h *MessageHandler) SessionConnected(id string, session types.Session) erro
Event: event.CONTROL_LOCKED,
ID: host.ID(),
}); err != nil {
h.logger.Warn().Str("id", id).Err(err).Msgf("sending event %s has failed", event.CONTROL_LOCKED)
h.logger.Warn().Str("id", session.ID()).Err(err).Msgf("sending event %s has failed", event.CONTROL_LOCKED)
return err
}
}