1 files changed, 40 insertions, 61 deletions

diff --git a/vendor/github.com/mattermost/platform/model/websocket_message.go b/vendor/github.com/mattermost/platform/model/websocket_message.go
index 23820470..6b8c0342 100644
--- a/vendor/github.com/mattermost/platform/model/websocket_message.go
+++ b/vendor/github.com/mattermost/platform/model/websocket_message.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
+// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
 package model
@@ -9,35 +9,41 @@ import (
 )
 
 const (
-	WEBSOCKET_EVENT_TYPING             = "typing"
-	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_CREATED    = "channel_created"
-	WEBSOCKET_EVENT_DIRECT_ADDED       = "direct_added"
-	WEBSOCKET_EVENT_GROUP_ADDED        = "group_added"
-	WEBSOCKET_EVENT_NEW_USER           = "new_user"
-	WEBSOCKET_EVENT_LEAVE_TEAM         = "leave_team"
-	WEBSOCKET_EVENT_UPDATE_TEAM        = "update_team"
-	WEBSOCKET_EVENT_USER_ADDED         = "user_added"
-	WEBSOCKET_EVENT_USER_UPDATED       = "user_updated"
-	WEBSOCKET_EVENT_USER_REMOVED       = "user_removed"
-	WEBSOCKET_EVENT_PREFERENCE_CHANGED = "preference_changed"
-	WEBSOCKET_EVENT_EPHEMERAL_MESSAGE  = "ephemeral_message"
-	WEBSOCKET_EVENT_STATUS_CHANGE      = "status_change"
-	WEBSOCKET_EVENT_HELLO              = "hello"
-	WEBSOCKET_EVENT_WEBRTC             = "webrtc"
-	WEBSOCKET_AUTHENTICATION_CHALLENGE = "authentication_challenge"
-	WEBSOCKET_EVENT_REACTION_ADDED     = "reaction_added"
-	WEBSOCKET_EVENT_REACTION_REMOVED   = "reaction_removed"
+	WEBSOCKET_EVENT_TYPING              = "typing"
+	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_CREATED     = "channel_created"
+	WEBSOCKET_EVENT_CHANNEL_UPDATED     = "channel_updated"
+	WEBSOCKET_EVENT_DIRECT_ADDED        = "direct_added"
+	WEBSOCKET_EVENT_GROUP_ADDED         = "group_added"
+	WEBSOCKET_EVENT_NEW_USER            = "new_user"
+	WEBSOCKET_EVENT_ADDED_TO_TEAM       = "added_to_team"
+	WEBSOCKET_EVENT_LEAVE_TEAM          = "leave_team"
+	WEBSOCKET_EVENT_UPDATE_TEAM         = "update_team"
+	WEBSOCKET_EVENT_USER_ADDED          = "user_added"
+	WEBSOCKET_EVENT_USER_UPDATED        = "user_updated"
+	WEBSOCKET_EVENT_MEMBERROLE_UPDATED  = "memberrole_updated"
+	WEBSOCKET_EVENT_USER_REMOVED        = "user_removed"
+	WEBSOCKET_EVENT_PREFERENCE_CHANGED  = "preference_changed"
+	WEBSOCKET_EVENT_PREFERENCES_CHANGED = "preferences_changed"
+	WEBSOCKET_EVENT_PREFERENCES_DELETED = "preferences_deleted"
+	WEBSOCKET_EVENT_EPHEMERAL_MESSAGE   = "ephemeral_message"
+	WEBSOCKET_EVENT_STATUS_CHANGE       = "status_change"
+	WEBSOCKET_EVENT_HELLO               = "hello"
+	WEBSOCKET_EVENT_WEBRTC              = "webrtc"
+	WEBSOCKET_AUTHENTICATION_CHALLENGE  = "authentication_challenge"
+	WEBSOCKET_EVENT_REACTION_ADDED      = "reaction_added"
+	WEBSOCKET_EVENT_REACTION_REMOVED    = "reaction_removed"
+	WEBSOCKET_EVENT_RESPONSE            = "response"
+	WEBSOCKET_EVENT_EMOJI_ADDED         = "emoji_added"
+	WEBSOCKET_EVENT_CHANNEL_VIEWED      = "channel_viewed"
 )
 
 type WebSocketMessage interface {
 	ToJson() string
 	IsValid() bool
-	DoPreComputeJson()
-	GetPreComputeJson() []byte
 	EventType() string
 }
 
@@ -49,10 +55,10 @@ type WebsocketBroadcast struct {
 }
 
 type WebSocketEvent struct {
-	Event          string                 `json:"event"`
-	Data           map[string]interface{} `json:"data"`
-	Broadcast      *WebsocketBroadcast    `json:"broadcast"`
-	PreComputeJson []byte                 `json:"-"`
+	Event     string                 `json:"event"`
+	Data      map[string]interface{} `json:"data"`
+	Broadcast *WebsocketBroadcast    `json:"broadcast"`
+	Sequence  int64                  `json:"seq"`
 }
 
 func (m *WebSocketEvent) Add(key string, value interface{}) {
@@ -72,19 +78,6 @@ func (o *WebSocketEvent) EventType() string {
 	return o.Event
 }
 
-func (o *WebSocketEvent) DoPreComputeJson() {
-	b, err := json.Marshal(o)
-	if err != nil {
-		o.PreComputeJson = []byte("")
-	} else {
-		o.PreComputeJson = b
-	}
-}
-
-func (o *WebSocketEvent) GetPreComputeJson() []byte {
-	return o.PreComputeJson
-}
-
 func (o *WebSocketEvent) ToJson() string {
 	b, err := json.Marshal(o)
 	if err != nil {
@@ -106,11 +99,10 @@ func WebSocketEventFromJson(data io.Reader) *WebSocketEvent {
 }
 
 type WebSocketResponse struct {
-	Status         string                 `json:"status"`
-	SeqReply       int64                  `json:"seq_reply,omitempty"`
-	Data           map[string]interface{} `json:"data,omitempty"`
-	Error          *AppError              `json:"error,omitempty"`
-	PreComputeJson []byte                 `json:"-"`
+	Status   string                 `json:"status"`
+	SeqReply int64                  `json:"seq_reply,omitempty"`
+	Data     map[string]interface{} `json:"data,omitempty"`
+	Error    *AppError              `json:"error,omitempty"`
 }
 
 func (m *WebSocketResponse) Add(key string, value interface{}) {
@@ -130,7 +122,7 @@ func (o *WebSocketResponse) IsValid() bool {
 }
 
 func (o *WebSocketResponse) EventType() string {
-	return ""
+	return WEBSOCKET_EVENT_RESPONSE
 }
 
 func (o *WebSocketResponse) ToJson() string {
@@ -142,19 +134,6 @@ func (o *WebSocketResponse) ToJson() string {
 	}
 }
 
-func (o *WebSocketResponse) DoPreComputeJson() {
-	b, err := json.Marshal(o)
-	if err != nil {
-		o.PreComputeJson = []byte("")
-	} else {
-		o.PreComputeJson = b
-	}
-}
-
-func (o *WebSocketResponse) GetPreComputeJson() []byte {
-	return o.PreComputeJson
-}
-
 func WebSocketResponseFromJson(data io.Reader) *WebSocketResponse {
 	decoder := json.NewDecoder(data)
 	var o WebSocketResponse