MM-15035: Read from file infos from master on post creation (#10899)
* MM-15035: Read from file infos from master on post creation * Handling edit post cases for get files metadata
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
e59674cfdd
Коммит
87ff64ea6d
@@ -45,7 +45,7 @@ func (a *App) PreparePostListForClient(originalList *model.PostList) *model.Post
|
||||
}
|
||||
|
||||
for id, originalPost := range originalList.Posts {
|
||||
post := a.PreparePostForClient(originalPost, false)
|
||||
post := a.PreparePostForClient(originalPost, false, false)
|
||||
|
||||
list.Posts[id] = post
|
||||
}
|
||||
@@ -53,7 +53,7 @@ func (a *App) PreparePostListForClient(originalList *model.PostList) *model.Post
|
||||
return list
|
||||
}
|
||||
|
||||
func (a *App) PreparePostForClient(originalPost *model.Post, isNewPost bool) *model.Post {
|
||||
func (a *App) PreparePostForClient(originalPost *model.Post, isNewPost bool, isEditPost bool) *model.Post {
|
||||
post := originalPost.Clone()
|
||||
|
||||
// Proxy image links before constructing metadata so that requests go through the proxy
|
||||
@@ -74,7 +74,7 @@ func (a *App) PreparePostForClient(originalPost *model.Post, isNewPost bool) *mo
|
||||
}
|
||||
|
||||
// Files
|
||||
if fileInfos, err := a.getFileMetadataForPost(post); err != nil {
|
||||
if fileInfos, err := a.getFileMetadataForPost(post, isNewPost || isEditPost); err != nil {
|
||||
mlog.Warn("Failed to get files for a post", mlog.String("post_id", post.Id), mlog.Err(err))
|
||||
} else {
|
||||
post.Metadata.Files = fileInfos
|
||||
@@ -96,12 +96,12 @@ func (a *App) PreparePostForClient(originalPost *model.Post, isNewPost bool) *mo
|
||||
return post
|
||||
}
|
||||
|
||||
func (a *App) getFileMetadataForPost(post *model.Post) ([]*model.FileInfo, *model.AppError) {
|
||||
func (a *App) getFileMetadataForPost(post *model.Post, fromMaster bool) ([]*model.FileInfo, *model.AppError) {
|
||||
if len(post.FileIds) == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
return a.GetFileInfosForPost(post.Id)
|
||||
return a.GetFileInfosForPost(post.Id, fromMaster)
|
||||
}
|
||||
|
||||
func (a *App) getEmojisAndReactionsForPost(post *model.Post) ([]*model.Emoji, []*model.Reaction, *model.AppError) {
|
||||
|
||||
Ссылка в новой задаче
Block a user