summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-10-22 10:17:25 -0700
committer=Corey Hulen <corey@hulen.com>2015-10-22 10:17:25 -0700
commitab18616725fc7c3df00215e63830f6ec0a05976c (patch)
tree15e187d041e38479753c5a394f03daaadd98d783 /api
parentcbbee5cadb1c0096bfff9ce1cc80d4be7adb5717 (diff)
downloadchat-ab18616725fc7c3df00215e63830f6ec0a05976c.tar.gz
chat-ab18616725fc7c3df00215e63830f6ec0a05976c.tar.bz2
chat-ab18616725fc7c3df00215e63830f6ec0a05976c.zip
Fixing group code review issues
Diffstat (limited to 'api')
-rw-r--r--api/user.go2
-rw-r--r--api/web_team_hub.go3
2 files changed, 3 insertions, 2 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
}