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