From 9609a9b89a500448e2623e9a02471f8bca5c050c Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Tue, 4 Apr 2017 16:26:40 +0100 Subject: PLT-6196: Websocket message when added to a team. (#5968) --- app/team.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/team.go b/app/team.go index 91601fbb2..8ad5dd466 100644 --- a/app/team.go +++ b/app/team.go @@ -436,11 +436,18 @@ func AddTeamMember(teamId, userId, siteURL string) (*model.TeamMember, *model.Ap return nil, err } - if teamMember, err := GetTeamMember(teamId, userId); err != nil { + var teamMember *model.TeamMember + var err *model.AppError + if teamMember, err = GetTeamMember(teamId, userId); err != nil { return nil, err - } else { - return teamMember, nil } + + message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_ADDED_TO_TEAM, "", "", userId, nil) + message.Add("team_id", teamId) + message.Add("user_id", userId) + Publish(message) + + return teamMember, nil } func AddTeamMembers(teamId string, userIds []string, siteURL string) ([]*model.TeamMember, *model.AppError) { @@ -456,6 +463,11 @@ func AddTeamMembers(teamId string, userIds []string, siteURL string) ([]*model.T } else { members = append(members, teamMember) } + + message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_ADDED_TO_TEAM, "", "", userId, nil) + message.Add("team_id", teamId) + message.Add("user_id", userId) + Publish(message) } return members, nil -- cgit v1.2.3-1-g7c22