2 files changed, 38 insertions, 0 deletions

diff --git a/model/client.go b/model/client.go
index 11beb9a87..892d3e979 100644
--- a/model/client.go
+++ b/model/client.go
@@ -844,6 +844,24 @@ func (c *Client) ListIncomingWebhooks() (*Result, *AppError) {
 	}
 }
 
+func (c *Client) SetPreferences(preferences []*Preference) (*Result, *AppError) {
+	if r, err := c.DoApiPost("/preferences/set", PreferenceListToJson(preferences)); err != nil {
+		return nil, err
+	} else {
+		return &Result{r.Header.Get(HEADER_REQUEST_ID),
+			r.Header.Get(HEADER_ETAG_SERVER), nil}, nil
+	}
+}
+
+func (c *Client) GetPreferencesByName(category string, name string) (*Result, *AppError) {
+	if r, err := c.DoApiGet("/preferences/"+category+"/"+name, "", ""); err != nil {
+		return nil, err
+	} else {
+		return &Result{r.Header.Get(HEADER_REQUEST_ID),
+			r.Header.Get(HEADER_ETAG_SERVER), PreferenceListFromJson(r.Body)}, nil
+	}
+}
+
 func (c *Client) MockSession(sessionToken string) {
 	c.AuthToken = sessionToken
 	c.AuthType = HEADER_BEARER
diff --git a/model/preference.go b/model/preference.go
index f363434e3..8e2ff14bc 100644
--- a/model/preference.go
+++ b/model/preference.go
@@ -32,6 +32,15 @@ func (o *Preference) ToJson() string {
 	}
 }
 
+func PreferenceListToJson(o []*Preference) string {
+	b, err := json.Marshal(o)
+	if err != nil {
+		return ""
+	} else {
+		return string(b)
+	}
+}
+
 func PreferenceFromJson(data io.Reader) *Preference {
 	decoder := json.NewDecoder(data)
 	var o Preference
@@ -43,6 +52,17 @@ func PreferenceFromJson(data io.Reader) *Preference {
 	}
 }
 
+func PreferenceListFromJson(data io.Reader) []*Preference {
+	decoder := json.NewDecoder(data)
+	var o []*Preference
+	err := decoder.Decode(&o)
+	if err == nil {
+		return o
+	} else {
+		return nil
+	}
+}
+
 func (o *Preference) IsValid() *AppError {
 	if len(o.UserId) != 26 {
 		return NewAppError("Preference.IsValid", "Invalid user id", "user_id="+o.UserId)