summaryrefslogtreecommitdiffstats
path: root/api4/channel.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-09-29 11:45:59 -0400
committerChristopher Speller <crspeller@gmail.com>2017-09-29 08:45:59 -0700
commit8b9dbb86133ff0fd6002a391268383d1593918ca (patch)
treeb8399f2bae881afe12f3bdb34ec725e97307144a /api4/channel.go
parent5e50d3f4612dc8e6dffeff268f024a3d383a329c (diff)
downloadchat-8b9dbb86133ff0fd6002a391268383d1593918ca.tar.gz
chat-8b9dbb86133ff0fd6002a391268383d1593918ca.tar.bz2
chat-8b9dbb86133ff0fd6002a391268383d1593918ca.zip
PLT-7404 Return viewed at times in view channel API response (#7428)
* Return viewed at times in view channel API response * Updated transaction to read and write once * Remove transaction and only update if new value greater than older
Diffstat (limited to 'api4/channel.go')
-rw-r--r--api4/channel.go12
1 files changed, 10 insertions, 2 deletions
diff --git a/api4/channel.go b/api4/channel.go
index 9eaa6ec8a..74eb1a972 100644
--- a/api4/channel.go
+++ b/api4/channel.go
@@ -709,12 +709,20 @@ func viewChannel(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
- if err := c.App.ViewChannel(view, c.Params.UserId, !c.Session.IsMobileApp()); err != nil {
+ times, err := c.App.ViewChannel(view, c.Params.UserId, !c.Session.IsMobileApp())
+
+ if err != nil {
c.Err = err
return
}
- ReturnStatusOK(w)
+ // Returning {"status": "OK", ...} for backwards compatability
+ resp := &model.ChannelViewResponse{
+ Status: "OK",
+ LastViewedAtTimes: times,
+ }
+
+ w.Write([]byte(resp.ToJson()))
}
func updateChannelMemberRoles(c *Context, w http.ResponseWriter, r *http.Request) {