From 97558f6a6ec4c53fa69035fb430ead209d9c222d Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 13 Jan 2017 13:53:37 -0500 Subject: PLT-4938 Add app package and move logic over from api package (#4931) * Add app package and move logic over from api package * Change app package functions to return errors * Move non-api tests into app package * Fix merge --- cmd/platform/userargs.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cmd/platform/userargs.go') diff --git a/cmd/platform/userargs.go b/cmd/platform/userargs.go index 9ac00ae70..31ae3c251 100644 --- a/cmd/platform/userargs.go +++ b/cmd/platform/userargs.go @@ -3,7 +3,7 @@ package main import ( - "github.com/mattermost/platform/api" + "github.com/mattermost/platform/app" "github.com/mattermost/platform/model" ) @@ -18,18 +18,18 @@ func getUsersFromUserArgs(userArgs []string) []*model.User { func getUserFromUserArg(userArg string) *model.User { var user *model.User - if result := <-api.Srv.Store.User().GetByEmail(userArg); result.Err == nil { + if result := <-app.Srv.Store.User().GetByEmail(userArg); result.Err == nil { user = result.Data.(*model.User) } if user == nil { - if result := <-api.Srv.Store.User().GetByUsername(userArg); result.Err == nil { + if result := <-app.Srv.Store.User().GetByUsername(userArg); result.Err == nil { user = result.Data.(*model.User) } } if user == nil { - if result := <-api.Srv.Store.User().Get(userArg); result.Err == nil { + if result := <-app.Srv.Store.User().Get(userArg); result.Err == nil { user = result.Data.(*model.User) } } -- cgit v1.2.3-1-g7c22