summaryrefslogtreecommitdiffstats
path: root/model/websocket_message.go
diff options
context:
space:
mode:
authorMartin Kraft <martinkraft@gmail.com>2018-05-28 10:35:27 -0400
committerMartin Kraft <martinkraft@gmail.com>2018-05-28 10:35:27 -0400
commitc180cdbd1cba584c6e74cae7042de2290b51feb6 (patch)
tree19002d12a212d0bcc0e09d31410df548b93d77ef /model/websocket_message.go
parent7225abddeefb569f1f2da739211d7797b63814a2 (diff)
parentc37d153ffb276e501660133de836a61eec25e544 (diff)
downloadchat-c180cdbd1cba584c6e74cae7042de2290b51feb6.tar.gz
chat-c180cdbd1cba584c6e74cae7042de2290b51feb6.tar.bz2
chat-c180cdbd1cba584c6e74cae7042de2290b51feb6.zip
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'model/websocket_message.go')
-rw-r--r--model/websocket_message.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/model/websocket_message.go b/model/websocket_message.go
index 071975d6c..31b16d1a7 100644
--- a/model/websocket_message.go
+++ b/model/websocket_message.go
@@ -14,8 +14,9 @@ const (
WEBSOCKET_EVENT_POSTED = "posted"
WEBSOCKET_EVENT_POST_EDITED = "post_edited"
WEBSOCKET_EVENT_POST_DELETED = "post_deleted"
- WEBSOCKET_EVENT_CHANNEL_DELETED = "channel_deleted"
+ WEBSOCKET_EVENT_CHANNEL_CONVERTED = "channel_converted"
WEBSOCKET_EVENT_CHANNEL_CREATED = "channel_created"
+ WEBSOCKET_EVENT_CHANNEL_DELETED = "channel_deleted"
WEBSOCKET_EVENT_CHANNEL_UPDATED = "channel_updated"
WEBSOCKET_EVENT_CHANNEL_MEMBER_UPDATED = "channel_member_updated"
WEBSOCKET_EVENT_DIRECT_ADDED = "direct_added"