diff options
| author | Chris <ccbrown112@gmail.com> | 2017-11-16 15:04:27 -0600 |
|---|---|---|
| committer | Jonathan <jonfritz@gmail.com> | 2017-11-16 16:04:27 -0500 |
| commit | eb1a00ef5f93b19c2d49b26de057ee2c51c09e45 (patch) | |
| tree | e63afa695283e15c5cd9ee2a437d74024dcc5c20 /api4/file.go | |
| parent | ef69d93abfb192bc7a2416f3cf2622d99fd27dd5 (diff) | |
| download | chat-eb1a00ef5f93b19c2d49b26de057ee2c51c09e45.tar.gz chat-eb1a00ef5f93b19c2d49b26de057ee2c51c09e45.tar.bz2 chat-eb1a00ef5f93b19c2d49b26de057ee2c51c09e45.zip | |
Reorganize file util functionality (#7848)
* reorganize file util functionality
* fix api test compilation
* fix rebase issue
Diffstat (limited to 'api4/file.go')
| -rw-r--r-- | api4/file.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/api4/file.go b/api4/file.go index 883d4f3c8..7e13d0290 100644 --- a/api4/file.go +++ b/api4/file.go @@ -123,7 +123,7 @@ func getFile(c *Context, w http.ResponseWriter, r *http.Request) { return } - data, err := utils.ReadFile(info.Path) + data, err := c.App.ReadFile(info.Path) if err != nil { c.Err = err c.Err.StatusCode = http.StatusNotFound @@ -164,7 +164,7 @@ func getFileThumbnail(c *Context, w http.ResponseWriter, r *http.Request) { return } - if data, err := utils.ReadFile(info.ThumbnailPath); err != nil { + if data, err := c.App.ReadFile(info.ThumbnailPath); err != nil { c.Err = err c.Err.StatusCode = http.StatusNotFound } else if err := writeFileResponse(info.Name, THUMBNAIL_IMAGE_TYPE, data, forceDownload, w, r); err != nil { @@ -233,7 +233,7 @@ func getFilePreview(c *Context, w http.ResponseWriter, r *http.Request) { return } - if data, err := utils.ReadFile(info.PreviewPath); err != nil { + if data, err := c.App.ReadFile(info.PreviewPath); err != nil { c.Err = err c.Err.StatusCode = http.StatusNotFound } else if err := writeFileResponse(info.Name, PREVIEW_IMAGE_TYPE, data, forceDownload, w, r); err != nil { @@ -294,7 +294,7 @@ func getPublicFile(c *Context, w http.ResponseWriter, r *http.Request) { return } - if data, err := utils.ReadFile(info.Path); err != nil { + if data, err := c.App.ReadFile(info.Path); err != nil { c.Err = err c.Err.StatusCode = http.StatusNotFound } else if err := writeFileResponse(info.Name, info.MimeType, data, true, w, r); err != nil { |