diff options
author | Chris <ccbrown112@gmail.com> | 2018-01-30 17:23:00 -0600 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2018-01-30 15:23:00 -0800 |
commit | 0c8968fb8df4ce302c928118cd81e75f5bef2861 (patch) | |
tree | b17a2ae5afc98f7ce3daaea10a165d9d647c47c5 /model/emoji_search.go | |
parent | ac2e42a480c5bba2e5128017218b0fa1bed8e836 (diff) | |
download | chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.tar.gz chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.tar.bz2 chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.zip |
unnamed return (#8170)
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 } |