summaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
authorCarlos Tadeu Panato Junior <ctadeu@gmail.com>2017-03-24 18:23:32 +0100
committerGeorge Goldberg <george@gberg.me>2017-03-24 17:23:32 +0000
commit5bf6ae04dfedc2e504ea8af5c71b2e9a8287e2b5 (patch)
tree19445c4de5d31670ede7429a97e292b72c022368 /model
parent28ad645153b206ba84ddc4935280eaed94bb0138 (diff)
downloadchat-5bf6ae04dfedc2e504ea8af5c71b2e9a8287e2b5.tar.gz
chat-5bf6ae04dfedc2e504ea8af5c71b2e9a8287e2b5.tar.bz2
chat-5bf6ae04dfedc2e504ea8af5c71b2e9a8287e2b5.zip
[APIV4] GET /users/{user_id}/status - user status endpoint for apiV4 (#5824)
Diffstat (limited to 'model')
-rw-r--r--model/client4.go16
-rw-r--r--model/status.go2
2 files changed, 17 insertions, 1 deletions
diff --git a/model/client4.go b/model/client4.go
index 214c31865..3aef5019c 100644
--- a/model/client4.go
+++ b/model/client4.go
@@ -190,6 +190,10 @@ func (c *Client4) GetPreferencesRoute(userId string) string {
return fmt.Sprintf(c.GetUserRoute(userId) + "/preferences")
}
+func (c *Client4) GetStatusRoute(userId string) string {
+ return fmt.Sprintf(c.GetUserRoute(userId) + "/status")
+}
+
func (c *Client4) GetSamlRoute() string {
return fmt.Sprintf("/saml")
}
@@ -1764,3 +1768,15 @@ func (c *Client4) CreateCommand(cmd *Command) (*Command, *Response) {
return CommandFromJson(r.Body), BuildResponse(r)
}
}
+
+// Status Section
+
+// GetUserStatus returns a user based on the provided user id string.
+func (c *Client4) GetUserStatus(userId, etag string) (*Status, *Response) {
+ if r, err := c.DoApiGet(c.GetStatusRoute(userId), etag); err != nil {
+ return nil, &Response{StatusCode: r.StatusCode, Error: err}
+ } else {
+ defer closeBody(r)
+ return StatusFromJson(r.Body), BuildResponse(r)
+ }
+}
diff --git a/model/status.go b/model/status.go
index fc1557887..e38f43fe4 100644
--- a/model/status.go
+++ b/model/status.go
@@ -22,7 +22,7 @@ type Status struct {
Status string `json:"status"`
Manual bool `json:"manual"`
LastActivityAt int64 `json:"last_activity_at"`
- ActiveChannel string `json:"active_channel" db:"-"`
+ ActiveChannel string `json:"-" db:"-"`
}
func (o *Status) ToJson() string {