From 0c8968fb8df4ce302c928118cd81e75f5bef2861 Mon Sep 17 00:00:00 2001
From: Chris <ccbrown112@gmail.com>
Date: Tue, 30 Jan 2018 17:23:00 -0600
Subject: unnamed return (#8170)

---
 model/websocket_message.go | 38 ++++++++++----------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

(limited to 'model/websocket_message.go')

diff --git a/model/websocket_message.go b/model/websocket_message.go
index bf2535dc3..0aab74865 100644
--- a/model/websocket_message.go
+++ b/model/websocket_message.go
@@ -82,23 +82,14 @@ func (o *WebSocketEvent) EventType() string {
 }
 
 func (o *WebSocketEvent) ToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return ""
-	} else {
-		return string(b)
-	}
+	b, _ := json.Marshal(o)
+	return string(b)
 }
 
 func WebSocketEventFromJson(data io.Reader) *WebSocketEvent {
-	decoder := json.NewDecoder(data)
-	var o WebSocketEvent
-	err := decoder.Decode(&o)
-	if err == nil {
-		return &o
-	} else {
-		return nil
-	}
+	var o *WebSocketEvent
+	json.NewDecoder(data).Decode(&o)
+	return o
 }
 
 type WebSocketResponse struct {
@@ -129,21 +120,12 @@ func (o *WebSocketResponse) EventType() string {
 }
 
 func (o *WebSocketResponse) ToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return ""
-	} else {
-		return string(b)
-	}
+	b, _ := json.Marshal(o)
+	return string(b)
 }
 
 func WebSocketResponseFromJson(data io.Reader) *WebSocketResponse {
-	decoder := json.NewDecoder(data)
-	var o WebSocketResponse
-	err := decoder.Decode(&o)
-	if err == nil {
-		return &o
-	} else {
-		return nil
-	}
+	var o *WebSocketResponse
+	json.NewDecoder(data).Decode(&o)
+	return o
 }
-- 
cgit v1.2.3-1-g7c22


From 5d7ae48841d7004c16ec516ec9f86312b9c6cae9 Mon Sep 17 00:00:00 2001
From: Saturnino Abril <saturnino.abril@gmail.com>
Date: Thu, 1 Feb 2018 22:46:24 +0800
Subject: [PLT-8494] Add delete_team websocket event (#8167)

* add delete_team websocket event

* add to PermanentDeleteTeam
---
 model/websocket_message.go | 1 +
 1 file changed, 1 insertion(+)

(limited to 'model/websocket_message.go')

diff --git a/model/websocket_message.go b/model/websocket_message.go
index 0aab74865..0256e400f 100644
--- a/model/websocket_message.go
+++ b/model/websocket_message.go
@@ -22,6 +22,7 @@ const (
 	WEBSOCKET_EVENT_ADDED_TO_TEAM       = "added_to_team"
 	WEBSOCKET_EVENT_LEAVE_TEAM          = "leave_team"
 	WEBSOCKET_EVENT_UPDATE_TEAM         = "update_team"
+	WEBSOCKET_EVENT_DELETE_TEAM         = "delete_team"
 	WEBSOCKET_EVENT_USER_ADDED          = "user_added"
 	WEBSOCKET_EVENT_USER_UPDATED        = "user_updated"
 	WEBSOCKET_EVENT_USER_ROLE_UPDATED   = "user_role_updated"
-- 
cgit v1.2.3-1-g7c22