diff options
| author | n1aba <n1aba.github@gmail.com> | 2018-09-04 14:24:41 +0300 |
|---|---|---|
| committer | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-09-04 13:24:41 +0200 |
| commit | 50af3a19a2817097355df9fd70c0fda0328d8bae (patch) | |
| tree | 3c7447b534336d887c1bb739015cb51bcfb75ccf /model | |
| parent | 30fa6eca69372223f67ab09db7fc639ff9f57264 (diff) | |
| download | chat-50af3a19a2817097355df9fd70c0fda0328d8bae.tar.gz chat-50af3a19a2817097355df9fd70c0fda0328d8bae.tar.bz2 chat-50af3a19a2817097355df9fd70c0fda0328d8bae.zip | |
MM-11703: Update incoming and outgoing webhook description to 500 characters (#9265)
* MM-11703: Update incoming and outgoing webhook description to 500 characters
* MM-11703: Add upgrade code
* MM-11703: Remove MAX_DESCRIPTION_LENGTH constants
* MM-11703: GOFMT
* MM-11703: Move upgrade code to version 5.3
* MM-11703: Comment back upgrade to 5.3.0
* MM-11703: Add API errors back
* MM-11703: Copy-Paste
Diffstat (limited to 'model')
| -rw-r--r-- | model/incoming_webhook.go | 2 | ||||
| -rw-r--r-- | model/incoming_webhook_test.go | 4 | ||||
| -rw-r--r-- | model/outgoing_webhook.go | 2 | ||||
| -rw-r--r-- | model/outgoing_webhook_test.go | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/model/incoming_webhook.go b/model/incoming_webhook.go index 1d6d7b4f0..3856d22ff 100644 --- a/model/incoming_webhook.go +++ b/model/incoming_webhook.go @@ -93,7 +93,7 @@ func (o *IncomingWebhook) IsValid() *AppError { return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.display_name.app_error", nil, "", http.StatusBadRequest) } - if len(o.Description) > 128 { + if len(o.Description) > 500 { return NewAppError("IncomingWebhook.IsValid", "model.incoming_hook.description.app_error", nil, "", http.StatusBadRequest) } diff --git a/model/incoming_webhook_test.go b/model/incoming_webhook_test.go index 5498a6a0c..3f7d13695 100644 --- a/model/incoming_webhook_test.go +++ b/model/incoming_webhook_test.go @@ -80,12 +80,12 @@ func TestIncomingWebhookIsValid(t *testing.T) { t.Fatal(err) } - o.Description = strings.Repeat("1", 129) + o.Description = strings.Repeat("1", 501) if err := o.IsValid(); err == nil { t.Fatal("should be invalid") } - o.Description = strings.Repeat("1", 128) + o.Description = strings.Repeat("1", 500) if err := o.IsValid(); err != nil { t.Fatal(err) } diff --git a/model/outgoing_webhook.go b/model/outgoing_webhook.go index 698a226e3..5f7a67d04 100644 --- a/model/outgoing_webhook.go +++ b/model/outgoing_webhook.go @@ -171,7 +171,7 @@ func (o *OutgoingWebhook) IsValid() *AppError { return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.display_name.app_error", nil, "", http.StatusBadRequest) } - if len(o.Description) > 128 { + if len(o.Description) > 500 { return NewAppError("OutgoingWebhook.IsValid", "model.outgoing_hook.is_valid.description.app_error", nil, "", http.StatusBadRequest) } diff --git a/model/outgoing_webhook_test.go b/model/outgoing_webhook_test.go index 3241e649f..5403fca6f 100644 --- a/model/outgoing_webhook_test.go +++ b/model/outgoing_webhook_test.go @@ -102,14 +102,14 @@ func TestOutgoingWebhookIsValid(t *testing.T) { t.Fatal(err) } - o.Description = strings.Repeat("1", 129) + o.Description = strings.Repeat("1", 501) if err := o.IsValid(); err == nil { t.Fatal("should be invalid") } - o.Description = strings.Repeat("1", 128) + o.Description = strings.Repeat("1", 500) if err := o.IsValid(); err != nil { - t.Fatal("should be invalid") + t.Fatal(err) } o.ContentType = strings.Repeat("1", 129) |