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/analytics_row.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/analytics_row.go')
-rw-r--r-- | model/analytics_row.go | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/model/analytics_row.go b/model/analytics_row.go index 5493163dc..4615bb792 100644 --- a/model/analytics_row.go +++ b/model/analytics_row.go @@ -16,23 +16,14 @@ type AnalyticsRow struct { type AnalyticsRows []*AnalyticsRow func (me *AnalyticsRow) ToJson() string { - b, err := json.Marshal(me) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(me) + return string(b) } func AnalyticsRowFromJson(data io.Reader) *AnalyticsRow { - decoder := json.NewDecoder(data) - var me AnalyticsRow - err := decoder.Decode(&me) - if err == nil { - return &me - } else { - return nil - } + var me *AnalyticsRow + json.NewDecoder(data).Decode(&me) + return me } func (me AnalyticsRows) ToJson() string { @@ -44,12 +35,7 @@ func (me AnalyticsRows) ToJson() string { } func AnalyticsRowsFromJson(data io.Reader) AnalyticsRows { - decoder := json.NewDecoder(data) var me AnalyticsRows - err := decoder.Decode(&me) - if err == nil { - return me - } else { - return nil - } + json.NewDecoder(data).Decode(&me) + return me } |