summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-04-20 08:57:31 -0400
committerGeorge Goldberg <george@gberg.me>2017-04-20 13:57:31 +0100
commit1a0f8d1b3c7451eac43bfdc5971de060caabf441 (patch)
tree3bf83f3f8da16a257a1539d0a20cf7febb95fba8 /api
parentb79439e92b11a53c972bbd1169f4c3aaede9b8ce (diff)
downloadchat-1a0f8d1b3c7451eac43bfdc5971de060caabf441.tar.gz
chat-1a0f8d1b3c7451eac43bfdc5971de060caabf441.tar.bz2
chat-1a0f8d1b3c7451eac43bfdc5971de060caabf441.zip
PLT-1384 Added websocket event when preferences are updated/deleted (#6107)
Diffstat (limited to 'api')
-rw-r--r--api/preference.go31
1 files changed, 5 insertions, 26 deletions
diff --git a/api/preference.go b/api/preference.go
index 9fdc0279c..d3dc2b174 100644
--- a/api/preference.go
+++ b/api/preference.go
@@ -40,18 +40,8 @@ func savePreferences(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
- for _, preference := range preferences {
- if c.Session.UserId != preference.UserId {
- c.Err = model.NewLocAppError("savePreferences", "api.preference.save_preferences.set.app_error", nil,
- c.T("api.preference.save_preferences.set_details.app_error",
- map[string]interface{}{"SessionUserId": c.Session.UserId, "PreferenceUserId": preference.UserId}))
- c.Err.StatusCode = http.StatusForbidden
- return
- }
- }
-
- if result := <-app.Srv.Store.Preference().Save(&preferences); result.Err != nil {
- c.Err = result.Err
+ if err := app.UpdatePreferences(c.Session.UserId, preferences); err != nil {
+ c.Err = err
return
}
@@ -92,20 +82,9 @@ func deletePreferences(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
- for _, preference := range preferences {
- if c.Session.UserId != preference.UserId {
- c.Err = model.NewLocAppError("deletePreferences", "api.preference.delete_preferences.user_id.app_error",
- nil, "session.user_id="+c.Session.UserId+",preference.user_id="+preference.UserId)
- c.Err.StatusCode = http.StatusForbidden
- return
- }
- }
-
- for _, preference := range preferences {
- if result := <-app.Srv.Store.Preference().Delete(c.Session.UserId, preference.Category, preference.Name); result.Err != nil {
- c.Err = result.Err
- return
- }
+ if err := app.DeletePreferences(c.Session.UserId, preferences); err != nil {
+ c.Err = err
+ return
}
ReturnStatusOK(w)