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

Refactor: session remove duplicate ID in endpoints.

Browse source
This commit is contained in:
Miroslav Šedivý 2020-10-31 23:53:19 +01:00
parent e150203b54
commit 5c92b75cf7
7 changed files with 53 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

31
internal/websocket/control.go
View file

@ -31,13 +31,11 @@ func (h *MessageHandler) controlRelease(session types.Session) error {
}
func (h *MessageHandler) controlRequest(session types.Session) error {
// check for host
if !h.sessions.HasHost() {
host := h.sessions.GetHost()
if host == nil {
// set host
if err := h.sessions.SetHost(session.ID()); err != nil {
h.logger.Warn().Err(err).Msgf("SetHost failed")
return err
}
h.sessions.SetHost(session)
// let everyone know
if err := h.sessions.Broadcast(
@ -48,14 +46,7 @@ func (h *MessageHandler) controlRequest(session types.Session) error {
h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_LOCKED)
return err
}
return nil
}
// get host
host, ok := h.sessions.GetHost()
if ok {
} else {
// tell session there is a host
if err := session.Send(message.Control{
Event: event.CONTROL_REQUEST,
@ -85,23 +76,21 @@ func (h *MessageHandler) controlGive(session types.Session, payload *message.Con
return nil
}
if !h.sessions.Has(payload.ID) {
h.logger.Debug().Str("id", payload.ID).Msg("user does not exist")
target, ok := h.sessions.Get(payload.ID)
if !ok {
h.logger.Debug().Str("id", target.ID()).Msg("user does not exist")
return nil
}
// set host
if err := h.sessions.SetHost(payload.ID); err != nil {
h.logger.Warn().Err(err).Msgf("SetHost failed")
return err
}
h.sessions.SetHost(target)
// let everyone know
if err := h.sessions.Broadcast(
message.ControlTarget{
Event: event.CONTROL_GIVE,
ID: session.ID(),
Target: payload.ID,
Target: target.ID(),
}, nil); err != nil {
h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_LOCKED)
return err