MM-53032: Fix module path after repo rename (#23689)

It was a good decision in hindsight to keep the public module as 0.x because this would have been a breaking change again. https://mattermost.atlassian.net/browse/MM-53032 ```release-note Changed the Go module path from github.com/mattermost/mattermost-server/server/v8 to github.com/mattermost/mattermost/server/v8. For the public facing module, it's path is also changed from github.com/mattermost/mattermost-server/server/public to github.com/mattermost/mattermost/server/public ```
2023-06-11 10:54:35 +05:30
--- a/server/channels/app/slashcommands/auto_channels.go
+++ b/server/channels/app/slashcommands/auto_channels.go
@@ -4,10 +4,10 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
-	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/v8/channels/utils"
 )

 type AutoChannelCreator struct {
--- a/server/channels/app/slashcommands/auto_constants.go
+++ b/server/channels/app/slashcommands/auto_constants.go
@@ -4,8 +4,8 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/v8/channels/utils"
 )

 const (
--- a/server/channels/app/slashcommands/auto_environment.go
+++ b/server/channels/app/slashcommands/auto_environment.go
@@ -8,10 +8,10 @@ import (
 	"math/rand"
 	"time"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
-	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/v8/channels/utils"
 )

 type TestEnvironment struct {
--- a/server/channels/app/slashcommands/auto_posts.go
+++ b/server/channels/app/slashcommands/auto_posts.go
@@ -9,11 +9,11 @@ import (
 	"os"
 	"path/filepath"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
-	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
-	"github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/v8/channels/utils"
+	"github.com/mattermost/mattermost/server/v8/channels/utils/fileutils"
 )

 type AutoPostCreator struct {
--- a/server/channels/app/slashcommands/auto_teams.go
+++ b/server/channels/app/slashcommands/auto_teams.go
@@ -6,8 +6,8 @@ package slashcommands
 import (
 	"context"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/v8/channels/utils"
 )

 type TeamEnvironment struct {
--- a/server/channels/app/slashcommands/auto_users.go
+++ b/server/channels/app/slashcommands/auto_users.go
@@ -8,11 +8,11 @@ import (
 	"errors"
 	"net/http"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
-	"github.com/mattermost/mattermost-server/server/v8/channels/store"
-	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/v8/channels/store"
+	"github.com/mattermost/mattermost/server/v8/channels/utils"
 )

 type AutoUserCreator struct {
--- a/server/channels/app/slashcommands/command_away.go
+++ b/server/channels/app/slashcommands/command_away.go
@@ -4,10 +4,10 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type AwayProvider struct {
--- a/server/channels/app/slashcommands/command_channel_header.go
+++ b/server/channels/app/slashcommands/command_channel_header.go
@@ -4,10 +4,10 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type HeaderProvider struct {
--- a/server/channels/app/slashcommands/command_channel_header_test.go
+++ b/server/channels/app/slashcommands/command_channel_header_test.go
@@ -8,7 +8,7 @@ import (

 	"github.com/stretchr/testify/assert"

-	"github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost/server/public/model"
 )

 func TestHeaderProviderDoCommand(t *testing.T) {
--- a/server/channels/app/slashcommands/command_channel_purpose.go
+++ b/server/channels/app/slashcommands/command_channel_purpose.go
@@ -4,10 +4,10 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type PurposeProvider struct {
--- a/server/channels/app/slashcommands/command_channel_purpose_test.go
+++ b/server/channels/app/slashcommands/command_channel_purpose_test.go
@@ -8,7 +8,7 @@ import (

 	"github.com/stretchr/testify/assert"

-	"github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost/server/public/model"
 )

 func TestPurposeProviderDoCommand(t *testing.T) {
--- a/server/channels/app/slashcommands/command_channel_rename.go
+++ b/server/channels/app/slashcommands/command_channel_rename.go
@@ -4,10 +4,10 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type RenameProvider struct {
--- a/server/channels/app/slashcommands/command_channel_rename_test.go
+++ b/server/channels/app/slashcommands/command_channel_rename_test.go
@@ -9,7 +9,7 @@ import (

 	"github.com/stretchr/testify/assert"

-	"github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost/server/public/model"
 )

 func TestRenameProviderDoCommand(t *testing.T) {
--- a/server/channels/app/slashcommands/command_code.go
+++ b/server/channels/app/slashcommands/command_code.go
@@ -6,10 +6,10 @@ package slashcommands
 import (
 	"strings"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type CodeProvider struct {
--- a/server/channels/app/slashcommands/command_code_test.go
+++ b/server/channels/app/slashcommands/command_code_test.go
@@ -6,7 +6,7 @@ package slashcommands
 import (
 	"testing"

-	"github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost/server/public/model"
 )

 func TestCodeProviderDoCommand(t *testing.T) {
--- a/server/channels/app/slashcommands/command_custom_status.go
+++ b/server/channels/app/slashcommands/command_custom_status.go
@@ -8,11 +8,11 @@ import (
 	"strings"
 	"unicode/utf8"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/public/shared/mlog"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type CustomStatusProvider struct {
--- a/server/channels/app/slashcommands/command_custom_status_test.go
+++ b/server/channels/app/slashcommands/command_custom_status_test.go
@@ -6,7 +6,7 @@ package slashcommands
 import (
 	"testing"

-	"github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost/server/public/model"
 )

 func TestGetCustomStatus(t *testing.T) {
--- a/server/channels/app/slashcommands/command_dnd.go
+++ b/server/channels/app/slashcommands/command_dnd.go
@@ -4,10 +4,10 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type DndProvider struct {
--- a/server/channels/app/slashcommands/command_echo.go
+++ b/server/channels/app/slashcommands/command_echo.go
@@ -8,11 +8,11 @@ import (
 	"strings"
 	"time"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/public/shared/mlog"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 var echoSem chan bool
--- a/server/channels/app/slashcommands/command_expand_collapse.go
+++ b/server/channels/app/slashcommands/command_expand_collapse.go
@@ -7,10 +7,10 @@ import (
 	"encoding/json"
 	"strconv"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type ExpandProvider struct {
--- a/server/channels/app/slashcommands/command_groupmsg.go
+++ b/server/channels/app/slashcommands/command_groupmsg.go
@@ -7,11 +7,11 @@ import (
 	"fmt"
 	"strings"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/public/shared/mlog"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type groupmsgProvider struct {
--- a/server/channels/app/slashcommands/command_groupmsg_test.go
+++ b/server/channels/app/slashcommands/command_groupmsg_test.go
@@ -8,8 +8,8 @@ import (

 	"github.com/stretchr/testify/assert"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
 )

 func TestGroupMsgUsernames(t *testing.T) {
--- a/server/channels/app/slashcommands/command_help.go
+++ b/server/channels/app/slashcommands/command_help.go
@@ -4,10 +4,10 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type HelpProvider struct {
--- a/server/channels/app/slashcommands/command_invite.go
+++ b/server/channels/app/slashcommands/command_invite.go
@@ -6,10 +6,10 @@ package slashcommands
 import (
 	"strings"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type InviteProvider struct {
--- a/server/channels/app/slashcommands/command_invite_people.go
+++ b/server/channels/app/slashcommands/command_invite_people.go
@@ -6,11 +6,11 @@ package slashcommands
 import (
 	"strings"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/public/shared/mlog"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type InvitePeopleProvider struct {
--- a/server/channels/app/slashcommands/command_invite_people_test.go
+++ b/server/channels/app/slashcommands/command_invite_people_test.go
@@ -8,7 +8,7 @@ import (

 	"github.com/stretchr/testify/assert"

-	"github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost/server/public/model"
 )

 func TestInvitePeopleProvider(t *testing.T) {
--- a/server/channels/app/slashcommands/command_invite_test.go
+++ b/server/channels/app/slashcommands/command_invite_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
 )

 func TestInviteProvider(t *testing.T) {
--- a/server/channels/app/slashcommands/command_join.go
+++ b/server/channels/app/slashcommands/command_join.go
@@ -6,10 +6,10 @@ package slashcommands
 import (
 	"strings"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type JoinProvider struct {
--- a/server/channels/app/slashcommands/command_join_test.go
+++ b/server/channels/app/slashcommands/command_join_test.go
@@ -8,8 +8,8 @@ import (

 	"github.com/stretchr/testify/assert"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
 )

 func TestJoinCommandNoChannel(t *testing.T) {
--- a/server/channels/app/slashcommands/command_leave.go
+++ b/server/channels/app/slashcommands/command_leave.go
@@ -4,10 +4,10 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type LeaveProvider struct {
--- a/server/channels/app/slashcommands/command_leave_test.go
+++ b/server/channels/app/slashcommands/command_leave_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

-	"github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost/server/public/model"
 )

 func TestLeaveProviderDoCommand(t *testing.T) {
--- a/server/channels/app/slashcommands/command_loadtest.go
+++ b/server/channels/app/slashcommands/command_loadtest.go
@@ -15,12 +15,12 @@ import (

 	"github.com/pkg/errors"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
-	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/public/shared/mlog"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/v8/channels/utils"
 )

 var usage = `Mattermost testing commands to help configure the system
--- a/server/channels/app/slashcommands/command_logout.go
+++ b/server/channels/app/slashcommands/command_logout.go
@@ -4,10 +4,10 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type LogoutProvider struct {
--- a/server/channels/app/slashcommands/command_marketplace.go
+++ b/server/channels/app/slashcommands/command_marketplace.go
@@ -4,10 +4,10 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type MarketplaceProvider struct {
--- a/server/channels/app/slashcommands/command_marketplace_test.go
+++ b/server/channels/app/slashcommands/command_marketplace_test.go
@@ -8,7 +8,7 @@ import (

 	"github.com/stretchr/testify/require"

-	"github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost/server/public/model"
 )

 func TestMarketplaceProviderGetCommand(t *testing.T) {
--- a/server/channels/app/slashcommands/command_me.go
+++ b/server/channels/app/slashcommands/command_me.go
@@ -4,10 +4,10 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type MeProvider struct {
--- a/server/channels/app/slashcommands/command_me_test.go
+++ b/server/channels/app/slashcommands/command_me_test.go
@@ -8,7 +8,7 @@ import (

 	"github.com/stretchr/testify/assert"

-	"github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost/server/public/model"
 )

 func TestMeProviderDoCommand(t *testing.T) {
--- a/server/channels/app/slashcommands/command_msg.go
+++ b/server/channels/app/slashcommands/command_msg.go
@@ -7,12 +7,12 @@ import (
 	"errors"
 	"strings"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
-	"github.com/mattermost/mattermost-server/server/v8/channels/store"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/public/shared/mlog"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/v8/channels/store"
 )

 type msgProvider struct {
--- a/server/channels/app/slashcommands/command_msg_test.go
+++ b/server/channels/app/slashcommands/command_msg_test.go
@@ -8,8 +8,8 @@ import (

 	"github.com/stretchr/testify/assert"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
 )

 func TestMsgProvider(t *testing.T) {
--- a/server/channels/app/slashcommands/command_mute.go
+++ b/server/channels/app/slashcommands/command_mute.go
@@ -6,10 +6,10 @@ package slashcommands
 import (
 	"strings"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type MuteProvider struct {
--- a/server/channels/app/slashcommands/command_mute_test.go
+++ b/server/channels/app/slashcommands/command_mute_test.go
@@ -9,8 +9,8 @@ import (

 	"github.com/stretchr/testify/assert"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
 )

 func TestMuteCommandNoChannel(t *testing.T) {
--- a/server/channels/app/slashcommands/command_offline.go
+++ b/server/channels/app/slashcommands/command_offline.go
@@ -4,10 +4,10 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type OfflineProvider struct {
--- a/server/channels/app/slashcommands/command_online.go
+++ b/server/channels/app/slashcommands/command_online.go
@@ -4,10 +4,10 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type OnlineProvider struct {
--- a/server/channels/app/slashcommands/command_open.go
+++ b/server/channels/app/slashcommands/command_open.go
@@ -4,9 +4,9 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
 )

 type OpenProvider struct {
--- a/server/channels/app/slashcommands/command_remote.go
+++ b/server/channels/app/slashcommands/command_remote.go
@@ -9,10 +9,10 @@ import (
 	"fmt"
 	"strings"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 const (
--- a/server/channels/app/slashcommands/command_remove.go
+++ b/server/channels/app/slashcommands/command_remove.go
@@ -6,11 +6,11 @@ package slashcommands
 import (
 	"strings"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/public/shared/mlog"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type RemoveProvider struct {
--- a/server/channels/app/slashcommands/command_remove_test.go
+++ b/server/channels/app/slashcommands/command_remove_test.go
@@ -8,7 +8,7 @@ import (

 	"github.com/stretchr/testify/assert"

-	"github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost/server/public/model"
 )

 func TestRemoveProviderDoCommand(t *testing.T) {
--- a/server/channels/app/slashcommands/command_search.go
+++ b/server/channels/app/slashcommands/command_search.go
@@ -4,10 +4,10 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type SearchProvider struct {
--- a/server/channels/app/slashcommands/command_settings.go
+++ b/server/channels/app/slashcommands/command_settings.go
@@ -4,10 +4,10 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type SettingsProvider struct {
--- a/server/channels/app/slashcommands/command_share.go
+++ b/server/channels/app/slashcommands/command_share.go
@@ -8,10 +8,10 @@ import (
 	"fmt"
 	"strings"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type ShareProvider struct {
--- a/server/channels/app/slashcommands/command_share_test.go
+++ b/server/channels/app/slashcommands/command_share_test.go
@@ -9,14 +9,14 @@ import (

 	"github.com/stretchr/testify/assert"

-	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost/server/v8/channels/testlib"

-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/platform/services/remotecluster"

 	"github.com/stretchr/testify/require"

-	"github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost/server/public/model"
 )

 func TestShareProviderDoCommand(t *testing.T) {
--- a/server/channels/app/slashcommands/command_shortcuts.go
+++ b/server/channels/app/slashcommands/command_shortcuts.go
@@ -4,10 +4,10 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type ShortcutsProvider struct {
--- a/server/channels/app/slashcommands/command_shrug.go
+++ b/server/channels/app/slashcommands/command_shrug.go
@@ -4,10 +4,10 @@
 package slashcommands

 import (
-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
 )

 type ShrugProvider struct {
--- a/server/channels/app/slashcommands/command_test.go
+++ b/server/channels/app/slashcommands/command_test.go
@@ -16,8 +16,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/v8/platform/services/httpservice"
 )

 type InfiniteReader struct {
--- a/server/channels/app/slashcommands/helper_test.go
+++ b/server/channels/app/slashcommands/helper_test.go
@@ -13,12 +13,12 @@ import (
 	"testing"
 	"time"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app"
-	"github.com/mattermost/mattermost-server/server/v8/channels/app/request"
-	"github.com/mattermost/mattermost-server/server/v8/channels/store"
-	"github.com/mattermost/mattermost-server/server/v8/config"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/mlog"
+	"github.com/mattermost/mattermost/server/v8/channels/app"
+	"github.com/mattermost/mattermost/server/v8/channels/app/request"
+	"github.com/mattermost/mattermost/server/v8/channels/store"
+	"github.com/mattermost/mattermost/server/v8/config"
 )

 type TestHelper struct {
--- a/server/channels/app/slashcommands/main_test.go
+++ b/server/channels/app/slashcommands/main_test.go
@@ -6,7 +6,7 @@ package slashcommands
 import (
 	"testing"

-	"github.com/mattermost/mattermost-server/server/v8/channels/testlib"
+	"github.com/mattermost/mattermost/server/v8/channels/testlib"
 )

 var mainHelper *testlib.MainHelper
--- a/server/channels/app/slashcommands/util.go
+++ b/server/channels/app/slashcommands/util.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"

-	"github.com/mattermost/mattermost-server/server/public/model"
-	"github.com/mattermost/mattermost-server/server/public/shared/i18n"
+	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/i18n"
 )

 const (