Expose public/ API as submodule (#23345)

* model -> public/model

* plugin -> public/plugin

* public/model/utils -> public/utils

* platform/shared/mlog -> public/shared/mlog

* platform/shared/i18n -> public/shared/i18n

* platform/shared/markdown -> public/shared/markdown

* platform/services/timezones -> public/shared/timezones

* channels/einterfaces -> einterfaces

* expose public/ submodule

* go mod tidy

* .github: cache-dependency-path, setup-go-work

* modules-tidy for public/ too

* remove old gomodtidy

server/channels/store/storetest/audit_store.go

@@ -10,8 +10,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestAuditStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/bot_store.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func makeBotWithUser(t *testing.T, ss store.Store, bot *model.Bot) (*model.Bot, *model.User) {

server/channels/store/storetest/channel_member_history_store.go

@@ -11,8 +11,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestChannelMemberHistoryStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/channel_store.go

@@ -18,10 +18,10 @@ 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/public/shared/timezones"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store"
 	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
-	"github.com/mattermost/mattermost-server/server/v8/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/services/timezones"
 )
 
 type SqlStore interface {

server/channels/store/storetest/channel_store_categories.go

@@ -12,8 +12,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestChannelStoreCategories(t *testing.T, ss store.Store, s SqlStore) {

server/channels/store/storetest/channel_store_categories_with_apps_category.go

@@ -12,8 +12,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestChannelStoreCategoriesWithAppsCategory(t *testing.T, ss store.Store, s SqlStore) {

server/channels/store/storetest/cluster_discovery_store.go

@@ -10,8 +10,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestClusterDiscoveryStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/command_store.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCommandStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/command_webhook_store.go

@@ -10,8 +10,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestCommandWebhookStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/compliance_store.go

@@ -12,8 +12,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func cleanupStoreState(t *testing.T, ss store.Store) {

server/channels/store/storetest/draft_store.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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestDraftStore(t *testing.T, ss store.Store, s SqlStore) {

server/channels/store/storetest/emoji_store.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

server/channels/store/storetest/file_info_store.go

@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store"
 	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

server/channels/store/storetest/group_store.go

@@ -15,9 +15,9 @@ 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/store"
 	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestGroupStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/job_store.go

@@ -12,8 +12,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestJobStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/license_store.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestLicenseStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/link_metadata_store.go

@@ -13,8 +13,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // These tests are ran on the same store instance, so this provides easier unique, valid timestamps

server/channels/store/storetest/mocks/AuditStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/BotStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/ChannelMemberHistoryStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/ChannelStore.go

@@ -7,7 +7,7 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 
 	store "github.com/mattermost/mattermost-server/server/v8/channels/store"

server/channels/store/storetest/mocks/ClusterDiscoveryStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/CommandStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/CommandWebhookStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/ComplianceStore.go

@@ -7,7 +7,7 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/DraftStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/EmojiStore.go

@@ -7,7 +7,7 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/FileInfoStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/GroupStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/JobStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/LicenseStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/LinkMetadataStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/NotifyAdminStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/OAuthStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/PluginStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/PostAcknowledgementStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/PostPriorityStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/PostStore.go

@@ -7,7 +7,7 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 
 	store "github.com/mattermost/mattermost-server/server/v8/channels/store"

server/channels/store/storetest/mocks/PreferenceStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/ProductNoticesStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/ReactionStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/RemoteClusterStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/RetentionPolicyStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/RoleStore.go

@@ -7,7 +7,7 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/SchemeStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/SessionStore.go

@@ -7,7 +7,7 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/SharedChannelStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/StatusStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/Store.go

@@ -7,7 +7,7 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 
 	sql "database/sql"

server/channels/store/storetest/mocks/SystemStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/TeamStore.go

@@ -7,7 +7,7 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/TermsOfServiceStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/ThreadStore.go

@@ -5,8 +5,8 @@
 package mocks
 
 import (
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	store "github.com/mattermost/mattermost-server/server/v8/channels/store"
-	model "github.com/mattermost/mattermost-server/server/v8/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/TokenStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/TrueUpReviewStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/UploadSessionStore.go

@@ -7,7 +7,7 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/UserAccessTokenStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/UserStore.go

@@ -7,7 +7,7 @@ package mocks
 import (
 	context "context"
 
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 
 	store "github.com/mattermost/mattermost-server/server/v8/channels/store"

server/channels/store/storetest/mocks/UserTermsOfServiceStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/mocks/WebhookStore.go

@@ -5,7 +5,7 @@
 package mocks
 
 import (
-	model "github.com/mattermost/mattermost-server/server/v8/model"
+	model "github.com/mattermost/mattermost-server/server/public/model"
 	mock "github.com/stretchr/testify/mock"
 )
 

server/channels/store/storetest/notify_admin_store.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const PluginIdJenkins = "jenkins"

server/channels/store/storetest/oauth_store.go

@@ -10,8 +10,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestOAuthStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/plugin_store.go

@@ -10,8 +10,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestPluginStore(t *testing.T, ss store.Store, s SqlStore) {

server/channels/store/storetest/post_acknowledgements_store.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestPostAcknowledgementsStore(t *testing.T, ss store.Store, s SqlStore) {

server/channels/store/storetest/post_priority_store.go

@@ -11,8 +11,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestPostPriorityStore(t *testing.T, ss store.Store, s SqlStore) {

server/channels/store/storetest/post_store.go

@@ -15,9 +15,9 @@ 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/store"
 	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestPostStore(t *testing.T, ss store.Store, s SqlStore) {

server/channels/store/storetest/preference_store.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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestPreferenceStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/product_notices_store.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestProductNoticesStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/reaction_store.go

@@ -13,9 +13,9 @@ 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/store"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store/retrylayer"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestReactionStore(t *testing.T, ss store.Store, s SqlStore) {

server/channels/store/storetest/remote_cluster_store.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

server/channels/store/storetest/retention_policy_store.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestRetentionPolicyStore(t *testing.T, ss store.Store, s SqlStore) {

server/channels/store/storetest/role_store.go

@@ -11,8 +11,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestRoleStore(t *testing.T, ss store.Store, s SqlStore) {

server/channels/store/storetest/scheme_store.go

@@ -10,8 +10,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestSchemeStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/session_store.go

@@ -10,8 +10,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (

server/channels/store/storetest/settings.go

@@ -17,8 +17,8 @@ import (
 	_ "github.com/lib/pq"
 	"github.com/pkg/errors"
 
-	"github.com/mattermost/mattermost-server/server/v8/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 const (

server/channels/store/storetest/shared_channel_store.go

@@ -11,8 +11,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestSharedChannelStore(t *testing.T, ss store.Store, s SqlStore) {

server/channels/store/storetest/status_store.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestStatusStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/store.go

@@ -10,9 +10,9 @@ import (
 
 	"github.com/stretchr/testify/mock"
 
+	"github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // Store can be used to provide mock stores for testing.

server/channels/store/storetest/storetestlib.go

@@ -4,7 +4,7 @@
 package storetest
 
 import (
-	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/public/model"
 )
 
 func MakeEmail() string {

server/channels/store/storetest/system_store.go

@@ -10,8 +10,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestSystemStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/team_store.go

@@ -13,8 +13,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func cleanupTeamStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/terms_of_service_store.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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestTermsOfServiceStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/thread_store.go

@@ -12,8 +12,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestThreadStore(t *testing.T, ss store.Store, s SqlStore) {

server/channels/store/storetest/tokens_store.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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestTokensStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/true_up_review_store.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store"
 	"github.com/mattermost/mattermost-server/server/v8/channels/utils"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestTrueUpReviewStatusStore(t *testing.T, ss store.Store, s SqlStore) {

server/channels/store/storetest/upload_session_store.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestUploadSessionStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/user_access_token_store.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestUserAccessTokenStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/user_store.go

@@ -13,8 +13,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 const (

server/channels/store/storetest/user_terms_of_service.go

@@ -10,8 +10,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/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestUserTermsOfServiceStore(t *testing.T, ss store.Store) {

server/channels/store/storetest/utils.go

@@ -4,7 +4,7 @@
 package storetest
 
 import (
-	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/public/model"
 )
 
 // This function has a copy of it in app/helper_test

server/channels/store/storetest/webhook_store.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/channels/store"
-	"github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestWebhookStore(t *testing.T, ss store.Store) {