diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-09-30 11:06:30 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-30 11:06:30 -0400 |
commit | 8a0e649f989a824bb3bbfd1900a5b8e5383b47e1 (patch) | |
tree | 4b424929fe13ebec438d2f41a2729e37e5160720 /api/auto_posts.go | |
parent | a2deeed597dea15d9b7ca237be71988469f58cdd (diff) | |
download | chat-8a0e649f989a824bb3bbfd1900a5b8e5383b47e1.tar.gz chat-8a0e649f989a824bb3bbfd1900a5b8e5383b47e1.tar.bz2 chat-8a0e649f989a824bb3bbfd1900a5b8e5383b47e1.zip |
PLT-3105 Files table migration (#4068)
* Implemented initial changes for files table
* Removed *_benchmark_test.go files
* Re-implemented GetPublicFile and added support for old path
* Localization for files table
* Moved file system code into utils package
* Finished server-side changes and added initial upgrade script
* Added getPostFiles api
* Re-add Extension and HasPreviewImage fields to FileInfo
* Removed unused translation
* Fixed merge conflicts left over after permissions changes
* Forced FileInfo.extension to be lower case
* Changed FileUploadResponse to contain the FileInfos instead of FileIds
* Fixed permissions on getFile* calls
* Fixed notifications for file uploads
* Added initial version of client code for files changes
* Permanently added FileIds field to Post object and removed Post.HasFiles
* Updated PostStore.Update to be usable in more circumstances
* Re-added Filenames field and switched file migration to be entirely lazy-loaded
* Increased max listener count for FileStore
* Removed unused fileInfoCache
* Moved file system code back into api
* Removed duplicate test case
* Fixed unit test running on ports other than 8065
* Renamed HasPermissionToPostContext to HasPermissionToChannelByPostContext
* Refactored handleImages to make it more easily understandable
* Renamed getPostFiles to getFileInfosForPost
* Re-added pre-FileIds posts to analytics
* Changed files to be saved as their ids as opposed to id/filename.ext
* Renamed FileInfo.UserId to FileInfo.CreatorId
* Fixed detection of language in CodePreview
* Fixed switching between threads in the RHS not loading new files
* Add serverside protection against a rare bug where the client sends the same file twice for a single post
* Refactored the important parts of uploadFile api call into a function that can be called without a web context
Diffstat (limited to 'api/auto_posts.go')
-rw-r--r-- | api/auto_posts.go | 37 |
1 files changed, 7 insertions, 30 deletions
diff --git a/api/auto_posts.go b/api/auto_posts.go index 2e26e513b..6b1207c10 100644 --- a/api/auto_posts.go +++ b/api/auto_posts.go @@ -8,7 +8,6 @@ import ( "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" "io" - "mime/multipart" "os" ) @@ -40,53 +39,31 @@ func NewAutoPostCreator(client *model.Client, channelid string) *AutoPostCreator } func (cfg *AutoPostCreator) UploadTestFile() ([]string, bool) { - body := &bytes.Buffer{} - writer := multipart.NewWriter(body) - filename := cfg.ImageFilenames[utils.RandIntFromRange(utils.Range{0, len(cfg.ImageFilenames) - 1})] - part, err := writer.CreateFormFile("files", filename) - if err != nil { - return nil, false - } - path := utils.FindDir("web/static/images") file, err := os.Open(path + "/" + filename) defer file.Close() - _, err = io.Copy(part, file) - if err != nil { - return nil, false - } - - field, err := writer.CreateFormField("channel_id") - if err != nil { - return nil, false - } - - _, err = field.Write([]byte(cfg.channelid)) - if err != nil { - return nil, false - } - - err = writer.Close() + data := &bytes.Buffer{} + _, err = io.Copy(data, file) if err != nil { return nil, false } - resp, appErr := cfg.client.UploadPostAttachment(body.Bytes(), writer.FormDataContentType()) + resp, appErr := cfg.client.UploadPostAttachment(data.Bytes(), cfg.channelid, filename) if appErr != nil { return nil, false } - return resp.Data.(*model.FileUploadResponse).Filenames, true + return []string{resp.FileInfos[0].Id}, true } func (cfg *AutoPostCreator) CreateRandomPost() (*model.Post, bool) { - var filenames []string + var fileIds []string if cfg.HasImage { var err1 bool - filenames, err1 = cfg.UploadTestFile() + fileIds, err1 = cfg.UploadTestFile() if err1 == false { return nil, false } @@ -102,7 +79,7 @@ func (cfg *AutoPostCreator) CreateRandomPost() (*model.Post, bool) { post := &model.Post{ ChannelId: cfg.channelid, Message: postText, - Filenames: filenames} + FileIds: fileIds} result, err2 := cfg.client.CreatePost(post) if err2 != nil { return nil, false |