diff options
| author | George Goldberg <george@gberg.me> | 2017-09-15 13:32:11 +0100 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-09-15 08:32:11 -0400 |
| commit | 2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d (patch) | |
| tree | 513dee966bfa8d3810ddf631df90270acd342e4f /model/emoji.go | |
| parent | 600beb5af3e35fd82a2b06995b67629d08fe0fe3 (diff) | |
| download | chat-2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d.tar.gz chat-2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d.tar.bz2 chat-2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d.zip | |
Model: NewLocAppError -> NewAppError (#7450)
Diffstat (limited to 'model/emoji.go')
| -rw-r--r-- | model/emoji.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/model/emoji.go b/model/emoji.go index 5ade868cd..272616d90 100644 --- a/model/emoji.go +++ b/model/emoji.go @@ -6,6 +6,7 @@ package model import ( "encoding/json" "io" + "net/http" ) type Emoji struct { @@ -19,23 +20,23 @@ type Emoji struct { func (emoji *Emoji) IsValid() *AppError { if len(emoji.Id) != 26 { - return NewLocAppError("Emoji.IsValid", "model.emoji.id.app_error", nil, "") + return NewAppError("Emoji.IsValid", "model.emoji.id.app_error", nil, "", http.StatusBadRequest) } if emoji.CreateAt == 0 { - return NewLocAppError("Emoji.IsValid", "model.emoji.create_at.app_error", nil, "id="+emoji.Id) + return NewAppError("Emoji.IsValid", "model.emoji.create_at.app_error", nil, "id="+emoji.Id, http.StatusBadRequest) } if emoji.UpdateAt == 0 { - return NewLocAppError("Emoji.IsValid", "model.emoji.update_at.app_error", nil, "id="+emoji.Id) + return NewAppError("Emoji.IsValid", "model.emoji.update_at.app_error", nil, "id="+emoji.Id, http.StatusBadRequest) } if len(emoji.CreatorId) != 26 { - return NewLocAppError("Emoji.IsValid", "model.emoji.user_id.app_error", nil, "") + 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) { - return NewLocAppError("Emoji.IsValid", "model.emoji.name.app_error", nil, "") + return NewAppError("Emoji.IsValid", "model.emoji.name.app_error", nil, "", http.StatusBadRequest) } return nil |