diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-07-17 18:22:28 -0400 |
---|---|---|
committer | Saturnino Abril <saturnino.abril@gmail.com> | 2017-07-18 06:22:28 +0800 |
commit | 70bfcfb9d78f2aa07a36d24b092a477ca2b680ef (patch) | |
tree | d3127637743943704e481df2d7f7190b19fadd21 /app/post.go | |
parent | 9a23519d07664f252fe5a568034abf6b720511d0 (diff) | |
download | chat-70bfcfb9d78f2aa07a36d24b092a477ca2b680ef.tar.gz chat-70bfcfb9d78f2aa07a36d24b092a477ca2b680ef.tar.bz2 chat-70bfcfb9d78f2aa07a36d24b092a477ca2b680ef.zip |
Only apply never edit policy setting when message changes (#6947)
Diffstat (limited to 'app/post.go')
-rw-r--r-- | app/post.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/post.go b/app/post.go index 1e8c721ec..dd0b24bac 100644 --- a/app/post.go +++ b/app/post.go @@ -227,19 +227,19 @@ func SendEphemeralPost(teamId, userId string, post *model.Post) *model.Post { } func UpdatePost(post *model.Post, safeUpdate bool) (*model.Post, *model.AppError) { - if utils.IsLicensed { - if *utils.Cfg.ServiceSettings.AllowEditPost == model.ALLOW_EDIT_POST_NEVER { - err := model.NewAppError("UpdatePost", "api.post.update_post.permissions_denied.app_error", nil, "", http.StatusForbidden) - return nil, err - } - } - var oldPost *model.Post if result := <-Srv.Store.Post().Get(post.Id); result.Err != nil { return nil, result.Err } else { oldPost = result.Data.(*model.PostList).Posts[post.Id] + if utils.IsLicensed { + if *utils.Cfg.ServiceSettings.AllowEditPost == model.ALLOW_EDIT_POST_NEVER && post.Message != oldPost.Message { + err := model.NewAppError("UpdatePost", "api.post.update_post.permissions_denied.app_error", nil, "", http.StatusForbidden) + return nil, err + } + } + if oldPost == nil { err := model.NewAppError("UpdatePost", "api.post.update_post.find.app_error", nil, "id="+post.Id, http.StatusBadRequest) return nil, err |