IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-08-26 13:17:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Moving the handing of extra_info etag before the extra info is retrieved from the database

Browse Source
This commit is contained in:
Christopher Speller
2015-07-30 08:24:06 -04:00
parent 3f97e06bf8
commit c7a8112c17
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/channel.go
+14 -10
View File
@@ -554,27 +554,31 @@ func getChannelExtraInfo(c *Context, w http.ResponseWriter, r *http.Request) {
id := params["id"]
sc := Srv.Store.Channel().Get(id)
scm := Srv.Store.Channel().GetMember(id, c.Session.UserId)
ecm := Srv.Store.Channel().GetExtraMembers(id, 20)
var channel *model.Channel
if cresult := <-sc; cresult.Err != nil {
c.Err = cresult.Err
return
} else if cmresult := <-scm; cmresult.Err != nil {
} else {
channel = cresult.Data.(*model.Channel)
}
extraEtag := channel.ExtraEtag()
if HandleEtag(extraEtag, w, r) {
return
}
scm := Srv.Store.Channel().GetMember(id, c.Session.UserId)
ecm := Srv.Store.Channel().GetExtraMembers(id, 20)
if cmresult := <-scm; cmresult.Err != nil {
c.Err = cmresult.Err
return
} else if ecmresult := <-ecm; ecmresult.Err != nil {
c.Err = ecmresult.Err
return
} else {
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