diff options
author | George Goldberg <george@gberg.me> | 2018-02-06 17:25:53 +0000 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2018-02-06 17:25:53 +0000 |
commit | 7941c30117efe1b957ac0458c2f0479e3824196d (patch) | |
tree | df791632a9dc790a6f73dec53aae3ba919ebda63 /model/websocket_message.go | |
parent | e1cd64613591cf5a990442a69ebf188258bd0cb5 (diff) | |
parent | 034dbc07e3068c482e654b6a1a8fcbe4b01c44f3 (diff) | |
download | chat-7941c30117efe1b957ac0458c2f0479e3824196d.tar.gz chat-7941c30117efe1b957ac0458c2f0479e3824196d.tar.bz2 chat-7941c30117efe1b957ac0458c2f0479e3824196d.zip |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'model/websocket_message.go')
-rw-r--r-- | model/websocket_message.go | 39 |
1 files changed, 11 insertions, 28 deletions
diff --git a/model/websocket_message.go b/model/websocket_message.go index d0e8cb039..a1427e196 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" @@ -83,23 +84,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 { @@ -130,21 +122,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 } |