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/preference.go | |
parent | 600beb5af3e35fd82a2b06995b67629d08fe0fe3 (diff) | |
download | chat-2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d.tar.gz chat-2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d.tar.bz2 chat-2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d.zip |
Model: NewLocAppError -> NewAppError (#7450)
Diffstat (limited to 'model/preference.go')
-rw-r--r-- | model/preference.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/model/preference.go b/model/preference.go index 6bbe7326c..5d462de8b 100644 --- a/model/preference.go +++ b/model/preference.go @@ -6,6 +6,7 @@ package model import ( "encoding/json" "io" + "net/http" "regexp" "strings" "unicode/utf8" @@ -67,25 +68,25 @@ func PreferenceFromJson(data io.Reader) *Preference { func (o *Preference) IsValid() *AppError { if len(o.UserId) != 26 { - return NewLocAppError("Preference.IsValid", "model.preference.is_valid.id.app_error", nil, "user_id="+o.UserId) + return NewAppError("Preference.IsValid", "model.preference.is_valid.id.app_error", nil, "user_id="+o.UserId, http.StatusBadRequest) } if len(o.Category) == 0 || len(o.Category) > 32 { - return NewLocAppError("Preference.IsValid", "model.preference.is_valid.category.app_error", nil, "category="+o.Category) + return NewAppError("Preference.IsValid", "model.preference.is_valid.category.app_error", nil, "category="+o.Category, http.StatusBadRequest) } if len(o.Name) > 32 { - return NewLocAppError("Preference.IsValid", "model.preference.is_valid.name.app_error", nil, "name="+o.Name) + return NewAppError("Preference.IsValid", "model.preference.is_valid.name.app_error", nil, "name="+o.Name, http.StatusBadRequest) } if utf8.RuneCountInString(o.Value) > 2000 { - return NewLocAppError("Preference.IsValid", "model.preference.is_valid.value.app_error", nil, "value="+o.Value) + return NewAppError("Preference.IsValid", "model.preference.is_valid.value.app_error", nil, "value="+o.Value, http.StatusBadRequest) } if o.Category == PREFERENCE_CATEGORY_THEME { var unused map[string]string if err := json.NewDecoder(strings.NewReader(o.Value)).Decode(&unused); err != nil { - return NewLocAppError("Preference.IsValid", "model.preference.is_valid.theme.app_error", nil, "value="+o.Value) + return NewAppError("Preference.IsValid", "model.preference.is_valid.theme.app_error", nil, "value="+o.Value, http.StatusBadRequest) } } |