diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-07-29 11:30:56 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-07-29 14:35:25 -0400 |
| commit | 3f97e06bf80c789ce8e2d572afdac65a73d417c8 (patch) | |
| tree | ce40eba90031c423c209670c28f902966e0d4f9b /api/channel.go | |
| parent | 0f54233f668901fde880f18354f406b981fc4d6d (diff) | |
| download | chat-3f97e06bf80c789ce8e2d572afdac65a73d417c8.tar.gz chat-3f97e06bf80c789ce8e2d572afdac65a73d417c8.tar.bz2 chat-3f97e06bf80c789ce8e2d572afdac65a73d417c8.zip | |
Adding etag to channel extra_info api call.
Diffstat (limited to 'api/channel.go')
| -rw-r--r-- | api/channel.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/api/channel.go b/api/channel.go index 123fd8a35..9216dbb09 100644 --- a/api/channel.go +++ b/api/channel.go @@ -570,6 +570,11 @@ func getChannelExtraInfo(c *Context, w http.ResponseWriter, r *http.Request) { channel := cresult.Data.(*model.Channel) member := cmresult.Data.(model.ChannelMember) extraMembers := ecmresult.Data.([]model.ExtraMember) + extraEtag := channel.ExtraEtag() + + if HandleEtag(extraEtag, w, r) { + return + } if !c.HasPermissionsToTeam(channel.TeamId, "getChannelExtraInfo") { return @@ -586,6 +591,7 @@ func getChannelExtraInfo(c *Context, w http.ResponseWriter, r *http.Request) { } data := model.ChannelExtra{Id: channel.Id, Members: extraMembers} + w.Header().Set(model.HEADER_ETAG_SERVER, extraEtag) w.Header().Set("Expires", "-1") w.Write([]byte(data.ToJson())) } @@ -711,7 +717,7 @@ func removeChannelMember(c *Context, w http.ResponseWriter, r *http.Request) { } message := model.NewMessage(c.Session.TeamId, "", userId, model.ACTION_USER_REMOVED) - message.Add("channel_id",id) + message.Add("channel_id", id) message.Add("remover", c.Session.UserId) PublishAndForget(message) |