PLT-6380 Fired websocket event when user joins a team (#6266)
Этот коммит содержится в:
коммит произвёл
Corey Hulen
родитель
dc6c836b35
Коммит
030b9a0c5c
@@ -257,7 +257,6 @@ func AddUserToTeamByInviteId(inviteId string, userId string) (*model.Team, *mode
|
|||||||
}
|
}
|
||||||
|
|
||||||
func joinUserToTeam(team *model.Team, user *model.User) (bool, *model.AppError) {
|
func joinUserToTeam(team *model.Team, user *model.User) (bool, *model.AppError) {
|
||||||
|
|
||||||
tm := &model.TeamMember{
|
tm := &model.TeamMember{
|
||||||
TeamId: team.Id,
|
TeamId: team.Id,
|
||||||
UserId: user.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 {
|
func JoinUserToTeam(team *model.Team, user *model.User, userRequestorId string) *model.AppError {
|
||||||
|
|
||||||
if alreadyAdded, err := joinUserToTeam(team, user); err != nil {
|
if alreadyAdded, err := joinUserToTeam(team, user); err != nil {
|
||||||
return err
|
return err
|
||||||
} else if alreadyAdded {
|
} else if alreadyAdded {
|
||||||
@@ -316,6 +314,11 @@ func JoinUserToTeam(team *model.Team, user *model.User, userRequestorId string)
|
|||||||
ClearSessionCacheForUser(user.Id)
|
ClearSessionCacheForUser(user.Id)
|
||||||
InvalidateCacheForUser(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
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user