diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-01-13 13:53:37 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-13 13:53:37 -0500 |
commit | 97558f6a6ec4c53fa69035fb430ead209d9c222d (patch) | |
tree | 6fc57f5b75b15a025348c6e295cea6aedb9e69ae /api/auto_users.go | |
parent | 07bad4d6d518a9012a20fec8309cd625f57c7a8c (diff) | |
download | chat-97558f6a6ec4c53fa69035fb430ead209d9c222d.tar.gz chat-97558f6a6ec4c53fa69035fb430ead209d9c222d.tar.bz2 chat-97558f6a6ec4c53fa69035fb430ead209d9c222d.zip |
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
Diffstat (limited to 'api/auto_users.go')
-rw-r--r-- | api/auto_users.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/api/auto_users.go b/api/auto_users.go index 7439de96e..f1f7b483c 100644 --- a/api/auto_users.go +++ b/api/auto_users.go @@ -4,6 +4,7 @@ package api import ( + "github.com/mattermost/platform/app" "github.com/mattermost/platform/model" "github.com/mattermost/platform/store" "github.com/mattermost/platform/utils" @@ -49,8 +50,8 @@ func CreateBasicUser(client *model.Client) *model.AppError { return err } ruser := result.Data.(*model.User) - store.Must(Srv.Store.User().VerifyEmail(ruser.Id)) - store.Must(Srv.Store.Team().SaveMember(&model.TeamMember{TeamId: basicteam.Id, UserId: ruser.Id})) + store.Must(app.Srv.Store.User().VerifyEmail(ruser.Id)) + store.Must(app.Srv.Store.Team().SaveMember(&model.TeamMember{TeamId: basicteam.Id, UserId: ruser.Id})) } return nil } @@ -81,14 +82,14 @@ func (cfg *AutoUserCreator) createRandomUser() (*model.User, bool) { ruser := result.Data.(*model.User) status := &model.Status{ruser.Id, model.STATUS_ONLINE, false, model.GetMillis(), ""} - if result := <-Srv.Store.Status().SaveOrUpdate(status); result.Err != nil { + if result := <-app.Srv.Store.Status().SaveOrUpdate(status); result.Err != nil { result.Err.Translate(utils.T) l4g.Error(result.Err.Error()) return nil, false } // We need to cheat to verify the user's email - store.Must(Srv.Store.User().VerifyEmail(ruser.Id)) + store.Must(app.Srv.Store.User().VerifyEmail(ruser.Id)) return result.Data.(*model.User), true } |