diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-21 12:26:07 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-21 12:26:07 -0400 |
commit | 7d94eb1dcabea72712050d8a7059d7c7ee674f0c (patch) | |
tree | d0c94f4b1aa171776c53ac496b9c9f31e9d66945 /api/file.go | |
parent | 9553e44dc55e1798180a942e774e9b11f8b01d67 (diff) | |
parent | b9c637ec82d28684029573af119606575f4978d0 (diff) | |
download | chat-7d94eb1dcabea72712050d8a7059d7c7ee674f0c.tar.gz chat-7d94eb1dcabea72712050d8a7059d7c7ee674f0c.tar.bz2 chat-7d94eb1dcabea72712050d8a7059d7c7ee674f0c.zip |
Merge pull request #1098 from florianorben/PLT-616
PLT-616: Enable playing of animated GIF in thumbnails and preview
Diffstat (limited to 'api/file.go')
-rw-r--r-- | api/file.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/api/file.go b/api/file.go index 142ef7ac7..94eea516a 100644 --- a/api/file.go +++ b/api/file.go @@ -23,6 +23,7 @@ import ( "image/jpeg" "io" "io/ioutil" + "mime" "net/http" "net/url" "os" @@ -331,9 +332,18 @@ func getFileInfo(c *Context, w http.ResponseWriter, r *http.Request) { w.Header().Set("Cache-Control", "max-age=2592000, public") + var mimeType string + ext := filepath.Ext(filename) + if model.IsFileExtImage(ext) { + mimeType = model.GetImageMimeType(ext) + } else { + mimeType = mime.TypeByExtension(ext) + } + result := make(map[string]string) result["filename"] = filename result["size"] = size + result["mime"] = mimeType w.Write([]byte(model.MapToJson(result))) } |