From 1bd19f006d11651413fe584e4fa0d953e8b12a2f Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Fri, 7 Apr 2017 19:05:14 +0200 Subject: implement GET /emoji for apiV4 (#6007) --- api/emoji.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'api') 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))) } } -- cgit v1.2.3-1-g7c22