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

.github/workflows/server-ci-template.yml

@@ -22,7 +22,11 @@ jobs:
         uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
         with:
           go-version: ${{ env.go-version }}
-          cache-dependency-path: server/go.sum
+          cache-dependency-path: |
+            server/go.sum
+            server/public/go.sum
+      - name: Run setup-go-work
+        run: make setup-go-work
       - name: Generate mocks
         run: make mocks
       - name: Check mocks
@@ -40,7 +44,9 @@ jobs:
         uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
         with:
           go-version: ${{ env.go-version }}
-          cache-dependency-path: server/go.sum
+          cache-dependency-path: |
+            server/go.sum
+            server/public/go.sum
       - name: Run go mod tidy
         run: make modules-tidy
       - name: Check modules
@@ -58,7 +64,9 @@ jobs:
         uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
         with:
           go-version: ${{ env.go-version }}
-          cache-dependency-path: server/go.sum
+          cache-dependency-path: |
+            server/go.sum
+            server/public/go.sum
       - name: Run make-gen-serialized
         run: make gen-serialized
       - name: Check serialized
@@ -76,9 +84,13 @@ jobs:
         uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
         with:
           go-version: ${{ env.go-version }}
-          cache-dependency-path: server/go.sum
+          cache-dependency-path: |
+            server/go.sum
+            server/public/go.sum
       - name: Reset config
         run: make config-reset
+      - name: Run setup-go-work
+        run: make setup-go-work
       - name: Run plugin-checker
         run: make plugin-checker
       - name: Run mattermost-vet
@@ -106,7 +118,9 @@ jobs:
         uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
         with:
           go-version: ${{ env.go-version }}
-          cache-dependency-path: server/go.sum
+          cache-dependency-path: |
+            server/go.sum
+            server/public/go.sum
       - name: Checkout mattermost-api-reference
         run: |
           cd ..
@@ -129,7 +143,9 @@ jobs:
         uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
         with:
           go-version: ${{ env.go-version }}
-          cache-dependency-path: server/go.sum
+          cache-dependency-path: |
+            server/go.sum
+            server/public/go.sum
       - name: Generate work templates
         run: make generate-worktemplates
       - name: Check generated work templates
@@ -162,7 +178,9 @@ jobs:
         uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
         with:
           go-version: ${{ env.go-version }}
-          cache-dependency-path: server/go.sum
+          cache-dependency-path: |
+            server/go.sum
+            server/public/go.sum
       - name: Generate store layers
         run: make store-layers
       - name: Check generated code
@@ -180,7 +198,9 @@ jobs:
         uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
         with:
           go-version: ${{ env.go-version }}
-          cache-dependency-path: server/go.sum
+          cache-dependency-path: |
+            server/go.sum
+            server/public/go.sum
       - name: Generate app layers
         run: make app-layers
       - name: Check generated code
@@ -220,7 +240,9 @@ jobs:
         uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
         with:
           go-version: ${{ env.go-version }}
-          cache-dependency-path: server/go.sum
+          cache-dependency-path: |
+            server/go.sum
+            server/public/go.sum
       - name: Build
         run: |
           make config-reset

server/Makefile

@@ -102,11 +102,11 @@ GOFLAGS ?= $(GOFLAGS:)
 export GOBIN ?= $(PWD)/bin
 GO=go
 DELVE=dlv
-LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildNumber=$(BUILD_NUMBER)"
-LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildDate=$(BUILD_DATE)"
-LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildHash=$(BUILD_HASH)"
-LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)"
-LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)"
+LDFLAGS += -X "github.com/mattermost/mattermost-server/server/public/model.BuildNumber=$(BUILD_NUMBER)"
+LDFLAGS += -X "github.com/mattermost/mattermost-server/server/public/model.BuildDate=$(BUILD_DATE)"
+LDFLAGS += -X "github.com/mattermost/mattermost-server/server/public/model.BuildHash=$(BUILD_HASH)"
+LDFLAGS += -X "github.com/mattermost/mattermost-server/server/public/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)"
+LDFLAGS += -X "github.com/mattermost/mattermost-server/server/public/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)"
 
 GO_MAJOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1)
 GO_MINOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
@@ -190,7 +190,7 @@ endif
 include config.mk
 include build/*.mk
 
-LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.MockCWS=$(MM_ENABLE_CWS_MOCK)"
+LDFLAGS += -X "github.com/mattermost/mattermost-server/server/public/model.MockCWS=$(MM_ENABLE_CWS_MOCK)"
 
 RUN_IN_BACKGROUND ?=
 ifeq ($(RUN_SERVER_IN_BACKGROUND),true)
@@ -276,7 +276,7 @@ else
 endif
 
 plugin-checker:
-	$(GO) run $(GOFLAGS) ./plugin/checker
+	$(GO) run $(GOFLAGS) ./public/plugin/checker
 
 prepackaged-plugins: ## Populate the prepackaged-plugins directory
 	@echo Downloading prepackaged plugins
@@ -355,9 +355,9 @@ ldap-mocks: ## Creates mock files for ldap.
 
 plugin-mocks: ## Creates mock files for plugins.
 	$(GO) install github.com/vektra/mockery/v2/...@v2.23.2
-	$(GOBIN)/mockery --dir ./plugin --name API --output ./plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.'
-	$(GOBIN)/mockery --dir ./plugin --name Hooks --output ./plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.'
-	$(GOBIN)/mockery --dir ./plugin --name Driver --output ./plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.'
+	$(GOBIN)/mockery --dir ./public/plugin --name API --output ./public/plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.'
+	$(GOBIN)/mockery --dir ./public/plugin --name Hooks --output ./public/plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.'
+	$(GOBIN)/mockery --dir ./public/plugin --name Driver --output ./public/plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.'
 
 einterfaces-mocks: ## Creates mock files for einterfaces.
 	$(GO) install github.com/vektra/mockery/v2/...@v2.23.2
@@ -386,7 +386,7 @@ platform-mocks: ## Creates mocks for platform interfaces.
 	$(GOBIN)/mockery --dir channels/app/platform --name SuiteIFace --output channels/app/platform/mocks --note 'Regenerate this file using `make platform-mocks`.'
 
 pluginapi: ## Generates api and hooks glue code for plugins
-	$(GO) generate $(GOFLAGS) ./plugin
+	$(GO) generate $(GOFLAGS) ./public/plugin
 
 mocks: store-mocks telemetry-mocks filestore-mocks ldap-mocks plugin-mocks einterfaces-mocks searchengine-mocks sharedchannel-mocks misc-mocks email-mocks platform-mocks
 
@@ -404,7 +404,16 @@ endif
 
 setup-go-work: export BUILD_ENTERPRISE_READY := $(BUILD_ENTERPRISE_READY)
 setup-go-work: ## Sets up your go.work file
-	./scripts/setup_go_work.sh $(IGNORE_GO_WORK_IF_EXISTS)
+ifneq ($(IGNORE_GO_WORK_IF_EXISTS),true)
+	@echo "Creating a go.work file"
+	rm -f go.work
+	go work init
+	go work use .
+	go work use ./public
+ifeq ($(BUILD_ENTERPRISE_READY),true)
+	go work use ../../enterprise
+endif
+endif
 
 check-style: golangci-lint plugin-checker vet ## Runs style/lint checks
 
@@ -422,28 +431,12 @@ test-compile: ## Compile tests.
 		$(GO) test $(GOFLAGS) -c $$package; \
 	done
 
-gomodtidy:
-	@cp go.mod go.mod.orig
-	@cp go.sum go.sum.orig
-	@if [ -f "channels/imports/imports.go" ]; then \
-		mv channels/imports/imports.go channels/imports/imports.go.orig; \
-	fi;
-	$(GO) mod tidy
-	@if [ "$$(diff go.mod go.mod.orig)" != "" -o "$$(diff go.sum go.sum.orig)" != "" ]; then \
-		echo "go.mod/go.sum was modified. \ndiff- $$(diff go.mod go.mod.orig) \n$$(diff go.sum go.sum.orig) \nRun \"go mod tidy\"."; \
-		rm go.*.orig; \
-		exit 1; \
-	fi;
-	@if [ -f "channels/imports/imports.go.orig" ]; then \
-		mv channels/imports/imports.go.orig channels/imports/imports.go; \
-	fi;
-	@rm go.*.orig;
-
 modules-tidy:
 	@if [ -f "channels/imports/imports.go" ]; then \
 		mv channels/imports/imports.go channels/imports/imports.go.orig; \
 	fi;
 	-$(GO) mod tidy
+	-cd public && $(GO) mod tidy
 	@if [ -f "channels/imports/imports.go.orig" ]; then \
 		mv channels/imports/imports.go.orig channels/imports/imports.go; \
 	fi;
@@ -552,20 +545,20 @@ run-server: setup-go-work prepackaged-binaries validate-go-version start-docker
 debug-server: start-docker ## Compile and start server using delve.
 	mkdir -p $(BUILD_WEBAPP_DIR)/channels/dist/files
 	$(DELVE) debug $(PLATFORM_FILES) --build-flags="-ldflags '\
-		-X github.com/mattermost/mattermost-server/server/v8/model.BuildNumber=$(BUILD_NUMBER)\
-		-X \"github.com/mattermost/mattermost-server/server/v8/model.BuildDate=$(BUILD_DATE)\"\
-		-X github.com/mattermost/mattermost-server/server/v8/model.BuildHash=$(BUILD_HASH)\
-		-X github.com/mattermost/mattermost-server/server/v8/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
-		-X github.com/mattermost/mattermost-server/server/v8/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'"
+		-X github.com/mattermost/mattermost-server/server/public/model.BuildNumber=$(BUILD_NUMBER)\
+		-X \"github.com/mattermost/mattermost-server/server/public/model.BuildDate=$(BUILD_DATE)\"\
+		-X github.com/mattermost/mattermost-server/server/public/model.BuildHash=$(BUILD_HASH)\
+		-X github.com/mattermost/mattermost-server/server/public/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
+		-X github.com/mattermost/mattermost-server/server/public/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'"
 
 debug-server-headless: start-docker ## Debug server from within an IDE like VSCode or IntelliJ.
 	mkdir -p $(BUILD_WEBAPP_DIR)/channels/dist/files
 	$(DELVE) debug --headless --listen=:2345 --api-version=2 --accept-multiclient $(PLATFORM_FILES) --build-flags="-ldflags '\
-		-X github.com/mattermost/mattermost-server/server/v8/model.BuildNumber=$(BUILD_NUMBER)\
-		-X \"github.com/mattermost/mattermost-server/server/v8/model.BuildDate=$(BUILD_DATE)\"\
-		-X github.com/mattermost/mattermost-server/server/v8/model.BuildHash=$(BUILD_HASH)\
-		-X github.com/mattermost/mattermost-server/server/v8/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
-		-X github.com/mattermost/mattermost-server/server/v8/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'"
+		-X github.com/mattermost/mattermost-server/server/public/model.BuildNumber=$(BUILD_NUMBER)\
+		-X \"github.com/mattermost/mattermost-server/server/public/model.BuildDate=$(BUILD_DATE)\"\
+		-X github.com/mattermost/mattermost-server/server/public/model.BuildHash=$(BUILD_HASH)\
+		-X github.com/mattermost/mattermost-server/server/public/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
+		-X github.com/mattermost/mattermost-server/server/public/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'"
 
 run-cli: start-docker ## Runs CLI.
 	@echo Running mattermost for development
@@ -733,18 +726,18 @@ gen-serialized: ## Generates serialization methods for hot structs
 	# would be to temporarily move all the structs to the same file,
 	# but that involves a lot of manual work.
 	$(GO) install github.com/tinylib/msgp@v1.1.6
-	$(GOBIN)/msgp -file=./model/session.go -tests=false -o=./model/session_serial_gen.go
+	$(GOBIN)/msgp -file=./public/model/session.go -tests=false -o=./public/model/session_serial_gen.go
 	@echo "$$LICENSE_HEADER" > tmp.go
-	@cat ./model/session_serial_gen.go >> tmp.go
-	@mv tmp.go ./model/session_serial_gen.go
-	$(GOBIN)/msgp -file=./model/user.go -tests=false -o=./model/user_serial_gen.go
+	@cat ./public/model/session_serial_gen.go >> tmp.go
+	@mv tmp.go ./public/model/session_serial_gen.go
+	$(GOBIN)/msgp -file=./public/model/user.go -tests=false -o=./public/model/user_serial_gen.go
 	@echo "$$LICENSE_HEADER" > tmp.go
-	@cat ./model/user_serial_gen.go >> tmp.go
-	@mv tmp.go ./model/user_serial_gen.go
-	$(GOBIN)/msgp -file=./model/team_member.go -tests=false -o=./model/team_member_serial_gen.go
+	@cat ./public/model/user_serial_gen.go >> tmp.go
+	@mv tmp.go ./public/model/user_serial_gen.go
+	$(GOBIN)/msgp -file=./public/model/team_member.go -tests=false -o=./public/model/team_member_serial_gen.go
 	@echo "$$LICENSE_HEADER" > tmp.go
-	@cat ./model/team_member_serial_gen.go >> tmp.go
-	@mv tmp.go ./model/team_member_serial_gen.go
+	@cat ./public/model/team_member_serial_gen.go >> tmp.go
+	@mv tmp.go ./public/model/team_member_serial_gen.go
 
 todo: ## Display TODO and FIXME items in the source code.
 	@! ag --ignore Makefile --ignore-dir runtime '(TODO|XXX|FIXME|"FIX ME")[: ]+'

server/boards/api/admin.go

@@ -14,7 +14,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 type AdminSetPasswordData struct {

server/boards/api/api.go

@@ -17,7 +17,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 const (

server/boards/api/api_test.go

@@ -13,8 +13,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestErrorResponse(t *testing.T) {

server/boards/api/archive.go

@@ -13,8 +13,8 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 const (

server/boards/api/auth.go

@@ -18,7 +18,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/auth"
 	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 func (a *API) registerAuthRoutes(r *mux.Router) {

server/boards/api/blocks.go

@@ -15,7 +15,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 func (a *API) registerBlocksRoutes(r *mux.Router) {

server/boards/api/boards.go

@@ -13,7 +13,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 func (a *API) registerBoardsRoutes(r *mux.Router) {

server/boards/api/boards_and_blocks.go

@@ -14,7 +14,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 func (a *API) registerBoardsAndBlocksRoutes(r *mux.Router) {

server/boards/api/cards.go

@@ -15,7 +15,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 const (

server/boards/api/channels.go

@@ -13,8 +13,8 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 func (a *API) registerChannelsRoutes(r *mux.Router) {

server/boards/api/compliance.go

@@ -13,8 +13,8 @@ import (
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 const (

server/boards/api/files.go

@@ -17,10 +17,10 @@ import (
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
-	mm_model "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/shared/mlog"
 	"github.com/mattermost/mattermost-server/server/v8/platform/shared/web"
 )
 

server/boards/api/insights.go

@@ -15,7 +15,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 func (a *API) registerInsightsRoutes(r *mux.Router) {

server/boards/api/members.go

@@ -10,9 +10,9 @@ import (
 
 	"github.com/gorilla/mux"
 
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func (a *API) registerMembersRoutes(r *mux.Router) {

server/boards/api/search.go

@@ -12,7 +12,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 func (a *API) registerSearchRoutes(r *mux.Router) {

server/boards/api/sharing.go

@@ -14,7 +14,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 var ErrTurningOnSharing = errors.New("turning on sharing for board failed, see log for details")

server/boards/api/statistics.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/gorilla/mux"
 
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *API) registerStatisticsRoutes(r *mux.Router) {

server/boards/api/subscriptions.go

@@ -14,7 +14,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 func (a *API) registerSubscriptionsRoutes(r *mux.Router) {

server/boards/api/system_test.go

@@ -10,9 +10,9 @@ import (
 	"runtime"
 	"testing"
 
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 	"github.com/mattermost/mattermost-server/server/v8/boards/app"
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 func TestHello(t *testing.T) {

server/boards/api/templates.go

@@ -12,7 +12,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 func (a *API) registerTemplatesRoutes(r *mux.Router) {

server/boards/app/app.go

@@ -18,9 +18,9 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 	"github.com/mattermost/mattermost-server/server/v8/boards/ws"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (

server/boards/app/auth.go

@@ -8,7 +8,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/auth"
 	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 
 	"github.com/pkg/errors"
 )

server/boards/app/blocks.go

@@ -11,7 +11,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 var ErrBlocksFromMultipleBoards = errors.New("the block set contain blocks from multiple boards")

server/boards/app/blocks_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

server/boards/app/boards.go

@@ -11,7 +11,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
 	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 var (

server/boards/app/boards_and_blocks.go

@@ -7,7 +7,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 func (a *App) CreateBoardsAndBlocks(bab *model.BoardsAndBlocks, userID string, addMember bool) (*model.BoardsAndBlocks, error) {

server/boards/app/cloud.go

@@ -7,9 +7,9 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/utils"

server/boards/app/cloud_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	mockservicesapi "github.com/mattermost/mattermost-server/server/v8/boards/model/mocks"

server/boards/app/export.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 var (

server/boards/app/files.go

@@ -10,12 +10,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 var errEmptyFilename = errors.New("IsFileArchived: empty filename not allowed")

server/boards/app/files_test.go

@@ -15,11 +15,11 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost-server/server/public/plugin/plugintest/mock"
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
 	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore/mocks"
-	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )
 
 const (

server/boards/app/helper_test.go

@@ -17,8 +17,8 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/webhook"
 	"github.com/mattermost/mattermost-server/server/v8/boards/ws"
 
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore/mocks"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 type TestHelper struct {

server/boards/app/import.go

@@ -19,7 +19,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 const (

server/boards/app/initialize.go

@@ -6,7 +6,7 @@ package app
 import (
 	"context"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 // initialize is called when the App is first created.

server/boards/app/insights.go

@@ -6,8 +6,8 @@ package app
 import (
 	"github.com/pkg/errors"
 
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *App) GetTeamBoardsInsights(userID string, teamID string, opts *mm_model.InsightsOpts) (*model.BoardInsightsList, error) {

server/boards/app/insights_test.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 var mockInsightsBoards = []*model.Board{

server/boards/app/permissions.go

@@ -4,7 +4,7 @@
 package app
 
 import (
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 func (a *App) HasPermissionToBoard(userID, boardID string, permission *mm_model.Permission) bool {

server/boards/app/subscriptions.go

@@ -7,7 +7,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 func (a *App) CreateSubscription(sub *model.Subscription) (*model.Subscription, error) {

server/boards/app/teams.go

@@ -7,7 +7,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 func (a *App) GetRootTeam() (*model.Team, error) {

server/boards/app/templates.go

@@ -11,7 +11,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/assets"
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 const (

server/boards/app/templates_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
+	"github.com/mattermost/mattermost-server/server/public/plugin/plugintest/mock"
 )
 
 func TestApp_initializeTemplates(t *testing.T) {

server/boards/app/user.go

@@ -4,8 +4,8 @@
 package app
 
 import (
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func (a *App) GetTeamUsers(teamID string, asGuestID string) ([]*model.User, error) {

server/boards/app/user_test.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func TestSearchUsers(t *testing.T) {

server/boards/auth/auth_test.go

@@ -17,7 +17,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/mockstore"
 	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 type TestHelper struct {

server/boards/client/client.go

@@ -15,7 +15,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/api"
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 const (

server/boards/integrationtests/boardsapp_test.go

@@ -13,8 +13,8 @@ import (
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/server"
 
-	"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"
 )
 
 func TestSetConfiguration(t *testing.T) {

server/boards/integrationtests/clienttestlib.go

@@ -21,8 +21,8 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore"
 	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 
 	"github.com/stretchr/testify/require"
 )

server/boards/integrationtests/configuration_test.go

@@ -14,8 +14,8 @@ import (
 
 	mockservicesapi "github.com/mattermost/mattermost-server/server/v8/boards/model/mocks"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 
 	"github.com/stretchr/testify/assert"
 )

server/boards/integrationtests/pluginteststore.go

@@ -12,7 +12,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 var errTestStore = errors.New("plugin test store error")

server/boards/integrationtests/teststore.go

@@ -6,7 +6,7 @@ package integrationtests
 import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 type TestStore struct {

server/boards/model/block_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 

server/boards/model/blockid.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 // GenerateBlockIDs generates new IDs for all the blocks of the list,

server/boards/model/board_insights.go

@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"io"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 // BoardInsightsList is a response type with pagination support.

server/boards/model/boards_and_blocks.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 var ErrNoBoardsInBoardsAndBlocks = errors.New("at least one board is required")

server/boards/model/boards_and_blocks_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 func TestIsValidBoardsAndBlocks(t *testing.T) {

server/boards/model/error.go

@@ -10,7 +10,7 @@ import (
 	"net/http"
 	"strings"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 var (

server/boards/model/file.go

@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 func NewFileInfo(name string) *mm_model.FileInfo {

server/boards/model/mocks/mockservicesapi.go

@@ -13,8 +13,8 @@ import (
 
 	gomock "github.com/golang/mock/gomock"
 	mux "github.com/gorilla/mux"
-	model "github.com/mattermost/mattermost-server/server/v8/model"
-	mlog "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	model "github.com/mattermost/mattermost-server/server/public/model"
+	mlog "github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 // MockServicesAPI is a mock of ServicesAPI interface.

server/boards/model/permission.go

@@ -4,7 +4,7 @@
 package model
 
 import (
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 var (

server/boards/model/services_api.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/gorilla/mux"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 const (

server/boards/model/util.go

@@ -6,7 +6,7 @@ package model
 import (
 	"time"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 // GetMillis is a convenience method to get milliseconds since epoch.

server/boards/model/version.go

@@ -4,7 +4,7 @@
 package model
 
 import (
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 // This is a list of all the current versions including any patches.

server/boards/product/api_adapter.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/gorilla/mux"
 
+	mm_model "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/request"
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

server/boards/product/boards_product.go

@@ -10,10 +10,10 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/server"
 
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost-server/server/public/plugin"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 	"github.com/mattermost/mattermost-server/server/v8/channels/product"
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
-	"github.com/mattermost/mattermost-server/server/v8/plugin"
 )
 
 const (

server/boards/server/boards_service.go

@@ -18,9 +18,9 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore"
 	"github.com/mattermost/mattermost-server/server/v8/boards/ws"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
-	"github.com/mattermost/mattermost-server/server/v8/plugin"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost-server/server/public/plugin"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 const (

server/boards/server/boards_service_api.go

@@ -7,8 +7,8 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/app"
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 	"github.com/mattermost/mattermost-server/server/v8/channels/product"
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )
 
 // boardsServiceAPI provides a service API for other products such as Channels.

server/boards/server/boards_service_util.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 const defaultS3Timeout = 60 * 1000 // 60 seconds

server/boards/server/data_retention_test.go

@@ -15,8 +15,8 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/localpermissions"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/mockstore"
 
-	"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"
 )
 
 type TestHelperMockStore struct {

server/boards/server/notifications.go

@@ -15,7 +15,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 type notifyBackendParams struct {

server/boards/server/params.go

@@ -13,7 +13,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
 	"github.com/mattermost/mattermost-server/server/v8/boards/ws"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 type Params struct {

server/boards/server/post.go

@@ -9,8 +9,8 @@ import (
 	"net/url"
 	"strings"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/markdown"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost-server/server/public/shared/markdown"
 )
 
 func postWithBoardsEmbed(post *mm_model.Post) *mm_model.Post {

server/boards/server/server.go

@@ -37,8 +37,8 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/web"
 	"github.com/mattermost/mattermost-server/server/v8/boards/ws"
 
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )
 
 const (

server/boards/services/audit/audit.go

@@ -4,7 +4,7 @@
 package audit
 
 import (
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 const (

server/boards/services/audit/record.go

@@ -3,7 +3,7 @@
 
 package audit
 
-import "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+import "github.com/mattermost/mattermost-server/server/public/shared/mlog"
 
 // Meta represents metadata that can be added to a audit record as name/value pairs.
 type Meta struct {

server/boards/services/metrics/service.go

@@ -9,7 +9,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 // Service prometheus to run the server.

server/boards/services/notify/notifylogger/logger_backend.go

@@ -6,7 +6,7 @@ package notifylogger
 import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 const (

server/boards/services/notify/notifymentions/delivery.go

@@ -6,7 +6,7 @@ package notifymentions
 import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 // MentionDelivery provides an interface for delivering @mention notifications to other systems, such as

server/boards/services/notify/notifymentions/mentions.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 var atMentionRegexp = regexp.MustCompile(`\B@[[:alnum:]][[:alnum:]\.\-_:]*`)

server/boards/services/notify/notifymentions/mentions_backend.go

@@ -14,7 +14,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 const (

server/boards/services/notify/notifymentions/mentions_test.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 func Test_extractMentions(t *testing.T) {

server/boards/services/notify/notifysubscriptions/delivery.go

@@ -6,7 +6,7 @@ package notifysubscriptions
 import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 // SubscriptionDelivery provides an interface for delivering subscription notifications to other systems, such as

server/boards/services/notify/notifysubscriptions/diff.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 // Diff represents a difference between two versions of a block.

server/boards/services/notify/notifysubscriptions/diff2markdown.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/sergi/go-diff/diffmatchpatch"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 func generateMarkdownDiff(oldText string, newText string, logger mlog.LoggerIFace) string {

server/boards/services/notify/notifysubscriptions/diff2slackattachments.go

@@ -15,8 +15,8 @@ import (
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 const (

server/boards/services/notify/notifysubscriptions/notifier.go

@@ -15,7 +15,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
 	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 const (

server/boards/services/notify/notifysubscriptions/subscriptions_backend.go

@@ -15,7 +15,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 const (

server/boards/services/notify/plugindelivery/mention_deliver.go

@@ -9,7 +9,7 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
 	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 // MentionDeliver notifies a user they have been mentioned in a blockv ia the plugin API.

server/boards/services/notify/plugindelivery/plugin_delivery.go

@@ -4,7 +4,7 @@
 package plugindelivery
 
 import (
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 type servicesAPI interface {

server/boards/services/notify/plugindelivery/subscription_deliver.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 var (

server/boards/services/notify/plugindelivery/user.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 const (

server/boards/services/notify/plugindelivery/user_test.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 )
 
 var (

server/boards/services/notify/service.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 type Action string

server/boards/services/permissions/localpermissions/helpers_test.go

@@ -9,8 +9,8 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	permissionsMocks "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mocks"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"

server/boards/services/permissions/localpermissions/localpermissions.go

@@ -7,8 +7,8 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 type Service struct {

server/boards/services/permissions/localpermissions/localpermissions_test.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 
 	"github.com/stretchr/testify/assert"
 )

server/boards/services/permissions/mmpermissions/helpers_test.go

@@ -10,8 +10,8 @@ import (
 	mmpermissionsMocks "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mmpermissions/mocks"
 	permissionsMocks "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mocks"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"

server/boards/services/permissions/mmpermissions/mmpermissions.go

@@ -7,8 +7,8 @@ import (
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
-	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
+	"github.com/mattermost/mattermost-server/server/public/shared/mlog"
 )
 
 type APIInterface interface {

server/boards/services/permissions/mmpermissions/mmpermissions_test.go

@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-//go:generate mockgen -copyright_file=../../../../copyright.txt -destination=mocks/mockpluginapi.go -package mocks github.com/mattermost/mattermost-server/server/v8/plugin API
+//go:generate mockgen -copyright_file=../../../../copyright.txt -destination=mocks/mockpluginapi.go -package mocks github.com/mattermost/mattermost-server/server/public/plugin API
 package mmpermissions
 
 import (
@@ -10,7 +10,7 @@ import (
 
 	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 
-	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	mm_model "github.com/mattermost/mattermost-server/server/public/model"
 
 	"github.com/stretchr/testify/assert"
 )