diff options
author | Joram Wilander <jwawilander@gmail.com> | 2018-01-23 11:04:44 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2018-01-23 08:04:44 -0800 |
commit | 4f4a765e7d0bbfdfecc0c52ae4be35f8d3b737ca (patch) | |
tree | 063aa55db9299f09d4176b201db658f1d7acced5 /app/emoji.go | |
parent | 599991ea731953f772824ce3ed1e591246aa004f (diff) | |
download | chat-4f4a765e7d0bbfdfecc0c52ae4be35f8d3b737ca.tar.gz chat-4f4a765e7d0bbfdfecc0c52ae4be35f8d3b737ca.tar.bz2 chat-4f4a765e7d0bbfdfecc0c52ae4be35f8d3b737ca.zip |
ABC-90 Add POST /emoji/search and GET /emoji/autocomplete API endpoints (#8125)
* Add POST /emoji/search and GET /emoji/autocomplete API endpoints
* Add constant to be clearer
Diffstat (limited to 'app/emoji.go')
-rw-r--r-- | app/emoji.go | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/app/emoji.go b/app/emoji.go index 2786af9c9..2271d650d 100644 --- a/app/emoji.go +++ b/app/emoji.go @@ -134,11 +134,11 @@ func (a *App) DeleteEmoji(emoji *model.Emoji) *model.AppError { func (a *App) GetEmoji(emojiId string) (*model.Emoji, *model.AppError) { if !*a.Config().ServiceSettings.EnableCustomEmoji { - return nil, model.NewAppError("deleteEmoji", "api.emoji.disabled.app_error", nil, "", http.StatusNotImplemented) + return nil, model.NewAppError("GetEmoji", "api.emoji.disabled.app_error", nil, "", http.StatusNotImplemented) } if len(*a.Config().FileSettings.DriverName) == 0 { - return nil, model.NewAppError("deleteImage", "api.emoji.storage.app_error", nil, "", http.StatusNotImplemented) + return nil, model.NewAppError("GetEmoji", "api.emoji.storage.app_error", nil, "", http.StatusNotImplemented) } if result := <-a.Srv.Store.Emoji().Get(emojiId, false); result.Err != nil { @@ -169,6 +169,18 @@ func (a *App) GetEmojiImage(emojiId string) (imageByte []byte, imageType string, } } +func (a *App) SearchEmoji(name string, prefixOnly bool, limit int) ([]*model.Emoji, *model.AppError) { + if !*a.Config().ServiceSettings.EnableCustomEmoji { + return nil, model.NewAppError("SearchEmoji", "api.emoji.disabled.app_error", nil, "", http.StatusNotImplemented) + } + + if result := <-a.Srv.Store.Emoji().Search(name, prefixOnly, limit); result.Err != nil { + return nil, result.Err + } else { + return result.Data.([]*model.Emoji), nil + } +} + func resizeEmojiGif(gifImg *gif.GIF) *gif.GIF { // Create a new RGBA image to hold the incremental frames. firstFrame := gifImg.Image[0].Bounds() |