PLT-6196: Websocket message when added to a team. (#5968)
Этот коммит содержится в:
коммит произвёл
Corey Hulen
родитель
adb22a8a85
Коммит
9609a9b89a
18
app/team.go
18
app/team.go
@@ -436,11 +436,18 @@ func AddTeamMember(teamId, userId, siteURL string) (*model.TeamMember, *model.Ap
|
|||||||
return nil, err
|
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
|
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) {
|
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 {
|
} else {
|
||||||
members = append(members, teamMember)
|
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
|
return members, nil
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ const (
|
|||||||
WEBSOCKET_EVENT_DIRECT_ADDED = "direct_added"
|
WEBSOCKET_EVENT_DIRECT_ADDED = "direct_added"
|
||||||
WEBSOCKET_EVENT_GROUP_ADDED = "group_added"
|
WEBSOCKET_EVENT_GROUP_ADDED = "group_added"
|
||||||
WEBSOCKET_EVENT_NEW_USER = "new_user"
|
WEBSOCKET_EVENT_NEW_USER = "new_user"
|
||||||
|
WEBSOCKET_EVENT_ADDED_TO_TEAM = "added_to_team"
|
||||||
WEBSOCKET_EVENT_LEAVE_TEAM = "leave_team"
|
WEBSOCKET_EVENT_LEAVE_TEAM = "leave_team"
|
||||||
WEBSOCKET_EVENT_UPDATE_TEAM = "update_team"
|
WEBSOCKET_EVENT_UPDATE_TEAM = "update_team"
|
||||||
WEBSOCKET_EVENT_USER_ADDED = "user_added"
|
WEBSOCKET_EVENT_USER_ADDED = "user_added"
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user