diff options
author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2017-04-20 17:14:15 +0200 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-04-20 11:14:15 -0400 |
commit | f758f9ff3a617dd5939e1e7851fdbe10d03cd5a8 (patch) | |
tree | 5ad09ea76c124bcdb096d3f1329410b01a0dbd3a /api | |
parent | 55bbf15fc7a83d3cda1fe5bc037823cbbc4fc023 (diff) | |
download | chat-f758f9ff3a617dd5939e1e7851fdbe10d03cd5a8.tar.gz chat-f758f9ff3a617dd5939e1e7851fdbe10d03cd5a8.tar.bz2 chat-f758f9ff3a617dd5939e1e7851fdbe10d03cd5a8.zip |
[APIV4] GET /emoji/{emoji_id}/image for apiV4 (#6141)
* implement GET /emoji/{emoji_id}/image for apiV4
* update per request
Diffstat (limited to 'api')
-rw-r--r-- | api/emoji.go | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/api/emoji.go b/api/emoji.go index feb65877a..1a79cc536 100644 --- a/api/emoji.go +++ b/api/emoji.go @@ -4,7 +4,6 @@ package api import ( - "bytes" "image" "image/draw" "image/gif" @@ -190,28 +189,15 @@ func getEmojiImage(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-app.Srv.Store.Emoji().Get(id, true); result.Err != nil { - c.Err = result.Err + image, imageType, err := app.GetEmojiImage(id) + if err != nil { + c.Err = err return - } else { - var img []byte - - if data, err := app.ReadFile(getEmojiImagePath(id)); err != nil { - c.Err = model.NewLocAppError("getEmojiImage", "api.emoji.get_image.read.app_error", nil, err.Error()) - return - } else { - img = data - } - - if _, imageType, err := image.DecodeConfig(bytes.NewReader(img)); err != nil { - model.NewLocAppError("getEmojiImage", "api.emoji.get_image.decode.app_error", nil, err.Error()) - } else { - w.Header().Set("Content-Type", "image/"+imageType) - } - - w.Header().Set("Cache-Control", "max-age=2592000, public") - w.Write(img) } + + w.Header().Set("Content-Type", "image/"+imageType) + w.Header().Set("Cache-Control", "max-age=2592000, public") + w.Write(image) } func getEmojiImagePath(id string) string { |