From def6248ca7b85db3e0036ec684adadd1a3e7a207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Mon, 30 Nov 2020 17:27:11 +0100 Subject: [PATCH] revert broadcast status. --- internal/types/event/events.go | 2 +- internal/types/message/messages.go | 30 ++++++++++++------------------ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/internal/types/event/events.go b/internal/types/event/events.go index 5ce91e4f..554c9187 100644 --- a/internal/types/event/events.go +++ b/internal/types/event/events.go @@ -52,7 +52,7 @@ const ( ) const ( - BORADCAST_STATUS = "broadcast/status" // TODO: Remove. + BORADCAST_STATUS = "broadcast/status" BORADCAST_CREATE = "broadcast/create" // TODO: Remove. BORADCAST_DESTROY = "broadcast/destroy" // TODO: Remove. ) diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go index d009d367..9bccdddd 100644 --- a/internal/types/message/messages.go +++ b/internal/types/message/messages.go @@ -12,11 +12,12 @@ type Message struct { // System // TODO: New. type SystemConnect struct { - Event string `json:"event,omitempty"` - ControlHost ControlHost `json:"control_host"` - ScreenSize ScreenSize `json:"screen_size"` - Members []MemberData `json:"members"` - ScreenSizesList *[]ScreenSize `json:"screen_sizes_list,omitempty"` + Event string `json:"event,omitempty"` + ControlHost ControlHost `json:"control_host"` + ScreenSize ScreenSize `json:"screen_size"` + Members []MemberData `json:"members"` + ScreenSizesList *[]ScreenSize `json:"screen_sizes_list,omitempty"` + BroadcastStatus BroadcastStatus `json:"members,omitempty"` } // TODO: New. @@ -114,6 +115,12 @@ type KeyboardLayout struct { Layout string `json:"layout"` } +type BroadcastStatus struct { + Event string `json:"event"` + URL string `json:"url"` + IsActive bool `json:"is_active"` +} + // TODO: Remove. type Disconnect struct { Event string `json:"event"` @@ -202,16 +209,3 @@ type ScreenConfigurations struct { Event string `json:"event"` Configurations map[int]types.ScreenConfiguration `json:"configurations"` } - -// TODO: Remove. -type BroadcastStatus struct { - Event string `json:"event"` - URL string `json:"url"` - IsActive bool `json:"isActive"` -} - -// TODO: Remove. -type BroadcastCreate struct { - Event string `json:"event"` - URL string `json:"url"` -}