summaryrefslogtreecommitdiffstats
path: root/model/websocket_request.go
diff options
context:
space:
mode:
Diffstat (limited to 'model/websocket_request.go')
-rw-r--r--model/websocket_request.go19
1 files changed, 5 insertions, 14 deletions
diff --git a/model/websocket_request.go b/model/websocket_request.go
index 7dc0b4335..4da626e23 100644
--- a/model/websocket_request.go
+++ b/model/websocket_request.go
@@ -23,21 +23,12 @@ type WebSocketRequest struct {
}
func (o *WebSocketRequest) ToJson() string {
- b, err := json.Marshal(o)
- if err != nil {
- return ""
- } else {
- return string(b)
- }
+ b, _ := json.Marshal(o)
+ return string(b)
}
func WebSocketRequestFromJson(data io.Reader) *WebSocketRequest {
- decoder := json.NewDecoder(data)
- var o WebSocketRequest
- err := decoder.Decode(&o)
- if err == nil {
- return &o
- } else {
- return nil
- }
+ var o *WebSocketRequest
+ json.NewDecoder(data).Decode(&o)
+ return o
}