From 266ff8670244da288aec937320d9eecc7996af35 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 21 Sep 2017 04:13:34 -0500 Subject: remove more global refs (#7480) --- cmd/platform/userargs.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cmd/platform/userargs.go') 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) } } -- cgit v1.2.3-1-g7c22