diff options
| author | George Goldberg <george@gberg.me> | 2017-09-25 13:25:43 +0100 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-09-25 08:25:43 -0400 |
| commit | d6b5b681ae30d8d4a873e84728009218ddc59a20 (patch) | |
| tree | 879a45c1694c108d557ab12adcd6af1a068dedf2 /app | |
| parent | cff0c941f26ddec30dbbddf18df425b672d47bc7 (diff) | |
| download | chat-d6b5b681ae30d8d4a873e84728009218ddc59a20.tar.gz chat-d6b5b681ae30d8d4a873e84728009218ddc59a20.tar.bz2 chat-d6b5b681ae30d8d4a873e84728009218ddc59a20.zip | |
Finally do away with NewLocAppError function. (#7498)
This cleans up the few NewLocAppError calls that crept in since the main
bulk of them were removed, and finally removes the NewLocAppError
function altogether.
Diffstat (limited to 'app')
| -rw-r--r-- | app/file.go | 3 | ||||
| -rw-r--r-- | app/post.go | 2 | ||||
| -rw-r--r-- | app/webhook.go | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/app/file.go b/app/file.go index 832ff77d4..36a23e3d8 100644 --- a/app/file.go +++ b/app/file.go @@ -309,8 +309,7 @@ func (a *App) DoUploadFile(now time.Time, teamId string, channelId string, userI if info.IsImage() { // Check dimensions before loading the whole thing into memory later on if info.Width*info.Height > MaxImageSize { - err := model.NewLocAppError("uploadFile", "api.file.upload_file.large_image.app_error", map[string]interface{}{"Filename": filename}, "") - err.StatusCode = http.StatusBadRequest + err := model.NewAppError("uploadFile", "api.file.upload_file.large_image.app_error", map[string]interface{}{"Filename": filename}, "", http.StatusBadRequest) return nil, err } diff --git a/app/post.go b/app/post.go index feb024fb1..e81af4673 100644 --- a/app/post.go +++ b/app/post.go @@ -114,7 +114,7 @@ func (a *App) CreatePost(post *model.Post, channel *model.Channel, triggerWebhoo !post.IsSystemMessage() && channel.Name == model.DEFAULT_CHANNEL && !CheckIfRolesGrantPermission(user.GetRoles(), model.PERMISSION_MANAGE_SYSTEM.Id) { - return nil, model.NewLocAppError("createPost", "api.post.create_post.town_square_read_only", nil, "") + return nil, model.NewAppError("createPost", "api.post.create_post.town_square_read_only", nil, "", http.StatusForbidden) } // Verify the parent/child relationships are correct diff --git a/app/webhook.go b/app/webhook.go index 04887f203..380839cdc 100644 --- a/app/webhook.go +++ b/app/webhook.go @@ -522,7 +522,7 @@ func (a *App) HandleIncomingWebhook(hookId string, req *model.IncomingWebhookReq if utils.IsLicensed() && *utils.Cfg.TeamSettings.ExperimentalTownSquareIsReadOnly && channel.Name == model.DEFAULT_CHANNEL { - return model.NewLocAppError("HandleIncomingWebhook", "api.post.create_post.town_square_read_only", nil, "") + return model.NewAppError("HandleIncomingWebhook", "api.post.create_post.town_square_read_only", nil, "", http.StatusForbidden) } if channel.Type != model.CHANNEL_OPEN && !a.HasPermissionToChannel(hook.UserId, channel.Id, model.PERMISSION_READ_CHANNEL) { |