diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-22 09:19:18 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-22 09:19:18 -0700 |
| commit | 54894e90ac705eab3bf0f34c8dd197bb0929feae (patch) | |
| tree | 2fd5c6bc1bdb8cef1ea6095e8f12f8fd73a52ce9 /api/file.go | |
| parent | c4c04e5f02253dfdfc2bd09e06955f1f5932ce18 (diff) | |
| parent | 649f42e3fc706f8fa829276bcdb825381bc703f2 (diff) | |
| download | chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.tar.gz chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.tar.bz2 chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.zip | |
Fixing merge conflict
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))) } |