From f758f9ff3a617dd5939e1e7851fdbe10d03cd5a8 Mon Sep 17 00:00:00 2001
From: Carlos Tadeu Panato Junior <ctadeu@gmail.com>
Date: Thu, 20 Apr 2017 17:14:15 +0200
Subject: [APIV4] GET /emoji/{emoji_id}/image for apiV4 (#6141)

* implement GET /emoji/{emoji_id}/image for apiV4

* update per request
---
 api/emoji.go | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

(limited to 'api')

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 {
-- 
cgit v1.2.3-1-g7c22