diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-05-12 09:12:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-12 09:12:55 -0400 |
| commit | 1397798f1763b0848957a8672c8d40b6243764d5 (patch) | |
| tree | 5d109da2e9e088f16eff0ad1421876a3d3da412e /api | |
| parent | b1c39204a63a87d2cbc57f66cf9db50c938b2ee5 (diff) | |
| parent | 9d109b070037951fcd0832b785eba8a3db9a157c (diff) | |
| download | chat-1397798f1763b0848957a8672c8d40b6243764d5.tar.gz chat-1397798f1763b0848957a8672c8d40b6243764d5.tar.bz2 chat-1397798f1763b0848957a8672c8d40b6243764d5.zip | |
Merge pull request #6401 from mattermost/merge-3.9
Merge release-3.9 branch into master
Diffstat (limited to 'api')
| -rw-r--r-- | api/channel.go | 2 | ||||
| -rw-r--r-- | api/context.go | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/api/channel.go b/api/channel.go index 73daaf3d4..c7b0630e6 100644 --- a/api/channel.go +++ b/api/channel.go @@ -124,7 +124,7 @@ func createGroupChannel(c *Context, w http.ResponseWriter, r *http.Request) { userIds = append(userIds, c.Session.UserId) } - if sc, err := app.CreateGroupChannel(userIds); err != nil { + if sc, err := app.CreateGroupChannel(userIds, c.Session.UserId); err != nil { c.Err = err return } else { diff --git a/api/context.go b/api/context.go index f8953f547..33dc8b2ac 100644 --- a/api/context.go +++ b/api/context.go @@ -222,6 +222,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { if c.Err == nil && h.isUserActivity && token != "" && len(c.Session.UserId) > 0 { app.SetStatusOnline(c.Session.UserId, c.Session.Id, false) + app.UpdateLastActivityAtIfNeeded(c.Session) } if c.Err == nil && (h.requireUser || h.requireSystemAdmin) { |