From 423809e0d0d77fa539dcf82d26e442232ea70b0b Mon Sep 17 00:00:00 2001 From: Ben Schumacher Date: Mon, 22 Apr 2024 11:06:58 +0200 Subject: [PATCH] Using correct type for websocket events (#26825) --- server/channels/wsapi/system.go | 2 +- server/public/model/websocket_message.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/channels/wsapi/system.go b/server/channels/wsapi/system.go index d65fd726e9..d221505434 100644 --- a/server/channels/wsapi/system.go +++ b/server/channels/wsapi/system.go @@ -10,7 +10,7 @@ import ( func (api *API) InitSystem() { api.Router.Handle("ping", api.APIWebSocketHandler(ping)) - api.Router.Handle(model.WebsocketPostedNotifyAck, api.APIWebSocketHandler(api.websocketNotificationAck)) + api.Router.Handle(string(model.WebsocketPostedNotifyAck), api.APIWebSocketHandler(api.websocketNotificationAck)) } func ping(req *model.WebSocketRequest) (map[string]any, *model.AppError) { diff --git a/server/public/model/websocket_message.go b/server/public/model/websocket_message.go index 507fc5c77f..dfa03f374c 100644 --- a/server/public/model/websocket_message.go +++ b/server/public/model/websocket_message.go @@ -87,12 +87,12 @@ const ( WebsocketEventAcknowledgementRemoved WebsocketEventType = "post_acknowledgement_removed" WebsocketEventPersistentNotificationTriggered WebsocketEventType = "persistent_notification_triggered" WebsocketEventHostedCustomerSignupProgressUpdated WebsocketEventType = "hosted_customer_signup_progress_updated" - WebsocketEventChannelBookmarkCreated = "channel_bookmark_created" - WebsocketEventChannelBookmarkUpdated = "channel_bookmark_updated" - WebsocketEventChannelBookmarkDeleted = "channel_bookmark_deleted" - WebsocketEventChannelBookmarkSorted = "channel_bookmark_sorted" + WebsocketEventChannelBookmarkCreated WebsocketEventType = "channel_bookmark_created" + WebsocketEventChannelBookmarkUpdated WebsocketEventType = "channel_bookmark_updated" + WebsocketEventChannelBookmarkDeleted WebsocketEventType = "channel_bookmark_deleted" + WebsocketEventChannelBookmarkSorted WebsocketEventType = "channel_bookmark_sorted" WebsocketPresenceIndicator WebsocketEventType = "presence" - WebsocketPostedNotifyAck = "posted_notify_ack" + WebsocketPostedNotifyAck WebsocketEventType = "posted_notify_ack" ) type WebSocketMessage interface {