summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2017-04-04 16:26:40 +0100
committerCorey Hulen <corey@hulen.com>2017-04-04 08:26:40 -0700
commit9609a9b89a500448e2623e9a02471f8bca5c050c (patch)
treeccab4516e57b7418a6203e71dbafffa92490e1ec /app
parentadb22a8a85929f0359b585e72965074d2425aacb (diff)
downloadchat-9609a9b89a500448e2623e9a02471f8bca5c050c.tar.gz
chat-9609a9b89a500448e2623e9a02471f8bca5c050c.tar.bz2
chat-9609a9b89a500448e2623e9a02471f8bca5c050c.zip
PLT-6196: Websocket message when added to a team. (#5968)
Diffstat (limited to 'app')
-rw-r--r--app/team.go18
1 files changed, 15 insertions, 3 deletions
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