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/user.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/user.go')
| -rw-r--r-- | app/user.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/user.go b/app/user.go index c91b4cfb7..27f1c5d85 100644 --- a/app/user.go +++ b/app/user.go @@ -202,7 +202,7 @@ func (a *App) CreateUser(user *model.User) (*model.User, *model.AppError) { // 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", ruser.Id) - go Publish(message) + go a.Publish(message) return ruser, nil } @@ -829,7 +829,7 @@ func (a *App) SetProfileImage(userId string, imageData *multipart.FileHeader) *m message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_USER_UPDATED, "", "", "", omitUsers) message.Add("user", user) - Publish(message) + a.Publish(message) } return nil @@ -950,7 +950,7 @@ func (a *App) UpdateUserAsUser(user *model.User, asAdmin bool) (*model.User, *mo return nil, err } - sendUpdatedUserEvent(*updatedUser, asAdmin) + a.sendUpdatedUserEvent(*updatedUser, asAdmin) return updatedUser, nil } @@ -968,19 +968,19 @@ func (a *App) PatchUser(userId string, patch *model.UserPatch, asAdmin bool) (*m return nil, err } - sendUpdatedUserEvent(*updatedUser, asAdmin) + a.sendUpdatedUserEvent(*updatedUser, asAdmin) return updatedUser, nil } -func sendUpdatedUserEvent(user model.User, asAdmin bool) { +func (a *App) sendUpdatedUserEvent(user model.User, asAdmin bool) { SanitizeProfile(&user, asAdmin) omitUsers := make(map[string]bool, 1) omitUsers[user.Id] = true message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_USER_UPDATED, "", "", "", omitUsers) message.Add("user", user) - go Publish(message) + go a.Publish(message) } func (a *App) UpdateUser(user *model.User, sendNotifications bool) (*model.User, *model.AppError) { |