From 6990d052d5e95295e729aae28a0d30bfdcb98573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 11 Jan 2018 16:57:47 +0100 Subject: [XYZ-6] Add sampledata platform command (#8027) * Add fake dependency * [XYZ-6] Add sampledata platform command * Creating EMOJI_NAME_MAX_LENGTH as a constant and using it where needed --- model/emoji.go | 6 +++++- model/reaction.go | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'model') diff --git a/model/emoji.go b/model/emoji.go index 272616d90..784fe832b 100644 --- a/model/emoji.go +++ b/model/emoji.go @@ -9,6 +9,10 @@ import ( "net/http" ) +const ( + EMOJI_NAME_MAX_LENGTH = 64 +) + type Emoji struct { Id string `json:"id"` CreateAt int64 `json:"create_at"` @@ -35,7 +39,7 @@ func (emoji *Emoji) IsValid() *AppError { return NewAppError("Emoji.IsValid", "model.emoji.user_id.app_error", nil, "", http.StatusBadRequest) } - if len(emoji.Name) == 0 || len(emoji.Name) > 64 || !IsValidAlphaNumHyphenUnderscore(emoji.Name, false) { + if len(emoji.Name) == 0 || len(emoji.Name) > EMOJI_NAME_MAX_LENGTH || !IsValidAlphaNumHyphenUnderscore(emoji.Name, false) { return NewAppError("Emoji.IsValid", "model.emoji.name.app_error", nil, "", http.StatusBadRequest) } diff --git a/model/reaction.go b/model/reaction.go index 4b72dd444..8c9b67029 100644 --- a/model/reaction.go +++ b/model/reaction.go @@ -64,7 +64,7 @@ func (o *Reaction) IsValid() *AppError { validName := regexp.MustCompile(`^[a-zA-Z0-9\-\+_]+$`) - if len(o.EmojiName) == 0 || len(o.EmojiName) > 64 || !validName.MatchString(o.EmojiName) { + if len(o.EmojiName) == 0 || len(o.EmojiName) > EMOJI_NAME_MAX_LENGTH || !validName.MatchString(o.EmojiName) { return NewAppError("Reaction.IsValid", "model.reaction.is_valid.emoji_name.app_error", nil, "emoji_name="+o.EmojiName, http.StatusBadRequest) } -- cgit v1.2.3-1-g7c22