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/reaction.go | |
parent | 600beb5af3e35fd82a2b06995b67629d08fe0fe3 (diff) | |
download | chat-2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d.tar.gz chat-2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d.tar.bz2 chat-2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d.zip |
Model: NewLocAppError -> NewAppError (#7450)
Diffstat (limited to 'model/reaction.go')
-rw-r--r-- | model/reaction.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/model/reaction.go b/model/reaction.go index 3d334c214..4b72dd444 100644 --- a/model/reaction.go +++ b/model/reaction.go @@ -6,6 +6,7 @@ package model import ( "encoding/json" "io" + "net/http" "regexp" ) @@ -54,21 +55,21 @@ func ReactionsFromJson(data io.Reader) []*Reaction { func (o *Reaction) IsValid() *AppError { if len(o.UserId) != 26 { - return NewLocAppError("Reaction.IsValid", "model.reaction.is_valid.user_id.app_error", nil, "user_id="+o.UserId) + return NewAppError("Reaction.IsValid", "model.reaction.is_valid.user_id.app_error", nil, "user_id="+o.UserId, http.StatusBadRequest) } if len(o.PostId) != 26 { - return NewLocAppError("Reaction.IsValid", "model.reaction.is_valid.post_id.app_error", nil, "post_id="+o.PostId) + return NewAppError("Reaction.IsValid", "model.reaction.is_valid.post_id.app_error", nil, "post_id="+o.PostId, http.StatusBadRequest) } validName := regexp.MustCompile(`^[a-zA-Z0-9\-\+_]+$`) if len(o.EmojiName) == 0 || len(o.EmojiName) > 64 || !validName.MatchString(o.EmojiName) { - return NewLocAppError("Reaction.IsValid", "model.reaction.is_valid.emoji_name.app_error", nil, "emoji_name="+o.EmojiName) + return NewAppError("Reaction.IsValid", "model.reaction.is_valid.emoji_name.app_error", nil, "emoji_name="+o.EmojiName, http.StatusBadRequest) } if o.CreateAt == 0 { - return NewLocAppError("Reaction.IsValid", "model.reaction.is_valid.create_at.app_error", nil, "") + return NewAppError("Reaction.IsValid", "model.reaction.is_valid.create_at.app_error", nil, "", http.StatusBadRequest) } return nil |