diff options
author | Chris <ccbrown112@gmail.com> | 2017-09-21 04:13:34 -0500 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2017-09-21 10:13:34 +0100 |
commit | 266ff8670244da288aec937320d9eecc7996af35 (patch) | |
tree | 39e4e528cda0abb24be317683516ee246717fc68 /cmd/platform/userargs.go | |
parent | adab1a660fdc0c307238279edc7a9918d14577e5 (diff) | |
download | chat-266ff8670244da288aec937320d9eecc7996af35.tar.gz chat-266ff8670244da288aec937320d9eecc7996af35.tar.bz2 chat-266ff8670244da288aec937320d9eecc7996af35.zip |
remove more global refs (#7480)
Diffstat (limited to 'cmd/platform/userargs.go')
-rw-r--r-- | cmd/platform/userargs.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd/platform/userargs.go b/cmd/platform/userargs.go index 8fb0147fb..0089cc4da 100644 --- a/cmd/platform/userargs.go +++ b/cmd/platform/userargs.go @@ -7,29 +7,29 @@ import ( "github.com/mattermost/mattermost-server/model" ) -func getUsersFromUserArgs(userArgs []string) []*model.User { +func getUsersFromUserArgs(a *app.App, userArgs []string) []*model.User { users := make([]*model.User, 0, len(userArgs)) for _, userArg := range userArgs { - user := getUserFromUserArg(userArg) + user := getUserFromUserArg(a, userArg) users = append(users, user) } return users } -func getUserFromUserArg(userArg string) *model.User { +func getUserFromUserArg(a *app.App, userArg string) *model.User { var user *model.User - if result := <-app.Global().Srv.Store.User().GetByEmail(userArg); result.Err == nil { + if result := <-a.Srv.Store.User().GetByEmail(userArg); result.Err == nil { user = result.Data.(*model.User) } if user == nil { - if result := <-app.Global().Srv.Store.User().GetByUsername(userArg); result.Err == nil { + if result := <-a.Srv.Store.User().GetByUsername(userArg); result.Err == nil { user = result.Data.(*model.User) } } if user == nil { - if result := <-app.Global().Srv.Store.User().Get(userArg); result.Err == nil { + if result := <-a.Srv.Store.User().Get(userArg); result.Err == nil { user = result.Data.(*model.User) } } |