summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
Diffstat (limited to 'api')
-rw-r--r--api/channel.go2
-rw-r--r--api/context.go1
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) {