Merge c3b56e0 into ca4181b

mattermost · Mar 3, 2017 · b06a981 · b06a981
2 parents ca4181b + c3b56e0
commit b06a981
Show file tree

Hide file tree

Showing 26 changed files with 809 additions and 712 deletions.
diff --git a/api/command.go b/api/command.go
diff --git a/api/command_expand_collapse.go b/api/command_expand_collapse.go
diff --git a/api/command_join.go b/api/command_join.go
diff --git a/api/command_msg.go b/api/command_msg.go
diff --git a/api/auto_channels.go → app/auto_channels.go b/api/auto_channels.go → app/auto_channels.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-package api
+package app
 
 import (
 	"github.com/mattermost/platform/model"

diff --git a/api/auto_constants.go → app/auto_constants.go b/api/auto_constants.go → app/auto_constants.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-package api
+package app
 
 import (
 	"github.com/mattermost/platform/model"

diff --git a/api/auto_environment.go → app/auto_environment.go b/api/auto_environment.go → app/auto_environment.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-package api
+package app
 
 import (
 	"github.com/mattermost/platform/model"

diff --git a/api/auto_posts.go → app/auto_posts.go b/api/auto_posts.go → app/auto_posts.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-package api
+package app
 
 import (
 	"bytes"

diff --git a/api/auto_teams.go → app/auto_teams.go b/api/auto_teams.go → app/auto_teams.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-package api
+package app
 
 import (
 	"github.com/mattermost/platform/model"

diff --git a/api/auto_users.go → app/auto_users.go b/api/auto_users.go → app/auto_users.go
@@ -1,10 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-package api
+package app
 
 import (
-	"github.com/mattermost/platform/app"
 	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/store"
 	"github.com/mattermost/platform/utils"
@@ -50,8 +49,8 @@ func CreateBasicUser(client *model.Client) *model.AppError {
 			return err
 		}
 		ruser := result.Data.(*model.User)
-		store.Must(app.Srv.Store.User().VerifyEmail(ruser.Id))
-		store.Must(app.Srv.Store.Team().SaveMember(&model.TeamMember{TeamId: basicteam.Id, UserId: ruser.Id}))
+		store.Must(Srv.Store.User().VerifyEmail(ruser.Id))
+		store.Must(Srv.Store.Team().SaveMember(&model.TeamMember{TeamId: basicteam.Id, UserId: ruser.Id}))
 	}
 	return nil
 }
@@ -82,14 +81,14 @@ func (cfg *AutoUserCreator) createRandomUser() (*model.User, bool) {
 	ruser := result.Data.(*model.User)
 
 	status := &model.Status{UserId: ruser.Id, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: model.GetMillis(), ActiveChannel: ""}
-	if result := <-app.Srv.Store.Status().SaveOrUpdate(status); result.Err != nil {
+	if result := <-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(app.Srv.Store.User().VerifyEmail(ruser.Id))
+	store.Must(Srv.Store.User().VerifyEmail(ruser.Id))
 
 	return result.Data.(*model.User), true
 }