IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-6380 Fired websocket event when user joins a team (#6266)

Browse Source
This commit is contained in:
Harrison Healey
2017-05-03 11:50:12 -04:00
committed by Corey Hulen
parent dc6c836b35
commit 030b9a0c5c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/team.go
View File

@@ -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
}