diff options
Diffstat (limited to 'api')
49 files changed, 146 insertions, 146 deletions
diff --git a/api/admin.go b/api/admin.go index 76a99764e..02b056931 100644 --- a/api/admin.go +++ b/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/platform/einterfaces" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/einterfaces" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" "github.com/mssola/user_agent" ) diff --git a/api/admin_test.go b/api/admin_test.go index 74b6c1c80..8263ac038 100644 --- a/api/admin_test.go +++ b/api/admin_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/store" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/utils" ) func TestGetLogs(t *testing.T) { diff --git a/api/api.go b/api/api.go index 814341003..8e8064731 100644 --- a/api/api.go +++ b/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/platform/einterfaces" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/einterfaces" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" _ "github.com/nicksnyder/go-i18n/i18n" ) diff --git a/api/apitestlib.go b/api/apitestlib.go index bcab1edf7..71a1f59c2 100644 --- a/api/apitestlib.go +++ b/api/apitestlib.go @@ -6,12 +6,12 @@ package api import ( "time" - "github.com/mattermost/platform/api4" - "github.com/mattermost/platform/app" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/store" - "github.com/mattermost/platform/utils" - "github.com/mattermost/platform/wsapi" + "github.com/mattermost/mattermost-server/api4" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/wsapi" l4g "github.com/alecthomas/log4go" ) diff --git a/api/channel.go b/api/channel.go index dc6124430..6867e0017 100644 --- a/api/channel.go +++ b/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/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) func InitChannel() { diff --git a/api/channel_test.go b/api/channel_test.go index 8a0ec7c62..692905e8b 100644 --- a/api/channel_test.go +++ b/api/channel_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/store" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/utils" ) func TestCreateChannel(t *testing.T) { diff --git a/api/cli_test.go b/api/cli_test.go index 971cfb017..2e9032ff0 100644 --- a/api/cli_test.go +++ b/api/cli_test.go @@ -7,8 +7,8 @@ import ( "os/exec" "testing" - "github.com/mattermost/platform/app" - "github.com/mattermost/platform/model" + "github.com/mattermost/mattermost-server/app" + "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)) diff --git a/api/command.go b/api/command.go index 429b58836..cad294823 100644 --- a/api/command.go +++ b/api/command.go @@ -10,9 +10,9 @@ import ( l4g "github.com/alecthomas/log4go" - "github.com/mattermost/platform/app" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) func InitCommand() { diff --git a/api/command_echo_test.go b/api/command_echo_test.go index 56df94b0b..7473853de 100644 --- a/api/command_echo_test.go +++ b/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) { diff --git a/api/command_expand_collapse_test.go b/api/command_expand_collapse_test.go index 54873377c..79ae4af66 100644 --- a/api/command_expand_collapse_test.go +++ b/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) { diff --git a/api/command_help_test.go b/api/command_help_test.go index 8ce9dec6c..5f47a5101 100644 --- a/api/command_help_test.go +++ b/api/command_help_test.go @@ -6,8 +6,8 @@ package api import ( "testing" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) func TestHelpCommand(t *testing.T) { diff --git a/api/command_invite_people_test.go b/api/command_invite_people_test.go index 0e8c3fe38..10ad4ca31 100644 --- a/api/command_invite_people_test.go +++ b/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) { diff --git a/api/command_join_test.go b/api/command_join_test.go index f71b91f41..cd88c2699 100644 --- a/api/command_join_test.go +++ b/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) diff --git a/api/command_leave_test.go b/api/command_leave_test.go index ae098b8a2..455b0cbcf 100644 --- a/api/command_leave_test.go +++ b/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) { diff --git a/api/command_loadtest_test.go b/api/command_loadtest_test.go index fb5fcb20a..e7c8f1e3f 100644 --- a/api/command_loadtest_test.go +++ b/api/command_loadtest_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/model" + "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") //} diff --git a/api/command_me_test.go b/api/command_me_test.go index 1f49566fa..7c47d934d 100644 --- a/api/command_me_test.go +++ b/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) { diff --git a/api/command_msg_test.go b/api/command_msg_test.go index d1b15b7e7..7ea93420a 100644 --- a/api/command_msg_test.go +++ b/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) { diff --git a/api/command_shrug_test.go b/api/command_shrug_test.go index b265fbb25..dd11bf2af 100644 --- a/api/command_shrug_test.go +++ b/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) { diff --git a/api/command_statuses_test.go b/api/command_statuses_test.go index a562ed882..031d5844d 100644 --- a/api/command_statuses_test.go +++ b/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) { diff --git a/api/command_test.go b/api/command_test.go index 0d575d702..8837ff8e7 100644 --- a/api/command_test.go +++ b/api/command_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) func TestListCommands(t *testing.T) { diff --git a/api/context.go b/api/context.go index 2778e68a4..8cabf38b7 100644 --- a/api/context.go +++ b/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/platform/einterfaces" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/einterfaces" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) type Context struct { diff --git a/api/deprecated.go b/api/deprecated.go index 1c1228793..739b6658c 100644 --- a/api/deprecated.go +++ b/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 diff --git a/api/emoji.go b/api/emoji.go index ebecef276..2b29974e3 100644 --- a/api/emoji.go +++ b/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/platform/einterfaces" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/einterfaces" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) func InitEmoji() { diff --git a/api/emoji_test.go b/api/emoji_test.go index ee3bc0bf9..01fd9411c 100644 --- a/api/emoji_test.go +++ b/api/emoji_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/mattermost/platform/app" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/store" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/utils" ) func TestGetEmoji(t *testing.T) { diff --git a/api/file.go b/api/file.go index 6fd963799..094c7d996 100644 --- a/api/file.go +++ b/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/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) const ( diff --git a/api/file_test.go b/api/file_test.go index 367a414fb..02a0c0cfd 100644 --- a/api/file_test.go +++ b/api/file_test.go @@ -14,10 +14,10 @@ import ( "testing" "time" - "github.com/mattermost/platform/app" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/store" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/utils" s3 "github.com/minio/minio-go" "github.com/minio/minio-go/pkg/credentials" diff --git a/api/general.go b/api/general.go index ceb0b209f..09bbc75c5 100644 --- a/api/general.go +++ b/api/general.go @@ -10,9 +10,9 @@ import ( l4g "github.com/alecthomas/log4go" - "github.com/mattermost/platform/app" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) func InitGeneral() { diff --git a/api/general_test.go b/api/general_test.go index 1fb041ae6..cec1032eb 100644 --- a/api/general_test.go +++ b/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) { diff --git a/api/license.go b/api/license.go index 84ee076e6..e9ba85e59 100644 --- a/api/license.go +++ b/api/license.go @@ -9,9 +9,9 @@ import ( "net/http" l4g "github.com/alecthomas/log4go" - "github.com/mattermost/platform/app" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) func InitLicense() { diff --git a/api/license_test.go b/api/license_test.go index a8f36a2c7..39f723355 100644 --- a/api/license_test.go +++ b/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) { diff --git a/api/oauth.go b/api/oauth.go index 007ec09d9..6297b998c 100644 --- a/api/oauth.go +++ b/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/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) func InitOAuth() { diff --git a/api/oauth_test.go b/api/oauth_test.go index ffabf9414..ac253246a 100644 --- a/api/oauth_test.go +++ b/api/oauth_test.go @@ -12,9 +12,9 @@ import ( "strings" "testing" - "github.com/mattermost/platform/einterfaces" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/einterfaces" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) func TestOAuthRegisterApp(t *testing.T) { diff --git a/api/post.go b/api/post.go index 0b5a5c612..60c9b59bd 100644 --- a/api/post.go +++ b/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/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) const OPEN_GRAPH_METADATA_CACHE_SIZE = 10000 diff --git a/api/post_test.go b/api/post_test.go index 23c7fa371..f571aacd1 100644 --- a/api/post_test.go +++ b/api/post_test.go @@ -15,10 +15,10 @@ import ( "testing" "time" - "github.com/mattermost/platform/app" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/store" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/utils" ) func TestCreatePost(t *testing.T) { diff --git a/api/preference.go b/api/preference.go index b8bdc6f94..097908c72 100644 --- a/api/preference.go +++ b/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/platform/utils" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) func InitPreference() { diff --git a/api/preference_test.go b/api/preference_test.go index bff6e4501..833e49a65 100644 --- a/api/preference_test.go +++ b/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) { diff --git a/api/reaction.go b/api/reaction.go index e3e207e2a..9e12d99f7 100644 --- a/api/reaction.go +++ b/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/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) func InitReaction() { diff --git a/api/reaction_test.go b/api/reaction_test.go index 27a296930..6362f0c39 100644 --- a/api/reaction_test.go +++ b/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) { diff --git a/api/status.go b/api/status.go index 77454389e..fbd986ea3 100644 --- a/api/status.go +++ b/api/status.go @@ -8,9 +8,9 @@ import ( l4g "github.com/alecthomas/log4go" - "github.com/mattermost/platform/app" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) func InitStatus() { diff --git a/api/status_test.go b/api/status_test.go index 1f936d286..19b23ef3b 100644 --- a/api/status_test.go +++ b/api/status_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/store" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/utils" ) func TestStatuses(t *testing.T) { diff --git a/api/team.go b/api/team.go index 31b38688e..962d53965 100644 --- a/api/team.go +++ b/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/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) func InitTeam() { diff --git a/api/team_test.go b/api/team_test.go index 58b471f72..d230651c6 100644 --- a/api/team_test.go +++ b/api/team_test.go @@ -6,9 +6,9 @@ package api import ( "testing" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/store" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/utils" ) func TestCreateTeam(t *testing.T) { diff --git a/api/user.go b/api/user.go index 8815f698f..d95d775e4 100644 --- a/api/user.go +++ b/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/platform/einterfaces" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/store" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/einterfaces" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/utils" ) func InitUser() { diff --git a/api/user_test.go b/api/user_test.go index e28de57df..44ee1bfb0 100644 --- a/api/user_test.go +++ b/api/user_test.go @@ -16,10 +16,10 @@ import ( "testing" "time" - "github.com/mattermost/platform/app" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/store" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/utils" ) func TestCreateUser(t *testing.T) { diff --git a/api/webhook.go b/api/webhook.go index ce7084da9..f0c6701eb 100644 --- a/api/webhook.go +++ b/api/webhook.go @@ -7,9 +7,9 @@ import ( "net/http" l4g "github.com/alecthomas/log4go" - "github.com/mattermost/platform/app" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) func InitWebhook() { diff --git a/api/webhook_test.go b/api/webhook_test.go index c84aee992..efc482828 100644 --- a/api/webhook_test.go +++ b/api/webhook_test.go @@ -8,8 +8,8 @@ import ( "net/http" "testing" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) func TestCreateIncomingHook(t *testing.T) { diff --git a/api/webrtc.go b/api/webrtc.go index 58e35f2fa..31cfb1def 100644 --- a/api/webrtc.go +++ b/api/webrtc.go @@ -7,8 +7,8 @@ import ( "net/http" l4g "github.com/alecthomas/log4go" - "github.com/mattermost/platform/app" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/utils" ) func InitWebrtc() { diff --git a/api/websocket.go b/api/websocket.go index 66a44013b..4b3a9d53b 100644 --- a/api/websocket.go +++ b/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/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) func InitWebSocket() { diff --git a/api/websocket_test.go b/api/websocket_test.go index 739b661ba..9bf957297 100644 --- a/api/websocket_test.go +++ b/api/websocket_test.go @@ -11,9 +11,9 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/mattermost/platform/app" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" + "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/utils" ) /*func TestWebSocketAuthentication(t *testing.T) { |