diff options
Diffstat (limited to 'model')
| -rw-r--r-- | model/channel.go | 20 | ||||
| -rw-r--r-- | model/channel_test.go | 7 |
2 files changed, 18 insertions, 9 deletions
diff --git a/model/channel.go b/model/channel.go index 7dee079c5..2ad257ccc 100644 --- a/model/channel.go +++ b/model/channel.go @@ -10,10 +10,14 @@ import ( ) const ( - CHANNEL_OPEN = "O" - CHANNEL_PRIVATE = "P" - CHANNEL_DIRECT = "D" - DEFAULT_CHANNEL = "town-square" + CHANNEL_OPEN = "O" + CHANNEL_PRIVATE = "P" + CHANNEL_DIRECT = "D" + DEFAULT_CHANNEL = "town-square" + CHANNEL_DISPLAY_NAME_MAX_RUNES = 64 + CHANNEL_NAME_MAX_LENGTH = 64 + CHANNEL_HEADER_MAX_RUNES = 1024 + CHANNEL_PURPOSE_MAX_RUNES = 250 ) type Channel struct { @@ -75,11 +79,11 @@ func (o *Channel) IsValid() *AppError { return NewLocAppError("Channel.IsValid", "model.channel.is_valid.update_at.app_error", nil, "id="+o.Id) } - if utf8.RuneCountInString(o.DisplayName) > 64 { + if utf8.RuneCountInString(o.DisplayName) > CHANNEL_DISPLAY_NAME_MAX_RUNES { return NewLocAppError("Channel.IsValid", "model.channel.is_valid.display_name.app_error", nil, "id="+o.Id) } - if len(o.Name) > 64 { + if len(o.Name) > CHANNEL_NAME_MAX_LENGTH { return NewLocAppError("Channel.IsValid", "model.channel.is_valid.name.app_error", nil, "id="+o.Id) } @@ -91,11 +95,11 @@ func (o *Channel) IsValid() *AppError { return NewLocAppError("Channel.IsValid", "model.channel.is_valid.type.app_error", nil, "id="+o.Id) } - if utf8.RuneCountInString(o.Header) > 1024 { + if utf8.RuneCountInString(o.Header) > CHANNEL_HEADER_MAX_RUNES { return NewLocAppError("Channel.IsValid", "model.channel.is_valid.header.app_error", nil, "id="+o.Id) } - if utf8.RuneCountInString(o.Purpose) > 128 { + if utf8.RuneCountInString(o.Purpose) > CHANNEL_PURPOSE_MAX_RUNES { return NewLocAppError("Channel.IsValid", "model.channel.is_valid.purpose.app_error", nil, "id="+o.Id) } diff --git a/model/channel_test.go b/model/channel_test.go index 590417cfe..af4e3c16d 100644 --- a/model/channel_test.go +++ b/model/channel_test.go @@ -78,7 +78,7 @@ func TestChannelIsValid(t *testing.T) { t.Fatal(err) } - o.Purpose = strings.Repeat("01234567890", 20) + o.Purpose = strings.Repeat("01234567890", 30) if err := o.IsValid(); err == nil { t.Fatal("should be invalid") } @@ -87,6 +87,11 @@ func TestChannelIsValid(t *testing.T) { if err := o.IsValid(); err != nil { t.Fatal(err) } + + o.Purpose = strings.Repeat("0123456789", 25) + if err := o.IsValid(); err != nil { + t.Fatal(err) + } } func TestChannelPreSave(t *testing.T) { |