From 3c5c01f475a197daeb7a98892df4bc01dacfa761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Thu, 29 Oct 2020 18:11:30 +0100 Subject: [PATCH] remove chat. --- internal/types/event/events.go | 5 ---- internal/types/message/messages.go | 11 -------- internal/websocket/chat.go | 41 ------------------------------ internal/websocket/handler.go | 15 ----------- 4 files changed, 72 deletions(-) delete mode 100644 internal/websocket/chat.go diff --git a/internal/types/event/events.go b/internal/types/event/events.go index b97c49c8..5d11b3e3 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -25,11 +25,6 @@ const ( CONTROL_KEYBOARD = "control/keyboard" ) -const ( - CHAT_MESSAGE = "chat/message" - CHAT_EMOTE = "chat/emote" -) - const ( SCREEN_CONFIGURATIONS = "screen/configurations" SCREEN_RESOLUTION = "screen/resolution" diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index ae9431ef..ee7a20ba 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -65,17 +65,6 @@ type ControlTarget struct { Target string `json:"target"` } -type ChatReceive struct { - Event string `json:"event"` - Content string `json:"content"` -} - -type ChatSend struct { - Event string `json:"event"` - ID string `json:"id"` - Content string `json:"content"` -} - type EmoteReceive struct { Event string `json:"event"` Emote string `json:"emote"` diff --git a/internal/websocket/chat.go b/internal/websocket/chat.go deleted file mode 100644 index 735c5554..00000000 --- a/internal/websocket/chat.go +++ /dev/null @@ -1,41 +0,0 @@ -package websocket - -import ( - "demodesk/neko/internal/types" - "demodesk/neko/internal/types/event" - "demodesk/neko/internal/types/message" -) - -func (h *MessageHandler) chat(id string, session types.Session, payload *message.ChatReceive) error { - if session.Muted() { - return nil - } - - if err := h.sessions.Broadcast( - message.ChatSend{ - Event: event.CHAT_MESSAGE, - Content: payload.Content, - ID: id, - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) - return err - } - return nil -} - -func (h *MessageHandler) chatEmote(id string, session types.Session, payload *message.EmoteReceive) error { - if session.Muted() { - return nil - } - - if err := h.sessions.Broadcast( - message.EmoteSend{ - Event: event.CHAT_EMOTE, - Emote: payload.Emote, - ID: id, - }, nil); err != nil { - h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE) - return err - } - return nil -} diff --git a/internal/websocket/handler.go b/internal/websocket/handler.go index ed6a2b3a..86038711 100644 --- a/internal/websocket/handler.go +++ b/internal/websocket/handler.go @@ -97,21 +97,6 @@ func (h *MessageHandler) Message(id string, raw []byte) error { return h.controlKeyboard(id, session, payload) }), "%s failed", header.Event) - - // Chat Events - case event.CHAT_MESSAGE: - payload := &message.ChatReceive{} - return errors.Wrapf( - utils.Unmarshal(payload, raw, func() error { - return h.chat(id, session, payload) - }), "%s failed", header.Event) - case event.CHAT_EMOTE: - payload := &message.EmoteReceive{} - return errors.Wrapf( - utils.Unmarshal(payload, raw, func() error { - return h.chatEmote(id, session, payload) - }), "%s failed", header.Event) - // Screen Events case event.SCREEN_RESOLUTION: return errors.Wrapf(h.screenResolution(id, session), "%s failed", header.Event)