diff options
| author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2017-04-07 19:05:14 +0200 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2017-04-07 10:05:14 -0700 |
| commit | 1bd19f006d11651413fe584e4fa0d953e8b12a2f (patch) | |
| tree | ce1e567eb4834d8fbdafd50a4b1bfbeeade36dff /api | |
| parent | 08a469a00637de3768b63bccc86fe0b62f3a90bf (diff) | |
| download | chat-1bd19f006d11651413fe584e4fa0d953e8b12a2f.tar.gz chat-1bd19f006d11651413fe584e4fa0d953e8b12a2f.tar.bz2 chat-1bd19f006d11651413fe584e4fa0d953e8b12a2f.zip | |
implement GET /emoji for apiV4 (#6007)
Diffstat (limited to 'api')
| -rw-r--r-- | api/emoji.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/api/emoji.go b/api/emoji.go index 267644fc0..c2719c562 100644 --- a/api/emoji.go +++ b/api/emoji.go @@ -37,12 +37,12 @@ func getEmoji(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-app.Srv.Store.Emoji().GetAll(); result.Err != nil { - c.Err = result.Err + listEmoji, err := app.GetEmojiList() + if err != nil { + c.Err = err return } else { - emoji := result.Data.([]*model.Emoji) - w.Write([]byte(model.EmojiListToJson(emoji))) + w.Write([]byte(model.EmojiListToJson(listEmoji))) } } |