diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-01-30 08:30:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-30 08:30:02 -0500 |
| commit | c01d9ad6cf3f8bb2ad4145441816598d8ffa2d9e (patch) | |
| tree | f995a08e296b5088df2a882ab70251c7b2b8cfe7 /app/file.go | |
| parent | 3e2f879b77b9b9d089bc8f83304b8b21b83c5bd9 (diff) | |
| download | chat-c01d9ad6cf3f8bb2ad4145441816598d8ffa2d9e.tar.gz chat-c01d9ad6cf3f8bb2ad4145441816598d8ffa2d9e.tar.bz2 chat-c01d9ad6cf3f8bb2ad4145441816598d8ffa2d9e.zip | |
Implement APIv4 infrastructure (#5191)
* Implement APIv4 infrastructure
* Update parameter requirement functions per feedback
Diffstat (limited to 'app/file.go')
| -rw-r--r-- | app/file.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/file.go b/app/file.go index a4419bde8..4ddf7ac2d 100644 --- a/app/file.go +++ b/app/file.go @@ -5,13 +5,13 @@ package app import ( "bytes" - _ "image/gif" "crypto/sha256" "encoding/base64" "fmt" "image" "image/color" "image/draw" + _ "image/gif" "image/jpeg" "io" "io/ioutil" @@ -24,9 +24,9 @@ import ( "sync" l4g "github.com/alecthomas/log4go" + "github.com/disintegration/imaging" "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" - "github.com/disintegration/imaging" s3 "github.com/minio/minio-go" "github.com/rwcarlsen/goexif/exif" _ "golang.org/x/image/bmp" @@ -359,7 +359,7 @@ func MigrateFilenamesToFileInfos(post *model.Post) []*model.FileInfo { func GeneratePublicLink(siteURL string, info *model.FileInfo) string { hash := GeneratePublicLinkHash(info.Id, *utils.Cfg.FileSettings.PublicLinkSalt) - return fmt.Sprintf("%s%s/public/files/%v/get?h=%s", siteURL, model.API_URL_SUFFIX, info.Id, hash) + return fmt.Sprintf("%s%s/public/files/%v/get?h=%s", siteURL, model.API_URL_SUFFIX_V3, info.Id, hash) } func GeneratePublicLinkHash(fileId, salt string) string { |