From b0f38f8a84ae0b7cba43c7d12a19f8f3cb79e9b0 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 1 Nov 2016 15:50:34 -0400 Subject: Fixing websocket and team store issues when leaving team (#4412) --- api/team.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'api/team.go') diff --git a/api/team.go b/api/team.go index 46e822504..5a8c605ef 100644 --- a/api/team.go +++ b/api/team.go @@ -347,6 +347,12 @@ func LeaveTeam(team *model.Team, user *model.User) *model.AppError { } } + // Send the websocket message before we actually do the remove so the user being removed gets it. + message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_LEAVE_TEAM, team.Id, "", "", nil) + message.Add("user_id", user.Id) + message.Add("team_id", team.Id) + Publish(message) + teamMember.Roles = "" teamMember.DeleteAt = model.GetMillis() @@ -361,10 +367,6 @@ func LeaveTeam(team *model.Team, user *model.User) *model.AppError { RemoveAllSessionsForUserId(user.Id) InvalidateCacheForUser(user.Id) - message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_LEAVE_TEAM, team.Id, "", "", nil) - message.Add("user_id", user.Id) - go Publish(message) - return nil } -- cgit v1.2.3-1-g7c22