diff options
| -rw-r--r-- | api/user.go | 2 | ||||
| -rw-r--r-- | api/web_team_hub.go | 3 | ||||
| -rw-r--r-- | web/react/utils/client.jsx | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/api/user.go b/api/user.go index 406cbe291..4c53bd104 100644 --- a/api/user.go +++ b/api/user.go @@ -430,7 +430,7 @@ func Login(c *Context, w http.ResponseWriter, r *http.Request, user *model.User, w.Header().Set(model.HEADER_TOKEN, session.Token) tokens := GetMultiSessionCookie(r) - multiToken = "" + multiToken := "" seen := make(map[string]string) seen[session.TeamId] = session.TeamId for _, token := range tokens { diff --git a/api/web_team_hub.go b/api/web_team_hub.go index 6a25b7d3d..12a14da17 100644 --- a/api/web_team_hub.go +++ b/api/web_team_hub.go @@ -96,7 +96,8 @@ func ShouldSendEvent(webCon *WebConn, msg *model.Message) bool { } } else { // Don't share a user's view events with other users - if msg.Action == model.ACTION_CHANNEL_VIEWED { + // but you still need to share it with yourself + if webCon.UserId != msg.UserId && msg.Action == model.ACTION_CHANNEL_VIEWED { return false } diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index ee1f9ad27..bc73f3c64 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -4,8 +4,8 @@ var BrowserStore = require('../stores/browser_store.jsx'); var TeamStore = require('../stores/team_store.jsx'); var ErrorStore = require('../stores/error_store.jsx'); -export function track(category, action, label, prop, val) { - global.window.analytics.track(action, {category: category, label: label, property: prop, value: val}); +export function track(category, action, label, property, value) { + global.window.analytics.track(action, {category, label, property, value}); } export function trackPage() { |