From f136a31b03b158597765151bf6400edbe2e20e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sat, 14 Nov 2020 16:09:00 +0100 Subject: [PATCH] minor refactor ifs. --- internal/websocket/handler/broadcast.go | 14 ++------------ internal/websocket/handler/signal.go | 15 +++------------ 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/internal/websocket/handler/broadcast.go b/internal/websocket/handler/broadcast.go index 1fa0c766..adb5fe18 100644 --- a/internal/websocket/handler/broadcast.go +++ b/internal/websocket/handler/broadcast.go @@ -13,12 +13,7 @@ func (h *MessageHandlerCtx) boradcastCreate(session types.Session, payload *mess } h.capture.StartBroadcast(payload.URL) - - if err := h.boradcastStatus(session); err != nil { - return err - } - - return nil + return h.boradcastStatus(session) } func (h *MessageHandlerCtx) boradcastDestroy(session types.Session) error { @@ -28,12 +23,7 @@ func (h *MessageHandlerCtx) boradcastDestroy(session types.Session) error { } h.capture.StopBroadcast() - - if err := h.boradcastStatus(session); err != nil { - return err - } - - return nil + return h.boradcastStatus(session) } func (h *MessageHandlerCtx) boradcastStatus(session types.Session) error { diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go index b9b76d42..7edbb47f 100644 --- a/internal/websocket/handler/signal.go +++ b/internal/websocket/handler/signal.go @@ -12,25 +12,16 @@ func (h *MessageHandlerCtx) signalProvide(session types.Session) error { return err } - if err := session.Send(message.SignalProvide{ + return session.Send(message.SignalProvide{ Event: event.SIGNAL_PROVIDE, ID: session.ID(), SDP: sdp, Lite: lite, ICE: ice, - }); err != nil { - return err - } - - return nil + }) } func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalAnswer) error { session.SetName(payload.DisplayName) - - if err := session.SignalAnswer(payload.SDP); err != nil { - return err - } - - return nil + return session.SignalAnswer(payload.SDP) }