diff options
| author | Chris <ccbrown112@gmail.com> | 2017-09-27 11:52:34 -0500 |
|---|---|---|
| committer | Saturnino Abril <saturnino.abril@gmail.com> | 2017-09-28 00:52:34 +0800 |
| commit | 8c80cdde38cceb3424b2b1f43eadf7a1aab0c6df (patch) | |
| tree | b3563dfe35ad78991774c9d1842dc439376e1db1 /app/team.go | |
| parent | 1bd66589a2adc67df5df9c108a2f2ecc77dfdf44 (diff) | |
| download | chat-8c80cdde38cceb3424b2b1f43eadf7a1aab0c6df.tar.gz chat-8c80cdde38cceb3424b2b1f43eadf7a1aab0c6df.tar.bz2 chat-8c80cdde38cceb3424b2b1f43eadf7a1aab0c6df.zip | |
remove remaining Global() calls (outside of tests) (#7521)
Diffstat (limited to 'app/team.go')
| -rw-r--r-- | app/team.go | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/app/team.go b/app/team.go index fdf44a783..7a5ccc5d6 100644 --- a/app/team.go +++ b/app/team.go @@ -106,7 +106,7 @@ func (a *App) UpdateTeam(team *model.Team) (*model.Team, *model.AppError) { oldTeam.Sanitize() - sendUpdatedTeamEvent(oldTeam) + a.sendUpdatedTeamEvent(oldTeam) return oldTeam, nil } @@ -126,15 +126,15 @@ func (a *App) PatchTeam(teamId string, patch *model.TeamPatch) (*model.Team, *mo updatedTeam.Sanitize() - sendUpdatedTeamEvent(updatedTeam) + a.sendUpdatedTeamEvent(updatedTeam) return updatedTeam, nil } -func sendUpdatedTeamEvent(team *model.Team) { +func (a *App) sendUpdatedTeamEvent(team *model.Team) { message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_UPDATE_TEAM, "", "", "", nil) message.Add("team", team.ToJson()) - go Publish(message) + go a.Publish(message) } func (a *App) UpdateTeamMemberRoles(teamId string, userId string, newRoles string) (*model.TeamMember, *model.AppError) { @@ -163,16 +163,16 @@ func (a *App) UpdateTeamMemberRoles(teamId string, userId string, newRoles strin a.ClearSessionCacheForUser(userId) - sendUpdatedMemberRoleEvent(userId, member) + a.sendUpdatedMemberRoleEvent(userId, member) return member, nil } -func sendUpdatedMemberRoleEvent(userId string, member *model.TeamMember) { +func (a *App) sendUpdatedMemberRoleEvent(userId string, member *model.TeamMember) { message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_MEMBERROLE_UPDATED, "", "", userId, nil) message.Add("member", member.ToJson()) - go Publish(message) + go a.Publish(message) } func (a *App) AddUserToTeam(teamId string, userId string, userRequestorId string) (*model.Team, *model.AppError) { @@ -330,7 +330,7 @@ func (a *App) JoinUserToTeam(team *model.Team, user *model.User, userRequestorId 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) + a.Publish(message) return nil } @@ -462,7 +462,7 @@ func (a *App) AddTeamMember(teamId, userId string) (*model.TeamMember, *model.Ap message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_ADDED_TO_TEAM, "", "", userId, nil) message.Add("team_id", teamId) message.Add("user_id", userId) - Publish(message) + a.Publish(message) return teamMember, nil } @@ -484,7 +484,7 @@ func (a *App) AddTeamMembers(teamId string, userIds []string, userRequestorId st message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_ADDED_TO_TEAM, "", "", userId, nil) message.Add("team_id", teamId) message.Add("user_id", userId) - Publish(message) + a.Publish(message) } return members, nil @@ -603,7 +603,7 @@ func (a *App) LeaveTeam(team *model.Team, user *model.User) *model.AppError { 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) + a.Publish(message) teamMember.Roles = "" teamMember.DeleteAt = model.GetMillis() |