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/data_retention_policy.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/data_retention_policy.go')
| -rw-r--r-- | model/data_retention_policy.go | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/model/data_retention_policy.go b/model/data_retention_policy.go index 7284477e5..dbb13374d 100644 --- a/model/data_retention_policy.go +++ b/model/data_retention_policy.go @@ -16,21 +16,12 @@ type DataRetentionPolicy struct { } func (me *DataRetentionPolicy) ToJson() string { - b, err := json.Marshal(me) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(me) + return string(b) } func DataRetentionPolicyFromJson(data io.Reader) *DataRetentionPolicy { - decoder := json.NewDecoder(data) - var me DataRetentionPolicy - err := decoder.Decode(&me) - if err == nil { - return &me - } else { - return nil - } + var me *DataRetentionPolicy + json.NewDecoder(data).Decode(&me) + return me } |