diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2018-07-05 09:08:49 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2018-07-05 09:08:49 -0400 |
| commit | 6299af0fa54a9cd658e0d7fb1e5552746830cebf (patch) | |
| tree | abccd8ed207d00406d7d64b5ae2de44f323fab91 /model/emoji.go | |
| parent | 7c855c30dbb0326901a9c087bedd7286dafac47f (diff) | |
| download | chat-6299af0fa54a9cd658e0d7fb1e5552746830cebf.tar.gz chat-6299af0fa54a9cd658e0d7fb1e5552746830cebf.tar.bz2 chat-6299af0fa54a9cd658e0d7fb1e5552746830cebf.zip | |
Add ability to bulk import emoji (#9048)
* Add ability to bulk import emoji
* Improve error handling
* Update test config
Diffstat (limited to 'model/emoji.go')
| -rw-r--r-- | model/emoji.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/model/emoji.go b/model/emoji.go index 78a266386..f14af89df 100644 --- a/model/emoji.go +++ b/model/emoji.go @@ -41,11 +41,15 @@ func (emoji *Emoji) IsValid() *AppError { return NewAppError("Emoji.IsValid", "model.emoji.update_at.app_error", nil, "id="+emoji.Id, http.StatusBadRequest) } - if len(emoji.CreatorId) != 26 { + if len(emoji.CreatorId) > 26 { return NewAppError("Emoji.IsValid", "model.emoji.user_id.app_error", nil, "", http.StatusBadRequest) } - if len(emoji.Name) == 0 || len(emoji.Name) > EMOJI_NAME_MAX_LENGTH || !IsValidAlphaNumHyphenUnderscore(emoji.Name, false) || inSystemEmoji(emoji.Name) { + return IsValidEmojiName(emoji.Name) +} + +func IsValidEmojiName(name string) *AppError { + if len(name) == 0 || len(name) > EMOJI_NAME_MAX_LENGTH || !IsValidAlphaNumHyphenUnderscore(name, false) || inSystemEmoji(name) { return NewAppError("Emoji.IsValid", "model.emoji.name.app_error", nil, "", http.StatusBadRequest) } |