diff options
| -rw-r--r-- | api/team.go | 5 | ||||
| -rw-r--r-- | webapp/actions/websocket_actions.jsx | 24 |
2 files changed, 0 insertions, 29 deletions
diff --git a/api/team.go b/api/team.go index 730eb1d3d..af517d9ba 100644 --- a/api/team.go +++ b/api/team.go @@ -303,11 +303,6 @@ func JoinUserToTeam(team *model.Team, user *model.User) *model.AppError { RemoveAllSessionsForUserId(user.Id) InvalidateCacheForUser(user.Id) - // This message goes to everyone, so the teamId, channelId and userId are irrelevant - message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_NEW_USER, "", "", "", nil) - message.Add("user_id", user.Id) - go Publish(message) - return nil } diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx index f24802003..0b2c2102e 100644 --- a/webapp/actions/websocket_actions.jsx +++ b/webapp/actions/websocket_actions.jsx @@ -115,10 +115,6 @@ function handleEvent(msg) { handlePostDeleteEvent(msg); break; - case SocketEvents.NEW_USER: - handleNewUserEvent(msg); - break; - case SocketEvents.LEAVE_TEAM: handleLeaveTeamEvent(msg); break; @@ -220,26 +216,6 @@ function handlePostDeleteEvent(msg) { } } -function handleNewUserEvent(msg) { - if (TeamStore.getCurrentId() === '') { - // Any new users will be loaded when we switch into a context with a team - return; - } - - if (msg.data.user_id === UserStore.getCurrentId()) { - // We should already have ourselves - return; - } - - AsyncClient.getUser(msg.data.user_id); - AsyncClient.getChannelStats(); - loadProfilesAndTeamMembersForDMSidebar(); - - if (msg.data.user_id === UserStore.getCurrentId()) { - AsyncClient.getMyTeamMembers(); - } -} - function handleLeaveTeamEvent(msg) { if (UserStore.getCurrentId() === msg.data.user_id) { TeamStore.removeMyTeamMember(msg.data.team_id); |