diff options
| author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2017-07-27 10:16:16 +0200 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-07-27 09:16:16 +0100 |
| commit | 3043b5d52a0192f4e9f1574de42ca9c23a725093 (patch) | |
| tree | de393635c3024f583535df906bb216d74fc4cca2 /model/incoming_webhook.go | |
| parent | ff0a7905166e29ecf9404fa90d23af7863885384 (diff) | |
| download | chat-3043b5d52a0192f4e9f1574de42ca9c23a725093.tar.gz chat-3043b5d52a0192f4e9f1574de42ca9c23a725093.tar.bz2 chat-3043b5d52a0192f4e9f1574de42ca9c23a725093.zip | |
Migrate add and edit incoming webhook components to redux (#6885)
* Migrate add incoming webhook components to redux
* Migrate edit incoming webhook components to redux
* Add tests
Diffstat (limited to 'model/incoming_webhook.go')
| -rw-r--r-- | model/incoming_webhook.go | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/model/incoming_webhook.go b/model/incoming_webhook.go index 4ebc7e8b1..de58093ff 100644 --- a/model/incoming_webhook.go +++ b/model/incoming_webhook.go @@ -7,6 +7,7 @@ import ( "bytes" "encoding/json" "io" + "net/http" "regexp" ) @@ -79,35 +80,36 @@ func IncomingWebhookListFromJson(data io.Reader) []*IncomingWebhook { func (o *IncomingWebhook) IsValid() *AppError { if len(o.Id) != 26 { - return NewLocAppError("IncomingWebhook.IsValid", "model.incoming_hook.id.app_error", nil, "") + return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.id.app_error", nil, "", http.StatusBadRequest) + } if o.CreateAt == 0 { - return NewLocAppError("IncomingWebhook.IsValid", "model.incoming_hook.create_at.app_error", nil, "id="+o.Id) + return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.create_at.app_error", nil, "id="+o.Id, http.StatusBadRequest) } if o.UpdateAt == 0 { - return NewLocAppError("IncomingWebhook.IsValid", "model.incoming_hook.update_at.app_error", nil, "id="+o.Id) + return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.update_at.app_error", nil, "id="+o.Id, http.StatusBadRequest) } if len(o.UserId) != 26 { - return NewLocAppError("IncomingWebhook.IsValid", "model.incoming_hook.user_id.app_error", nil, "") + return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.user_id.app_error", nil, "", http.StatusBadRequest) } if len(o.ChannelId) != 26 { - return NewLocAppError("IncomingWebhook.IsValid", "model.incoming_hook.channel_id.app_error", nil, "") + return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.channel_id.app_error", nil, "", http.StatusBadRequest) } if len(o.TeamId) != 26 { - return NewLocAppError("IncomingWebhook.IsValid", "model.incoming_hook.team_id.app_error", nil, "") + return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.team_id.app_error", nil, "", http.StatusBadRequest) } if len(o.DisplayName) > 64 { - return NewLocAppError("IncomingWebhook.IsValid", "model.incoming_hook.display_name.app_error", nil, "") + return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.display_name.app_error", nil, "", http.StatusBadRequest) } if len(o.Description) > 128 { - return NewLocAppError("IncomingWebhook.IsValid", "model.incoming_hook.description.app_error", nil, "") + return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.description.app_error", nil, "", http.StatusBadRequest) } return nil |