Renaming repo

.gitignore

@@ -93,3 +93,4 @@ tags
 .idea
 
 debug
+client

Makefile

@@ -26,7 +26,7 @@ else
 	BUILD_ENTERPRISE_READY = false
 	BUILD_TYPE_NAME = team
 endif
-BUILD_WEBAPP_DIR ?= ./webapp
+BUILD_WEBAPP_DIR ?= ../mattermost-webapp
 BUILD_CLIENT = false
 BUILD_HASH_CLIENT = independant
 ifneq ($(wildcard $(BUILD_WEBAPP_DIR)/.),)
@@ -374,6 +374,7 @@ run-cli: start-docker
 run-client:
 	@echo Running mattermost client for development
 
+	ln -s $(BUILD_WEBAPP_DIR)/dist client
 	cd $(BUILD_WEBAPP_DIR) && $(MAKE) run
 
 run-client-fullmap:
@@ -451,13 +452,13 @@ setup-mac:
 
 
 todo:
-	@! ag --ignore Makefile --ignore-dir vendor --ignore-dir runtime --ignore-dir webapp/non_npm_dependencies/ TODO
+	@! ag --ignore Makefile --ignore-dir vendor --ignore-dir runtime TODO
-	@! ag --ignore Makefile --ignore-dir vendor --ignore-dir runtime --ignore-dir webapp/non_npm_dependencies/ XXX
+	@! ag --ignore Makefile --ignore-dir vendor --ignore-dir runtime XXX
-	@! ag --ignore Makefile --ignore-dir vendor --ignore-dir runtime --ignore-dir webapp/non_npm_dependencies/ FIXME
+	@! ag --ignore Makefile --ignore-dir vendor --ignore-dir runtime FIXME
-	@! ag --ignore Makefile --ignore-dir vendor --ignore-dir runtime --ignore-dir webapp/non_npm_dependencies/ "FIX ME"
+	@! ag --ignore Makefile --ignore-dir vendor --ignore-dir runtime "FIX ME"
 ifeq ($(BUILD_ENTERPRISE_READY),true)
-	@! ag --ignore Makefile --ignore-dir vendor --ignore-dir runtime --ignore-dir webapp/non_npm_dependencies/ TODO enterprise/
+	@! ag --ignore Makefile --ignore-dir vendor --ignore-dir runtime TODO enterprise/
-	@! ag --ignore Makefile --ignore-dir vendor --ignore-dir runtime --ignore-dir webapp/non_npm_dependencies/ XXX enterprise/
+	@! ag --ignore Makefile --ignore-dir vendor --ignore-dir runtime XXX enterprise/
-	@! ag --ignore Makefile --ignore-dir vendor --ignore-dir runtime --ignore-dir webapp/non_npm_dependencies/ FIXME enterprise/
+	@! ag --ignore Makefile --ignore-dir vendor --ignore-dir runtime FIXME enterprise/
-	@! ag --ignore Makefile --ignore-dir vendor --ignore-dir runtime --ignore-dir webapp/non_npm_dependencies/ "FIX ME" enterprise/
+	@! ag --ignore Makefile --ignore-dir vendor --ignore-dir runtime "FIX ME" enterprise/
 endif

api/admin.go

@@ -9,10 +9,10 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/einterfaces"
+	"github.com/mattermost/mattermost-server/einterfaces"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 	"github.com/mssola/user_agent"
 )
 

api/admin_test.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestGetLogs(t *testing.T) {

api/api.go

@@ -8,10 +8,10 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/einterfaces"
+	"github.com/mattermost/mattermost-server/einterfaces"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 
 	_ "github.com/nicksnyder/go-i18n/i18n"
 )

api/apitestlib.go

@@ -6,12 +6,12 @@ package api
 import (
 	"time"
 
-	"github.com/mattermost/platform/api4"
+	"github.com/mattermost/mattermost-server/api4"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
-	"github.com/mattermost/platform/wsapi"
+	"github.com/mattermost/mattermost-server/wsapi"
 
 	l4g "github.com/alecthomas/log4go"
 )

api/channel.go

@@ -9,9 +9,9 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitChannel() {

api/channel_test.go

@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreateChannel(t *testing.T) {

api/cli_test.go

@@ -7,8 +7,8 @@ import (
 	"os/exec"
 	"testing"
 
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestCliVersion(t *testing.T) {
@@ -16,7 +16,7 @@ func TestCliVersion(t *testing.T) {
 		t.SkipNow()
 	}
 
-	cmd := exec.Command("bash", "-c", `go run ../cmd/platform/*.go version`)
+	cmd := exec.Command("bash", "-c", `go run ../cmd/mattermost-server/*.go version`)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
 		t.Log(string(output))
@@ -35,7 +35,7 @@ func TestCliCreateTeam(t *testing.T) {
 	name := "name" + id
 	displayName := "Name " + id
 
-	cmd := exec.Command("bash", "-c", `go run ../cmd/platform/*.go team create --name "`+name+`" --display_name "`+displayName+`"`)
+	cmd := exec.Command("bash", "-c", `go run ../cmd/mattermost-server/*.go team create --name "`+name+`" --display_name "`+displayName+`"`)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
 		t.Log(string(output))
@@ -60,14 +60,14 @@ func TestCliCreateUserWithTeam(t *testing.T) {
 	email := "success+" + id + "@simulator.amazonses.com"
 	username := "name" + id
 
-	cmd := exec.Command("bash", "-c", `go run ../cmd/platform/*.go user create --email "`+email+`" --password "mypassword1" --username "`+username+`"`)
+	cmd := exec.Command("bash", "-c", `go run ../cmd/mattermost-server/*.go user create --email "`+email+`" --password "mypassword1" --username "`+username+`"`)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
 		t.Log(string(output))
 		t.Fatal(err)
 	}
 
-	cmd2 := exec.Command("bash", "-c", `go run ../cmd/platform/*.go team add `+th.SystemAdminTeam.Id+" "+email)
+	cmd2 := exec.Command("bash", "-c", `go run ../cmd/mattermost-server/*.go team add `+th.SystemAdminTeam.Id+" "+email)
 	output2, err2 := cmd2.CombinedOutput()
 	if err2 != nil {
 		t.Log(string(output2))
@@ -100,7 +100,7 @@ func TestCliCreateUserWithoutTeam(t *testing.T) {
 	email := "success+" + id + "@simulator.amazonses.com"
 	username := "name" + id
 
-	cmd := exec.Command("bash", "-c", `go run ../cmd/platform/*.go user create --email "`+email+`" --password "mypassword1" --username "`+username+`"`)
+	cmd := exec.Command("bash", "-c", `go run ../cmd/mattermost-server/*.go user create --email "`+email+`" --password "mypassword1" --username "`+username+`"`)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
 		t.Log(string(output))
@@ -124,7 +124,7 @@ func TestCliAssignRole(t *testing.T) {
 
 	th := Setup().InitBasic()
 
-	cmd := exec.Command("bash", "-c", "go run ../cmd/platform/*.go roles system_admin "+th.BasicUser.Email)
+	cmd := exec.Command("bash", "-c", "go run ../cmd/mattermost-server/*.go roles system_admin "+th.BasicUser.Email)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
 		t.Log(string(output))
@@ -167,7 +167,7 @@ func TestCliJoinChannel(t *testing.T) {
 	// }
 
 	// should fail because channel does not exist
-	cmd2 := exec.Command("bash", "-c", "go run ../cmd/platform/*.go channel add "+th.BasicTeam.Name+":"+channel.Name+"asdf "+th.BasicUser2.Email)
+	cmd2 := exec.Command("bash", "-c", "go run ../cmd/mattermost-server/*.go channel add "+th.BasicTeam.Name+":"+channel.Name+"asdf "+th.BasicUser2.Email)
 	output2, err2 := cmd2.CombinedOutput()
 	if err2 == nil {
 		t.Log(string(output2))
@@ -175,7 +175,7 @@ func TestCliJoinChannel(t *testing.T) {
 	}
 
 	// should fail because channel does not have license
-	cmd3 := exec.Command("bash", "-c", "go run ../cmd/platform/*.go channel add "+th.BasicTeam.Name+":"+channel.Name+" "+th.BasicUser2.Email)
+	cmd3 := exec.Command("bash", "-c", "go run ../cmd/mattermost-server/*.go channel add "+th.BasicTeam.Name+":"+channel.Name+" "+th.BasicUser2.Email)
 	output3, err3 := cmd3.CombinedOutput()
 	if err3 == nil {
 		t.Log(string(output3))
@@ -216,7 +216,7 @@ func TestCliRemoveChannel(t *testing.T) {
 	// }
 
 	// cannot leave town-square
-	cmd1a := exec.Command("bash", "-c", "go run ../cmd/platform/*.go channel remove "+th.BasicTeam.Name+":town-square "+th.BasicUser2.Email)
+	cmd1a := exec.Command("bash", "-c", "go run ../cmd/mattermost-server/*.go channel remove "+th.BasicTeam.Name+":town-square "+th.BasicUser2.Email)
 	output1a, err1a := cmd1a.CombinedOutput()
 	if err1a == nil {
 		t.Log(string(output1a))
@@ -224,7 +224,7 @@ func TestCliRemoveChannel(t *testing.T) {
 	}
 
 	// should fail because channel does not exist
-	cmd2 := exec.Command("bash", "-c", "go run ../cmd/platform/*.go channel remove "+th.BasicTeam.Name+":doesnotexist "+th.BasicUser2.Email)
+	cmd2 := exec.Command("bash", "-c", "go run ../cmd/mattermost-server/*.go channel remove "+th.BasicTeam.Name+":doesnotexist "+th.BasicUser2.Email)
 	output2, err2 := cmd2.CombinedOutput()
 	if err2 == nil {
 		t.Log(string(output2))
@@ -232,7 +232,7 @@ func TestCliRemoveChannel(t *testing.T) {
 	}
 
 	// should fail because channel does not have license
-	cmd3 := exec.Command("bash", "-c", "go run ../cmd/platform/*.go channel remove "+th.BasicTeam.Name+":"+channel.Name+" "+th.BasicUser2.Email)
+	cmd3 := exec.Command("bash", "-c", "go run ../cmd/mattermost-server/*.go channel remove "+th.BasicTeam.Name+":"+channel.Name+" "+th.BasicUser2.Email)
 	output3, err3 := cmd3.CombinedOutput()
 	if err3 == nil {
 		t.Log(string(output3))
@@ -267,7 +267,7 @@ func TestCliListChannels(t *testing.T) {
 	// }
 
 	// should fail because channel does not have license
-	cmd3 := exec.Command("bash", "-c", "go run ../cmd/platform/*.go channel list "+th.BasicTeam.Name)
+	cmd3 := exec.Command("bash", "-c", "go run ../cmd/mattermost-server/*.go channel list "+th.BasicTeam.Name)
 	output3, err3 := cmd3.CombinedOutput()
 	if err3 == nil {
 		t.Log(string(output3))
@@ -302,7 +302,7 @@ func TestCliRestoreChannel(t *testing.T) {
 	// }
 
 	// should fail because channel does not have license
-	cmd3 := exec.Command("bash", "-c", "go run ../cmd/platform/*.go channel restore "+th.BasicTeam.Name+":"+channel.Name)
+	cmd3 := exec.Command("bash", "-c", "go run ../cmd/mattermost-server/*.go channel restore "+th.BasicTeam.Name+":"+channel.Name)
 	output3, err3 := cmd3.CombinedOutput()
 	if err3 == nil {
 		t.Log(string(output3))
@@ -317,7 +317,7 @@ func TestCliJoinTeam(t *testing.T) {
 
 	th := Setup().InitSystemAdmin().InitBasic()
 
-	cmd := exec.Command("bash", "-c", "go run ../cmd/platform/*.go team add "+th.SystemAdminTeam.Name+" "+th.BasicUser.Email)
+	cmd := exec.Command("bash", "-c", "go run ../cmd/mattermost-server/*.go team add "+th.SystemAdminTeam.Name+" "+th.BasicUser.Email)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
 		t.Log(string(output))
@@ -347,7 +347,7 @@ func TestCliLeaveTeam(t *testing.T) {
 
 	th := Setup().InitBasic()
 
-	cmd := exec.Command("bash", "-c", "go run ../cmd/platform/*.go team remove "+th.BasicTeam.Name+" "+th.BasicUser.Email)
+	cmd := exec.Command("bash", "-c", "go run ../cmd/mattermost-server/*.go team remove "+th.BasicTeam.Name+" "+th.BasicUser.Email)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
 		t.Log(string(output))
@@ -384,7 +384,7 @@ func TestCliResetPassword(t *testing.T) {
 
 	th := Setup().InitBasic()
 
-	cmd := exec.Command("bash", "-c", "go run ../cmd/platform/*.go user password "+th.BasicUser.Email+" password2")
+	cmd := exec.Command("bash", "-c", "go run ../cmd/mattermost-server/*.go user password "+th.BasicUser.Email+" password2")
 	output, err := cmd.CombinedOutput()
 	if err != nil {
 		t.Log(string(output))
@@ -407,7 +407,7 @@ func TestCliCreateChannel(t *testing.T) {
 	name := "name" + id
 
 	// should fail because channel does not have license
-	cmd := exec.Command("bash", "-c", "go run ../cmd/platform/*.go channel create --display_name "+name+" --team "+th.BasicTeam.Name+" --name "+name)
+	cmd := exec.Command("bash", "-c", "go run ../cmd/mattermost-server/*.go channel create --display_name "+name+" --team "+th.BasicTeam.Name+" --name "+name)
 	output, err := cmd.CombinedOutput()
 	if err == nil {
 		t.Log(string(output))
@@ -416,7 +416,7 @@ func TestCliCreateChannel(t *testing.T) {
 
 	// should fail because channel does not have license
 	name = name + "-private"
-	cmd2 := exec.Command("bash", "-c", "go run ../cmd/platform/*.go channel create --display_name="+name+" --team "+th.BasicTeam.Name+" --private --name "+name)
+	cmd2 := exec.Command("bash", "-c", "go run ../cmd/mattermost-server/*.go channel create --display_name="+name+" --team "+th.BasicTeam.Name+" --private --name "+name)
 	output2, err2 := cmd2.CombinedOutput()
 	if err2 == nil {
 		t.Log(string(output2))
@@ -432,7 +432,7 @@ func TestCliMakeUserActiveAndInactive(t *testing.T) {
 	th := Setup().InitBasic()
 
 	// first inactivate the user
-	cmd := exec.Command("bash", "-c", "go run ../cmd/platform/*.go user deactivate "+th.BasicUser.Email)
+	cmd := exec.Command("bash", "-c", "go run ../cmd/mattermost-server/*.go user deactivate "+th.BasicUser.Email)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
 		t.Log(string(output))
@@ -440,7 +440,7 @@ func TestCliMakeUserActiveAndInactive(t *testing.T) {
 	}
 
 	// activate the inactive user
-	cmd2 := exec.Command("bash", "-c", "go run ../cmd/platform/*.go user activate "+th.BasicUser.Email)
+	cmd2 := exec.Command("bash", "-c", "go run ../cmd/mattermost-server/*.go user activate "+th.BasicUser.Email)
 	output2, err2 := cmd2.CombinedOutput()
 	if err2 != nil {
 		t.Log(string(output2))

api/command.go

@@ -10,9 +10,9 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitCommand() {

api/command_echo_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestEchoCommand(t *testing.T) {

api/command_expand_collapse_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestExpandCommand(t *testing.T) {

api/command_help_test.go

@@ -6,8 +6,8 @@ package api
 import (
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestHelpCommand(t *testing.T) {

api/command_invite_people_test.go

@@ -6,7 +6,7 @@ package api
 import (
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestInvitePeopleCommand(t *testing.T) {

api/command_join_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 // also used to test /open (see command_open_test.go)

api/command_leave_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestLeaveCommands(t *testing.T) {

api/command_loadtest_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestLoadTestHelpCommands(t *testing.T) {
@@ -141,7 +141,7 @@ func TestLoadTestUrlCommands(t *testing.T) {
 	//	t.Fatal("/loadtest url with invalid url should've failed")
 	//}
 	//
-	//command = "/loadtest url https://raw.githubusercontent.com/mattermost/platform/master/README.md"
+	//command = "/loadtest url https://raw.githubusercontent.com/mattermost/mattermost-server/master/README.md"
 	//if r := Client.Must(Client.Command(channel.Id, command, false)).Data.(*model.CommandResponse); r.Text != "Loaded data" {
 	//	t.Fatal("/loadtest url for README.md should've executed")
 	//}

api/command_me_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestMeCommand(t *testing.T) {

api/command_msg_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestMsgCommands(t *testing.T) {

api/command_shrug_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestShrugCommand(t *testing.T) {

api/command_statuses_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestStatusCommands(t *testing.T) {

api/command_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestListCommands(t *testing.T) {

api/context.go

@@ -14,10 +14,10 @@ import (
 	"github.com/gorilla/mux"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/einterfaces"
+	"github.com/mattermost/mattermost-server/einterfaces"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 type Context struct {

api/deprecated.go

@@ -5,7 +5,7 @@ package api
 
 import (
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 // ONLY FOR APIs SCHEDULED TO BE DEPRECATED

api/emoji.go

@@ -15,10 +15,10 @@ import (
 	l4g "github.com/alecthomas/log4go"
 	"github.com/disintegration/imaging"
 	"github.com/gorilla/mux"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/einterfaces"
+	"github.com/mattermost/mattermost-server/einterfaces"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitEmoji() {

api/emoji_test.go

@@ -10,10 +10,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestGetEmoji(t *testing.T) {

api/file.go

@@ -11,9 +11,9 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const (

api/file_test.go

@@ -14,10 +14,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 
 	s3 "github.com/minio/minio-go"
 	"github.com/minio/minio-go/pkg/credentials"

api/general.go

@@ -10,9 +10,9 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitGeneral() {

api/general_test.go

@@ -6,7 +6,7 @@ package api
 import (
 	"testing"
 
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestGetClientProperties(t *testing.T) {

api/license.go

@@ -9,9 +9,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitLicense() {

api/license_test.go

@@ -6,7 +6,7 @@ package api
 import (
 	"testing"
 
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestGetLicenceConfig(t *testing.T) {

api/oauth.go

@@ -8,9 +8,9 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitOAuth() {

api/oauth_test.go

@@ -12,9 +12,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/platform/einterfaces"
+	"github.com/mattermost/mattermost-server/einterfaces"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestOAuthRegisterApp(t *testing.T) {

api/post.go

@@ -9,9 +9,9 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const OPEN_GRAPH_METADATA_CACHE_SIZE = 10000

api/post_test.go

@@ -15,10 +15,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreatePost(t *testing.T) {

api/preference.go

@@ -8,8 +8,8 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitPreference() {

api/preference_test.go

@@ -6,7 +6,7 @@ package api
 import (
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestGetAllPreferences(t *testing.T) {

api/reaction.go

@@ -8,9 +8,9 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitReaction() {

api/reaction_test.go

@@ -6,7 +6,7 @@ package api
 import (
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestSaveReaction(t *testing.T) {

api/status.go

@@ -8,9 +8,9 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitStatus() {

api/status_test.go

@@ -8,9 +8,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestStatuses(t *testing.T) {

api/team.go

@@ -13,9 +13,9 @@ import (
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
 
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitTeam() {

api/team_test.go

@@ -6,9 +6,9 @@ package api
 import (
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreateTeam(t *testing.T) {

api/user.go

@@ -13,11 +13,11 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/einterfaces"
+	"github.com/mattermost/mattermost-server/einterfaces"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitUser() {

api/user_test.go

@@ -16,10 +16,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreateUser(t *testing.T) {

api/webhook.go

@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitWebhook() {

api/webhook_test.go

@@ -8,8 +8,8 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreateIncomingHook(t *testing.T) {

api/webrtc.go

@@ -7,8 +7,8 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitWebrtc() {

api/websocket.go

@@ -8,9 +8,9 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/websocket"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitWebSocket() {

api/websocket_test.go

@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 /*func TestWebSocketAuthentication(t *testing.T) {

api4/api.go

@@ -8,10 +8,10 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/einterfaces"
+	"github.com/mattermost/mattermost-server/einterfaces"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 
 	_ "github.com/nicksnyder/go-i18n/i18n"
 )

api4/apitestlib.go

@@ -17,13 +17,13 @@ import (
 	"time"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
-	"github.com/mattermost/platform/wsapi"
+	"github.com/mattermost/mattermost-server/wsapi"
 
-	"github.com/mattermost/platform/jobs"
+	"github.com/mattermost/mattermost-server/jobs"
 	s3 "github.com/minio/minio-go"
 	"github.com/minio/minio-go/pkg/credentials"
 )

api4/brand.go

@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitBrand() {

api4/channel.go

@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitChannel() {

api4/channel_test.go

@@ -11,9 +11,9 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreateChannel(t *testing.T) {

api4/cluster.go

@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitCluster() {

api4/command.go

@@ -10,9 +10,9 @@ import (
 	"strings"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitCommand() {

api4/command_help_test.go

@@ -6,8 +6,8 @@ package api4
 import (
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestHelpCommand(t *testing.T) {

api4/command_test.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreateCommand(t *testing.T) {

api4/compliance.go

@@ -8,9 +8,9 @@ import (
 	"strconv"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 	"github.com/mssola/user_agent"
 )
 

api4/context.go

@@ -13,10 +13,10 @@ import (
 	l4g "github.com/alecthomas/log4go"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/einterfaces"
+	"github.com/mattermost/mattermost-server/einterfaces"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 type Context struct {

api4/elasticsearch.go

@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitElasticsearch() {

api4/emoji.go

@@ -9,10 +9,10 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/einterfaces"
+	"github.com/mattermost/mattermost-server/einterfaces"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitEmoji() {

api4/emoji_test.go

@@ -9,8 +9,8 @@ import (
 	_ "image/gif"
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreateEmoji(t *testing.T) {

api4/file.go

@@ -10,9 +10,9 @@ import (
 	"strings"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const (

api4/file_test.go

@@ -10,10 +10,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestUploadFile(t *testing.T) {

api4/job.go

@@ -7,8 +7,8 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func InitJob() {

api4/job_test.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/store"
 )
 
 func TestCreateJob(t *testing.T) {

api4/ldap.go

@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitLdap() {

api4/oauth.go

@@ -9,9 +9,9 @@ import (
 	"strings"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitOAuth() {

api4/oauth_test.go

@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreateOAuthApp(t *testing.T) {

api4/openGraph.go

@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const OPEN_GRAPH_METADATA_CACHE_SIZE = 10000

api4/openGraph_test.go

@@ -11,7 +11,7 @@ import (
 
 	"testing"
 
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestGetOpenGraphMetadata(t *testing.T) {

api4/plugin.go

@@ -9,9 +9,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const (

api4/plugin_test.go

@@ -9,7 +9,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

api4/post.go

@@ -8,9 +8,9 @@ import (
 	"strconv"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitPost() {

api4/post_test.go

@@ -14,9 +14,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreatePost(t *testing.T) {

api4/preference.go

@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitPreference() {

api4/preference_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestGetPreferences(t *testing.T) {

api4/reaction.go

@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitReaction() {

api4/reaction_test.go

@@ -9,7 +9,7 @@ import (
 
 	"reflect"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestSaveReaction(t *testing.T) {

api4/saml.go

@@ -8,9 +8,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitSaml() {

api4/status.go

@@ -8,9 +8,9 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitStatus() {

api4/status_test.go

@@ -3,7 +3,7 @@ package api4
 import (
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestGetUserStatus(t *testing.T) {

api4/system.go

@@ -11,9 +11,9 @@ import (
 	"strconv"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitSystem() {

api4/system_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestGetPing(t *testing.T) {

api4/team.go

@@ -10,9 +10,9 @@ import (
 	"strconv"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const (

api4/team_test.go

@@ -14,8 +14,8 @@ import (
 
 	"encoding/base64"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreateTeam(t *testing.T) {

api4/user.go

@@ -10,10 +10,10 @@ import (
 	"time"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitUser() {

api4/user_test.go

@@ -10,8 +10,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

api4/webhook.go

@@ -10,9 +10,9 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitWebhook() {

api4/webhook_test.go

@@ -8,8 +8,8 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreateIncomingWebhook(t *testing.T) {

api4/webrtc.go

@@ -7,8 +7,8 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitWebrtc() {

api4/webrtc_test.go

@@ -6,7 +6,7 @@ package api4
 import (
 	"testing"
 
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestGetWebrtcToken(t *testing.T) {

api4/websocket.go

@@ -8,9 +8,9 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/websocket"
-	"github.com/mattermost/platform/app"
+	"github.com/mattermost/mattermost-server/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitWebSocket() {

api4/websocket_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestWebSocket(t *testing.T) {

app/admin.go

@@ -14,11 +14,11 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/einterfaces"
+	"github.com/mattermost/mattermost-server/einterfaces"
-	"github.com/mattermost/platform/jobs"
+	"github.com/mattermost/mattermost-server/jobs"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func GetLogs(page, perPage int) ([]string, *model.AppError) {

app/analytics.go

@@ -5,10 +5,10 @@ package app
 
 import (
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/einterfaces"
+	"github.com/mattermost/mattermost-server/einterfaces"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const (

app/apptestlib.go

@@ -6,8 +6,8 @@ package app
 import (
 	"time"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 
 	l4g "github.com/alecthomas/log4go"
 )