summaryrefslogtreecommitdiffstats
path: root/app/team.go
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-05-03 11:50:12 -0400
committerCorey Hulen <corey@hulen.com>2017-05-03 08:50:12 -0700
commit030b9a0c5c3ee1f17765fff1a85fb30e378db310 (patch)
tree009419d87fab9f3d45476dcd3a8bf91bb596c902 /app/team.go
parentdc6c836b354bfdbedd0ac9f827c1ab4ec82d9425 (diff)
downloadchat-030b9a0c5c3ee1f17765fff1a85fb30e378db310.tar.gz
chat-030b9a0c5c3ee1f17765fff1a85fb30e378db310.tar.bz2
chat-030b9a0c5c3ee1f17765fff1a85fb30e378db310.zip
PLT-6380 Fired websocket event when user joins a team (#6266)
Diffstat (limited to 'app/team.go')
-rw-r--r--app/team.go7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/team.go b/app/team.go
index 47f4f5c15..41e24bf52 100644
--- a/app/team.go
+++ b/app/team.go
@@ -257,7 +257,6 @@ func AddUserToTeamByInviteId(inviteId string, userId string) (*model.Team, *mode
}
func joinUserToTeam(team *model.Team, user *model.User) (bool, *model.AppError) {
-
tm := &model.TeamMember{
TeamId: team.Id,
UserId: user.Id,
@@ -295,7 +294,6 @@ func joinUserToTeam(team *model.Team, user *model.User) (bool, *model.AppError)
}
func JoinUserToTeam(team *model.Team, user *model.User, userRequestorId string) *model.AppError {
-
if alreadyAdded, err := joinUserToTeam(team, user); err != nil {
return err
} else if alreadyAdded {
@@ -316,6 +314,11 @@ func JoinUserToTeam(team *model.Team, user *model.User, userRequestorId string)
ClearSessionCacheForUser(user.Id)
InvalidateCacheForUser(user.Id)
+ message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_ADDED_TO_TEAM, "", "", user.Id, nil)
+ message.Add("team_id", team.Id)
+ message.Add("user_id", user.Id)
+ Publish(message)
+
return nil
}