diff --git a/.github/workflows/server-ci-template.yml b/.github/workflows/server-ci-template.yml index c5ae8d9398..a15c6b9fcf 100644 --- a/.github/workflows/server-ci-template.yml +++ b/.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 diff --git a/server/Makefile b/server/Makefile index 00590e7bb3..4aeeabe99c 100644 --- a/server/Makefile +++ b/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")[: ]+' diff --git a/server/boards/api/admin.go b/server/boards/api/admin.go index cc2a277654..4c81506e03 100644 --- a/server/boards/api/admin.go +++ b/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 { diff --git a/server/boards/api/api.go b/server/boards/api/api.go index b800c84604..411cd6ba5d 100644 --- a/server/boards/api/api.go +++ b/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 ( diff --git a/server/boards/api/api_test.go b/server/boards/api/api_test.go index 4a31e36127..b09a0c1dd4 100644 --- a/server/boards/api/api_test.go +++ b/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) { diff --git a/server/boards/api/archive.go b/server/boards/api/archive.go index 58377d9cd2..de6bb25052 100644 --- a/server/boards/api/archive.go +++ b/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 ( diff --git a/server/boards/api/auth.go b/server/boards/api/auth.go index fb54d95d16..e9cf3ee131 100644 --- a/server/boards/api/auth.go +++ b/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) { diff --git a/server/boards/api/blocks.go b/server/boards/api/blocks.go index 49add99fef..4d9cb7a47d 100644 --- a/server/boards/api/blocks.go +++ b/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) { diff --git a/server/boards/api/boards.go b/server/boards/api/boards.go index ee90a715fb..dd782150f1 100644 --- a/server/boards/api/boards.go +++ b/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) { diff --git a/server/boards/api/boards_and_blocks.go b/server/boards/api/boards_and_blocks.go index acd1155227..eca8012ed3 100644 --- a/server/boards/api/boards_and_blocks.go +++ b/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) { diff --git a/server/boards/api/cards.go b/server/boards/api/cards.go index 51da96cda2..69cef8cb23 100644 --- a/server/boards/api/cards.go +++ b/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 ( diff --git a/server/boards/api/channels.go b/server/boards/api/channels.go index e59aba7fc2..d51eb971db 100644 --- a/server/boards/api/channels.go +++ b/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) { diff --git a/server/boards/api/compliance.go b/server/boards/api/compliance.go index ac79bbf9a0..b1bc1bdc6d 100644 --- a/server/boards/api/compliance.go +++ b/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 ( diff --git a/server/boards/api/files.go b/server/boards/api/files.go index 482fa0a622..6fc2279f33 100644 --- a/server/boards/api/files.go +++ b/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" ) diff --git a/server/boards/api/insights.go b/server/boards/api/insights.go index 839b7c31c8..3b0e230a17 100644 --- a/server/boards/api/insights.go +++ b/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) { diff --git a/server/boards/api/members.go b/server/boards/api/members.go index 353fb750b7..ad5b1e612c 100644 --- a/server/boards/api/members.go +++ b/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) { diff --git a/server/boards/api/search.go b/server/boards/api/search.go index ee5f052591..ec31d162be 100644 --- a/server/boards/api/search.go +++ b/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) { diff --git a/server/boards/api/sharing.go b/server/boards/api/sharing.go index 42bc405b81..cf34ce9b40 100644 --- a/server/boards/api/sharing.go +++ b/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") diff --git a/server/boards/api/statistics.go b/server/boards/api/statistics.go index b73cc6e801..e505c46131 100644 --- a/server/boards/api/statistics.go +++ b/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) { diff --git a/server/boards/api/subscriptions.go b/server/boards/api/subscriptions.go index e8542334cd..6ec80477b8 100644 --- a/server/boards/api/subscriptions.go +++ b/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) { diff --git a/server/boards/api/system_test.go b/server/boards/api/system_test.go index 660db2f853..1d6da5a582 100644 --- a/server/boards/api/system_test.go +++ b/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) { diff --git a/server/boards/api/templates.go b/server/boards/api/templates.go index ad3212e068..f886396628 100644 --- a/server/boards/api/templates.go +++ b/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) { diff --git a/server/boards/app/app.go b/server/boards/app/app.go index 1e7ba4caea..0a8139d377 100644 --- a/server/boards/app/app.go +++ b/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 ( diff --git a/server/boards/app/auth.go b/server/boards/app/auth.go index e05efa6747..49db9891e6 100644 --- a/server/boards/app/auth.go +++ b/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" ) diff --git a/server/boards/app/blocks.go b/server/boards/app/blocks.go index 136bf736fe..ef12129237 100644 --- a/server/boards/app/blocks.go +++ b/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") diff --git a/server/boards/app/blocks_test.go b/server/boards/app/blocks_test.go index e19ebdae66..cc047796fe 100644 --- a/server/boards/app/blocks_test.go +++ b/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" ) diff --git a/server/boards/app/boards.go b/server/boards/app/boards.go index 1f7fc8c026..4a7628a97f 100644 --- a/server/boards/app/boards.go +++ b/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 ( diff --git a/server/boards/app/boards_and_blocks.go b/server/boards/app/boards_and_blocks.go index d16188a759..6a6de02cbb 100644 --- a/server/boards/app/boards_and_blocks.go +++ b/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) { diff --git a/server/boards/app/cloud.go b/server/boards/app/cloud.go index 8667856706..49aeec2ce4 100644 --- a/server/boards/app/cloud.go +++ b/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" diff --git a/server/boards/app/cloud_test.go b/server/boards/app/cloud_test.go index 5c0b7f7357..51ca5bcbab 100644 --- a/server/boards/app/cloud_test.go +++ b/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" diff --git a/server/boards/app/export.go b/server/boards/app/export.go index d8a03d78a8..98c50f4638 100644 --- a/server/boards/app/export.go +++ b/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 ( diff --git a/server/boards/app/files.go b/server/boards/app/files.go index 0212a5176f..ba9eb85dac 100644 --- a/server/boards/app/files.go +++ b/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") diff --git a/server/boards/app/files_test.go b/server/boards/app/files_test.go index c494b8a872..a980b36f1f 100644 --- a/server/boards/app/files_test.go +++ b/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 ( diff --git a/server/boards/app/helper_test.go b/server/boards/app/helper_test.go index d337592a79..7f9f164e0e 100644 --- a/server/boards/app/helper_test.go +++ b/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 { diff --git a/server/boards/app/import.go b/server/boards/app/import.go index 1b30c09a88..8c92047429 100644 --- a/server/boards/app/import.go +++ b/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 ( diff --git a/server/boards/app/initialize.go b/server/boards/app/initialize.go index 0e63a3057f..c5f24d2afa 100644 --- a/server/boards/app/initialize.go +++ b/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. diff --git a/server/boards/app/insights.go b/server/boards/app/insights.go index b14c155cf9..8979220fc4 100644 --- a/server/boards/app/insights.go +++ b/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) { diff --git a/server/boards/app/insights_test.go b/server/boards/app/insights_test.go index ff87b31d7e..016c0354d0 100644 --- a/server/boards/app/insights_test.go +++ b/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{ diff --git a/server/boards/app/permissions.go b/server/boards/app/permissions.go index a1d7da51dd..a104819e6c 100644 --- a/server/boards/app/permissions.go +++ b/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 { diff --git a/server/boards/app/subscriptions.go b/server/boards/app/subscriptions.go index 26bab3214b..7e3531a399 100644 --- a/server/boards/app/subscriptions.go +++ b/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) { diff --git a/server/boards/app/teams.go b/server/boards/app/teams.go index 83c998ee34..1620109dab 100644 --- a/server/boards/app/teams.go +++ b/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) { diff --git a/server/boards/app/templates.go b/server/boards/app/templates.go index 0f17d3e08e..74635e16c4 100644 --- a/server/boards/app/templates.go +++ b/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 ( diff --git a/server/boards/app/templates_test.go b/server/boards/app/templates_test.go index 496929a7ef..e8985f39ff 100644 --- a/server/boards/app/templates_test.go +++ b/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) { diff --git a/server/boards/app/user.go b/server/boards/app/user.go index c798e7a333..75fbb0f378 100644 --- a/server/boards/app/user.go +++ b/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) { diff --git a/server/boards/app/user_test.go b/server/boards/app/user_test.go index e1aa8ee597..3e45121805 100644 --- a/server/boards/app/user_test.go +++ b/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) { diff --git a/server/boards/auth/auth_test.go b/server/boards/auth/auth_test.go index 65491d37ca..f5a1828cfa 100644 --- a/server/boards/auth/auth_test.go +++ b/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 { diff --git a/server/boards/client/client.go b/server/boards/client/client.go index ea33a38c2b..807f42ed1a 100644 --- a/server/boards/client/client.go +++ b/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 ( diff --git a/server/boards/integrationtests/boardsapp_test.go b/server/boards/integrationtests/boardsapp_test.go index 8faf4156d6..54e4e7c9a5 100644 --- a/server/boards/integrationtests/boardsapp_test.go +++ b/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) { diff --git a/server/boards/integrationtests/clienttestlib.go b/server/boards/integrationtests/clienttestlib.go index 3c7f0ab003..50c71d3065 100644 --- a/server/boards/integrationtests/clienttestlib.go +++ b/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" ) diff --git a/server/boards/integrationtests/configuration_test.go b/server/boards/integrationtests/configuration_test.go index fd49036e4a..a5c05286de 100644 --- a/server/boards/integrationtests/configuration_test.go +++ b/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" ) diff --git a/server/boards/integrationtests/pluginteststore.go b/server/boards/integrationtests/pluginteststore.go index 0f289252de..40bd9092b4 100644 --- a/server/boards/integrationtests/pluginteststore.go +++ b/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") diff --git a/server/boards/integrationtests/teststore.go b/server/boards/integrationtests/teststore.go index bc2bed79d3..527a38de5a 100644 --- a/server/boards/integrationtests/teststore.go +++ b/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 { diff --git a/server/boards/model/block_test.go b/server/boards/model/block_test.go index f35239ac0a..d4008eb08f 100644 --- a/server/boards/model/block_test.go +++ b/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" diff --git a/server/boards/model/blockid.go b/server/boards/model/blockid.go index d0309a9021..3a4efae9ef 100644 --- a/server/boards/model/blockid.go +++ b/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, diff --git a/server/boards/model/board_insights.go b/server/boards/model/board_insights.go index 74fe283901..75496ee0fc 100644 --- a/server/boards/model/board_insights.go +++ b/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. diff --git a/server/boards/model/boards_and_blocks.go b/server/boards/model/boards_and_blocks.go index 159e091acf..85ac329070 100644 --- a/server/boards/model/boards_and_blocks.go +++ b/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") diff --git a/server/boards/model/boards_and_blocks_test.go b/server/boards/model/boards_and_blocks_test.go index 4c89496ae3..7fa02d3f0a 100644 --- a/server/boards/model/boards_and_blocks_test.go +++ b/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) { diff --git a/server/boards/model/error.go b/server/boards/model/error.go index 678520c87f..d850837dfb 100644 --- a/server/boards/model/error.go +++ b/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 ( diff --git a/server/boards/model/file.go b/server/boards/model/file.go index 3a00008cac..4087829cb4 100644 --- a/server/boards/model/file.go +++ b/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 { diff --git a/server/boards/model/mocks/mockservicesapi.go b/server/boards/model/mocks/mockservicesapi.go index 724c0c9e28..2847a672bf 100644 --- a/server/boards/model/mocks/mockservicesapi.go +++ b/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. diff --git a/server/boards/model/permission.go b/server/boards/model/permission.go index 544f131cfc..d565256327 100644 --- a/server/boards/model/permission.go +++ b/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 ( diff --git a/server/boards/model/services_api.go b/server/boards/model/services_api.go index 0a8f106042..0aa76caee1 100644 --- a/server/boards/model/services_api.go +++ b/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 ( diff --git a/server/boards/model/util.go b/server/boards/model/util.go index 4d80a2a2e3..b08d31cb3f 100644 --- a/server/boards/model/util.go +++ b/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. diff --git a/server/boards/model/version.go b/server/boards/model/version.go index be8a561634..29df2ac104 100644 --- a/server/boards/model/version.go +++ b/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. diff --git a/server/boards/product/api_adapter.go b/server/boards/product/api_adapter.go index e0d2f1d276..8300d2f755 100644 --- a/server/boards/product/api_adapter.go +++ b/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" ) diff --git a/server/boards/product/boards_product.go b/server/boards/product/boards_product.go index 9fc74101cb..98fd4fe3da 100644 --- a/server/boards/product/boards_product.go +++ b/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 ( diff --git a/server/boards/server/boards_service.go b/server/boards/server/boards_service.go index 3eedabfc4e..2516277511 100644 --- a/server/boards/server/boards_service.go +++ b/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 ( diff --git a/server/boards/server/boards_service_api.go b/server/boards/server/boards_service_api.go index 1ad34b3656..bef53cd181 100644 --- a/server/boards/server/boards_service_api.go +++ b/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. diff --git a/server/boards/server/boards_service_util.go b/server/boards/server/boards_service_util.go index 2661d960ef..4c76080fee 100644 --- a/server/boards/server/boards_service_util.go +++ b/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 diff --git a/server/boards/server/data_retention_test.go b/server/boards/server/data_retention_test.go index 18a731d918..069c7fe8ea 100644 --- a/server/boards/server/data_retention_test.go +++ b/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 { diff --git a/server/boards/server/notifications.go b/server/boards/server/notifications.go index 656e37f999..bfa3939b78 100644 --- a/server/boards/server/notifications.go +++ b/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 { diff --git a/server/boards/server/params.go b/server/boards/server/params.go index 3511620d07..9b23972a66 100644 --- a/server/boards/server/params.go +++ b/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 { diff --git a/server/boards/server/post.go b/server/boards/server/post.go index fcafbcb8b5..02e229661d 100644 --- a/server/boards/server/post.go +++ b/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 { diff --git a/server/boards/server/server.go b/server/boards/server/server.go index a66e2c3351..4f35134d9b 100644 --- a/server/boards/server/server.go +++ b/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 ( diff --git a/server/boards/services/audit/audit.go b/server/boards/services/audit/audit.go index d11dd0915e..5162a4a6be 100644 --- a/server/boards/services/audit/audit.go +++ b/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 ( diff --git a/server/boards/services/audit/record.go b/server/boards/services/audit/record.go index 60b55b1293..a128c68a2e 100644 --- a/server/boards/services/audit/record.go +++ b/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 { diff --git a/server/boards/services/metrics/service.go b/server/boards/services/metrics/service.go index 1ffcc7f9d9..5bd5dc8bd8 100644 --- a/server/boards/services/metrics/service.go +++ b/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. diff --git a/server/boards/services/notify/notifylogger/logger_backend.go b/server/boards/services/notify/notifylogger/logger_backend.go index 8370988498..e36b5309b6 100644 --- a/server/boards/services/notify/notifylogger/logger_backend.go +++ b/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 ( diff --git a/server/boards/services/notify/notifymentions/delivery.go b/server/boards/services/notify/notifymentions/delivery.go index 499b582483..c15b1b9d1a 100644 --- a/server/boards/services/notify/notifymentions/delivery.go +++ b/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 diff --git a/server/boards/services/notify/notifymentions/mentions.go b/server/boards/services/notify/notifymentions/mentions.go index 00e4a1835d..ffa823dd05 100644 --- a/server/boards/services/notify/notifymentions/mentions.go +++ b/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:]\.\-_:]*`) diff --git a/server/boards/services/notify/notifymentions/mentions_backend.go b/server/boards/services/notify/notifymentions/mentions_backend.go index 9d0c84190e..9ed57753a3 100644 --- a/server/boards/services/notify/notifymentions/mentions_backend.go +++ b/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 ( diff --git a/server/boards/services/notify/notifymentions/mentions_test.go b/server/boards/services/notify/notifymentions/mentions_test.go index 1529c7bc64..412236d545 100644 --- a/server/boards/services/notify/notifymentions/mentions_test.go +++ b/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) { diff --git a/server/boards/services/notify/notifysubscriptions/delivery.go b/server/boards/services/notify/notifysubscriptions/delivery.go index 59f0a82382..b02180d7a1 100644 --- a/server/boards/services/notify/notifysubscriptions/delivery.go +++ b/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 diff --git a/server/boards/services/notify/notifysubscriptions/diff.go b/server/boards/services/notify/notifysubscriptions/diff.go index 1e36359799..72c8a444d4 100644 --- a/server/boards/services/notify/notifysubscriptions/diff.go +++ b/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. diff --git a/server/boards/services/notify/notifysubscriptions/diff2markdown.go b/server/boards/services/notify/notifysubscriptions/diff2markdown.go index dfa0de1c03..eb7686631a 100644 --- a/server/boards/services/notify/notifysubscriptions/diff2markdown.go +++ b/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 { diff --git a/server/boards/services/notify/notifysubscriptions/diff2slackattachments.go b/server/boards/services/notify/notifysubscriptions/diff2slackattachments.go index fd8904774f..2a0ed9c407 100644 --- a/server/boards/services/notify/notifysubscriptions/diff2slackattachments.go +++ b/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 ( diff --git a/server/boards/services/notify/notifysubscriptions/notifier.go b/server/boards/services/notify/notifysubscriptions/notifier.go index c2acb78336..ad70bb2b20 100644 --- a/server/boards/services/notify/notifysubscriptions/notifier.go +++ b/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 ( diff --git a/server/boards/services/notify/notifysubscriptions/subscriptions_backend.go b/server/boards/services/notify/notifysubscriptions/subscriptions_backend.go index af020bea6b..a8c2e09ff1 100644 --- a/server/boards/services/notify/notifysubscriptions/subscriptions_backend.go +++ b/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 ( diff --git a/server/boards/services/notify/plugindelivery/mention_deliver.go b/server/boards/services/notify/plugindelivery/mention_deliver.go index dbb12e3c3b..7a4d8bfa13 100644 --- a/server/boards/services/notify/plugindelivery/mention_deliver.go +++ b/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. diff --git a/server/boards/services/notify/plugindelivery/plugin_delivery.go b/server/boards/services/notify/plugindelivery/plugin_delivery.go index 890118b3c9..8e1e179ac5 100644 --- a/server/boards/services/notify/plugindelivery/plugin_delivery.go +++ b/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 { diff --git a/server/boards/services/notify/plugindelivery/subscription_deliver.go b/server/boards/services/notify/plugindelivery/subscription_deliver.go index a9353eb442..2382c0f32c 100644 --- a/server/boards/services/notify/plugindelivery/subscription_deliver.go +++ b/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 ( diff --git a/server/boards/services/notify/plugindelivery/user.go b/server/boards/services/notify/plugindelivery/user.go index c705a39107..8075c2c626 100644 --- a/server/boards/services/notify/plugindelivery/user.go +++ b/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 ( diff --git a/server/boards/services/notify/plugindelivery/user_test.go b/server/boards/services/notify/plugindelivery/user_test.go index 1c5aeccf4c..d1f9f4fb58 100644 --- a/server/boards/services/notify/plugindelivery/user_test.go +++ b/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 ( diff --git a/server/boards/services/notify/service.go b/server/boards/services/notify/service.go index 308b2e7459..a728dcbcaf 100644 --- a/server/boards/services/notify/service.go +++ b/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 diff --git a/server/boards/services/permissions/localpermissions/helpers_test.go b/server/boards/services/permissions/localpermissions/helpers_test.go index 13f0bfa389..433d0d32d4 100644 --- a/server/boards/services/permissions/localpermissions/helpers_test.go +++ b/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" diff --git a/server/boards/services/permissions/localpermissions/localpermissions.go b/server/boards/services/permissions/localpermissions/localpermissions.go index ef63b55353..a8f9ba98e6 100644 --- a/server/boards/services/permissions/localpermissions/localpermissions.go +++ b/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 { diff --git a/server/boards/services/permissions/localpermissions/localpermissions_test.go b/server/boards/services/permissions/localpermissions/localpermissions_test.go index 8bc65bf49e..2cfb4878e8 100644 --- a/server/boards/services/permissions/localpermissions/localpermissions_test.go +++ b/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" ) diff --git a/server/boards/services/permissions/mmpermissions/helpers_test.go b/server/boards/services/permissions/mmpermissions/helpers_test.go index f8be25a1d6..850f5b7662 100644 --- a/server/boards/services/permissions/mmpermissions/helpers_test.go +++ b/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" diff --git a/server/boards/services/permissions/mmpermissions/mmpermissions.go b/server/boards/services/permissions/mmpermissions/mmpermissions.go index 671d9b10db..2fb66e8aa8 100644 --- a/server/boards/services/permissions/mmpermissions/mmpermissions.go +++ b/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 { diff --git a/server/boards/services/permissions/mmpermissions/mmpermissions_test.go b/server/boards/services/permissions/mmpermissions/mmpermissions_test.go index 9e532f7b98..aafe67ff8a 100644 --- a/server/boards/services/permissions/mmpermissions/mmpermissions_test.go +++ b/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" ) diff --git a/server/boards/services/permissions/mmpermissions/mocks/mockpluginapi.go b/server/boards/services/permissions/mmpermissions/mocks/mockpluginapi.go index 612dd07d17..9888866346 100644 --- a/server/boards/services/permissions/mmpermissions/mocks/mockpluginapi.go +++ b/server/boards/services/permissions/mmpermissions/mocks/mockpluginapi.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mattermost/mattermost-server/server/v8/plugin (interfaces: API) +// Source: github.com/mattermost/mattermost-server/server/public/plugin (interfaces: API) // Package mocks is a generated GoMock package. package mocks @@ -13,7 +13,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/server/v8/model" + model "github.com/mattermost/mattermost-server/server/public/model" ) // MockAPI is a mock of API interface. diff --git a/server/boards/services/permissions/permissions.go b/server/boards/services/permissions/permissions.go index 2adfdd28a1..c1c9e3413d 100644 --- a/server/boards/services/permissions/permissions.go +++ b/server/boards/services/permissions/permissions.go @@ -8,7 +8,7 @@ package permissions 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" ) type PermissionsService interface { diff --git a/server/boards/services/store/generators/transactional_store.go.tmpl b/server/boards/services/store/generators/transactional_store.go.tmpl index ff81becb83..832a7e88ad 100644 --- a/server/boards/services/store/generators/transactional_store.go.tmpl +++ b/server/boards/services/store/generators/transactional_store.go.tmpl @@ -18,8 +18,8 @@ import ( "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - mm_model "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost-server/server/public/model" ) {{range $index, $element := .Methods}} diff --git a/server/boards/services/store/mattermostauthlayer/mattermostauthlayer.go b/server/boards/services/store/mattermostauthlayer/mattermostauthlayer.go index b024d5224a..0858cc78ce 100644 --- a/server/boards/services/store/mattermostauthlayer/mattermostauthlayer.go +++ b/server/boards/services/store/mattermostauthlayer/mattermostauthlayer.go @@ -11,7 +11,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" sq "github.com/Masterminds/squirrel" @@ -19,7 +19,7 @@ import ( "github.com/mattermost/mattermost-server/server/v8/boards/services/store" "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 boardsBotID string diff --git a/server/boards/services/store/mattermostauthlayer/mattermostauthlayer_test.go b/server/boards/services/store/mattermostauthlayer/mattermostauthlayer_test.go index 88a936db9f..4d3b425bb8 100644 --- a/server/boards/services/store/mattermostauthlayer/mattermostauthlayer_test.go +++ b/server/boards/services/store/mattermostauthlayer/mattermostauthlayer_test.go @@ -9,9 +9,9 @@ import ( "github.com/golang/mock/gomock" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/boards/model" mockservicesapi "github.com/mattermost/mattermost-server/server/v8/boards/model/mocks" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/mockstore/mockstore.go b/server/boards/services/store/mockstore/mockstore.go index 153b7aa7ca..0abf7b470e 100644 --- a/server/boards/services/store/mockstore/mockstore.go +++ b/server/boards/services/store/mockstore/mockstore.go @@ -12,8 +12,8 @@ import ( time "time" gomock "github.com/golang/mock/gomock" + model0 "github.com/mattermost/mattermost-server/server/public/model" model "github.com/mattermost/mattermost-server/server/v8/boards/model" - model0 "github.com/mattermost/mattermost-server/server/v8/model" ) // MockStore is a mock of Store interface. diff --git a/server/boards/services/store/sqlstore/blocks.go b/server/boards/services/store/sqlstore/blocks.go index 2e960f918c..8516bf6bee 100644 --- a/server/boards/services/store/sqlstore/blocks.go +++ b/server/boards/services/store/sqlstore/blocks.go @@ -16,7 +16,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" ) const ( diff --git a/server/boards/services/store/sqlstore/board.go b/server/boards/services/store/sqlstore/board.go index f9bbb1188a..2e8ad262ab 100644 --- a/server/boards/services/store/sqlstore/board.go +++ b/server/boards/services/store/sqlstore/board.go @@ -18,7 +18,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" ) func boardFields(tableAlias string) []string { diff --git a/server/boards/services/store/sqlstore/board_insights.go b/server/boards/services/store/sqlstore/board_insights.go index 03afbe2203..58182932da 100644 --- a/server/boards/services/store/sqlstore/board_insights.go +++ b/server/boards/services/store/sqlstore/board_insights.go @@ -13,9 +13,9 @@ import ( sq "github.com/Masterminds/squirrel" - 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/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) func (s *SQLStore) getTeamBoardsInsights(db sq.BaseRunner, teamID string, since int64, offset int, limit int, boardIDs []string) (*model.BoardInsightsList, error) { diff --git a/server/boards/services/store/sqlstore/boards_migrator.go b/server/boards/services/store/sqlstore/boards_migrator.go index 6e8a93dbef..c83672794b 100644 --- a/server/boards/services/store/sqlstore/boards_migrator.go +++ b/server/boards/services/store/sqlstore/boards_migrator.go @@ -18,9 +18,9 @@ import ( embedded "github.com/mattermost/morph/sources/embedded" "github.com/mgdelacroix/foundation" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/db" mmSqlStore "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/boards/model" ) diff --git a/server/boards/services/store/sqlstore/category.go b/server/boards/services/store/sqlstore/category.go index 9df553bd1f..df626fedc6 100644 --- a/server/boards/services/store/sqlstore/category.go +++ b/server/boards/services/store/sqlstore/category.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/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) const categorySortOrderGap = 10 diff --git a/server/boards/services/store/sqlstore/category_boards.go b/server/boards/services/store/sqlstore/category_boards.go index 9009b6d242..699c593805 100644 --- a/server/boards/services/store/sqlstore/category_boards.go +++ b/server/boards/services/store/sqlstore/category_boards.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/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) func (s *SQLStore) getUserCategoryBoards(db sq.BaseRunner, userID, teamID string) ([]model.CategoryBoards, error) { diff --git a/server/boards/services/store/sqlstore/compliance.go b/server/boards/services/store/sqlstore/compliance.go index 33618ae5ec..995504c521 100644 --- a/server/boards/services/store/sqlstore/compliance.go +++ b/server/boards/services/store/sqlstore/compliance.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" ) func (s *SQLStore) getBoardsForCompliance(db sq.BaseRunner, opts model.QueryBoardsForComplianceOptions) ([]*model.Board, bool, error) { diff --git a/server/boards/services/store/sqlstore/data_migrations.go b/server/boards/services/store/sqlstore/data_migrations.go index 46756dd412..994ee373bc 100644 --- a/server/boards/services/store/sqlstore/data_migrations.go +++ b/server/boards/services/store/sqlstore/data_migrations.go @@ -15,7 +15,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 ( diff --git a/server/boards/services/store/sqlstore/data_retention.go b/server/boards/services/store/sqlstore/data_retention.go index 414ad27275..def429377c 100644 --- a/server/boards/services/store/sqlstore/data_retention.go +++ b/server/boards/services/store/sqlstore/data_retention.go @@ -14,7 +14,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 RetentionTableDeletionInfo struct { diff --git a/server/boards/services/store/sqlstore/file.go b/server/boards/services/store/sqlstore/file.go index abe3d98e48..f1402abd42 100644 --- a/server/boards/services/store/sqlstore/file.go +++ b/server/boards/services/store/sqlstore/file.go @@ -11,8 +11,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" ) func (s *SQLStore) saveFileInfo(db sq.BaseRunner, fileInfo *mm_model.FileInfo) error { diff --git a/server/boards/services/store/sqlstore/legacy_blocks.go b/server/boards/services/store/sqlstore/legacy_blocks.go index 38609d6844..42b3de2317 100644 --- a/server/boards/services/store/sqlstore/legacy_blocks.go +++ b/server/boards/services/store/sqlstore/legacy_blocks.go @@ -14,7 +14,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" ) func legacyBoardFields(prefix string) []string { diff --git a/server/boards/services/store/sqlstore/migrate.go b/server/boards/services/store/sqlstore/migrate.go index 63b4665490..dc7f5bfddf 100644 --- a/server/boards/services/store/sqlstore/migrate.go +++ b/server/boards/services/store/sqlstore/migrate.go @@ -16,9 +16,9 @@ import ( sq "github.com/Masterminds/squirrel" + 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/store/sqlstore" - mm_model "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/mattermost/morph" drivers "github.com/mattermost/morph/drivers" diff --git a/server/boards/services/store/sqlstore/notificationhints.go b/server/boards/services/store/sqlstore/notificationhints.go index ce0337cd02..76bc430072 100644 --- a/server/boards/services/store/sqlstore/notificationhints.go +++ b/server/boards/services/store/sqlstore/notificationhints.go @@ -13,7 +13,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" ) var notificationHintFields = []string{ diff --git a/server/boards/services/store/sqlstore/params.go b/server/boards/services/store/sqlstore/params.go index f08e512eb0..1b79c6c50a 100644 --- a/server/boards/services/store/sqlstore/params.go +++ b/server/boards/services/store/sqlstore/params.go @@ -7,9 +7,9 @@ import ( "database/sql" "fmt" - 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/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) // servicesAPI is the interface required my the Params to interact with the mattermost-server. diff --git a/server/boards/services/store/sqlstore/public_methods.go b/server/boards/services/store/sqlstore/public_methods.go index 5947b283e7..31d34db51f 100644 --- a/server/boards/services/store/sqlstore/public_methods.go +++ b/server/boards/services/store/sqlstore/public_methods.go @@ -18,8 +18,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" ) func (s *SQLStore) AddUpdateCategoryBoard(userID string, categoryID string, boardIDs []string) error { diff --git a/server/boards/services/store/sqlstore/schema_table_migration.go b/server/boards/services/store/sqlstore/schema_table_migration.go index 8ec5f154a9..01c8dc98a2 100644 --- a/server/boards/services/store/sqlstore/schema_table_migration.go +++ b/server/boards/services/store/sqlstore/schema_table_migration.go @@ -14,7 +14,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" ) // EnsureSchemaMigrationFormat checks the schema migrations table diff --git a/server/boards/services/store/sqlstore/sqlstore.go b/server/boards/services/store/sqlstore/sqlstore.go index 34be3d446d..da62e7a6be 100644 --- a/server/boards/services/store/sqlstore/sqlstore.go +++ b/server/boards/services/store/sqlstore/sqlstore.go @@ -14,8 +14,8 @@ 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" - "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" ) // SQLStore is a SQL database. diff --git a/server/boards/services/store/sqlstore/subscriptions.go b/server/boards/services/store/sqlstore/subscriptions.go index 5c7bfb93a5..a4129647bb 100644 --- a/server/boards/services/store/sqlstore/subscriptions.go +++ b/server/boards/services/store/sqlstore/subscriptions.go @@ -11,7 +11,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 subscriptionFields = []string{ diff --git a/server/boards/services/store/sqlstore/team.go b/server/boards/services/store/sqlstore/team.go index 15b4b292f0..9c9366a67c 100644 --- a/server/boards/services/store/sqlstore/team.go +++ b/server/boards/services/store/sqlstore/team.go @@ -10,7 +10,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" sq "github.com/Masterminds/squirrel" ) diff --git a/server/boards/services/store/sqlstore/templates.go b/server/boards/services/store/sqlstore/templates.go index 730071d0ee..64e3a3d112 100644 --- a/server/boards/services/store/sqlstore/templates.go +++ b/server/boards/services/store/sqlstore/templates.go @@ -11,7 +11,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 ( diff --git a/server/boards/services/store/sqlstore/testlib.go b/server/boards/services/store/sqlstore/testlib.go index 4a7af3661d..34b1f95d41 100644 --- a/server/boards/services/store/sqlstore/testlib.go +++ b/server/boards/services/store/sqlstore/testlib.go @@ -9,10 +9,10 @@ import ( "os" "testing" + "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/store" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/mgdelacroix/foundation" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/sqlstore/user.go b/server/boards/services/store/sqlstore/user.go index 49113eb5af..2c16865ebd 100644 --- a/server/boards/services/store/sqlstore/user.go +++ b/server/boards/services/store/sqlstore/user.go @@ -8,15 +8,15 @@ import ( "errors" "fmt" + mm_model "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/store" - mm_model "github.com/mattermost/mattermost-server/server/v8/model" sq "github.com/Masterminds/squirrel" "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" ) var ( diff --git a/server/boards/services/store/sqlstore/util.go b/server/boards/services/store/sqlstore/util.go index 2f9244f1fa..c6c2b75dc5 100644 --- a/server/boards/services/store/sqlstore/util.go +++ b/server/boards/services/store/sqlstore/util.go @@ -13,7 +13,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 (s *SQLStore) CloseRows(rows *sql.Rows) { diff --git a/server/boards/services/store/store.go b/server/boards/services/store/store.go index d3e994d9e5..a7f2fee320 100644 --- a/server/boards/services/store/store.go +++ b/server/boards/services/store/store.go @@ -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" ) const CardLimitTimestampSystemKey = "card_limit_timestamp" diff --git a/server/boards/services/store/storetests/files.go b/server/boards/services/store/storetests/files.go index 52aa98954a..9f6ad3f9ac 100644 --- a/server/boards/services/store/storetests/files.go +++ b/server/boards/services/store/storetests/files.go @@ -6,10 +6,10 @@ package storetests import ( "testing" + 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/services/store" "github.com/mattermost/mattermost-server/server/v8/boards/utils" - mm_model "github.com/mattermost/mattermost-server/server/v8/model" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/telemetry/mocks/ServerIface.go b/server/boards/services/telemetry/mocks/ServerIface.go index 54a00ab2a5..8eb837be29 100644 --- a/server/boards/services/telemetry/mocks/ServerIface.go +++ b/server/boards/services/telemetry/mocks/ServerIface.go @@ -8,9 +8,9 @@ import ( httpservice "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/server/v8/model" + model "github.com/mattermost/mattermost-server/server/public/model" - plugin "github.com/mattermost/mattermost-server/server/v8/plugin" + plugin "github.com/mattermost/mattermost-server/server/public/plugin" ) // ServerIface is an autogenerated mock type for the ServerIface type diff --git a/server/boards/services/telemetry/telemetry.go b/server/boards/services/telemetry/telemetry.go index 256bde2bf6..8d14dec57a 100644 --- a/server/boards/services/telemetry/telemetry.go +++ b/server/boards/services/telemetry/telemetry.go @@ -12,8 +12,8 @@ import ( "github.com/mattermost/mattermost-server/server/v8/boards/services/scheduler" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/utils" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/boards/services/telemetry/telemetry_test.go b/server/boards/services/telemetry/telemetry_test.go index ec78a0587a..d34990d677 100644 --- a/server/boards/services/telemetry/telemetry_test.go +++ b/server/boards/services/telemetry/telemetry_test.go @@ -16,7 +16,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 mockServer() (chan []byte, *httptest.Server) { diff --git a/server/boards/services/webhook/webhook.go b/server/boards/services/webhook/webhook.go index 98c70f5ce6..762a42bd0f 100644 --- a/server/boards/services/webhook/webhook.go +++ b/server/boards/services/webhook/webhook.go @@ -12,7 +12,7 @@ import ( "github.com/mattermost/mattermost-server/server/v8/boards/model" "github.com/mattermost/mattermost-server/server/v8/boards/services/config" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) // NotifyUpdate calls webhooks. diff --git a/server/boards/services/webhook/webhook_test.go b/server/boards/services/webhook/webhook_test.go index 9d7c41ec1c..14b8ea3ed8 100644 --- a/server/boards/services/webhook/webhook_test.go +++ b/server/boards/services/webhook/webhook_test.go @@ -13,7 +13,7 @@ import ( "github.com/mattermost/mattermost-server/server/v8/boards/model" "github.com/mattermost/mattermost-server/server/v8/boards/services/config" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) func TestClientUpdateNotify(t *testing.T) { diff --git a/server/boards/utils/callbackqueue.go b/server/boards/utils/callbackqueue.go index cd1923bad2..471517f63c 100644 --- a/server/boards/utils/callbackqueue.go +++ b/server/boards/utils/callbackqueue.go @@ -9,7 +9,7 @@ import ( "sync/atomic" "time" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) // CallbackFunc is a func that can enqueued in the callback queue and will be diff --git a/server/boards/utils/callbackqueue_test.go b/server/boards/utils/callbackqueue_test.go index 5328fda269..eff8080cd1 100644 --- a/server/boards/utils/callbackqueue_test.go +++ b/server/boards/utils/callbackqueue_test.go @@ -11,7 +11,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" ) func Test_newChangeNotifier(t *testing.T) { diff --git a/server/boards/utils/utils.go b/server/boards/utils/utils.go index a8220e4f62..dc3b1a6bc6 100644 --- a/server/boards/utils/utils.go +++ b/server/boards/utils/utils.go @@ -9,7 +9,7 @@ import ( "reflect" "time" - mm_model "github.com/mattermost/mattermost-server/server/v8/model" + mm_model "github.com/mattermost/mattermost-server/server/public/model" ) type IDType byte diff --git a/server/boards/web/webserver.go b/server/boards/web/webserver.go index 457767a559..6c52848fe2 100644 --- a/server/boards/web/webserver.go +++ b/server/boards/web/webserver.go @@ -16,7 +16,7 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) // RoutedService defines the interface that is needed for any service to diff --git a/server/boards/web/webserver_test.go b/server/boards/web/webserver_test.go index 24b0a04dba..74de097eae 100644 --- a/server/boards/web/webserver_test.go +++ b/server/boards/web/webserver_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 Test_NewServer(t *testing.T) { diff --git a/server/boards/ws/helpers_test.go b/server/boards/ws/helpers_test.go index 997e5ef6eb..3be3a4f1e9 100644 --- a/server/boards/ws/helpers_test.go +++ b/server/boards/ws/helpers_test.go @@ -9,8 +9,8 @@ import ( authMocks "github.com/mattermost/mattermost-server/server/v8/boards/auth/mocks" wsMocks "github.com/mattermost/mattermost-server/server/v8/boards/ws/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" ) diff --git a/server/boards/ws/mocks/mockpluginapi.go b/server/boards/ws/mocks/mockpluginapi.go index 612dd07d17..9888866346 100644 --- a/server/boards/ws/mocks/mockpluginapi.go +++ b/server/boards/ws/mocks/mockpluginapi.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mattermost/mattermost-server/server/v8/plugin (interfaces: API) +// Source: github.com/mattermost/mattermost-server/server/public/plugin (interfaces: API) // Package mocks is a generated GoMock package. package mocks @@ -13,7 +13,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/server/v8/model" + model "github.com/mattermost/mattermost-server/server/public/model" ) // MockAPI is a mock of API interface. diff --git a/server/boards/ws/plugin_adapter.go b/server/boards/ws/plugin_adapter.go index c80f2d8e65..83ad0cd1df 100644 --- a/server/boards/ws/plugin_adapter.go +++ b/server/boards/ws/plugin_adapter.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 ws import ( @@ -15,8 +15,8 @@ import ( "github.com/mattermost/mattermost-server/server/v8/boards/model" "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" ) const websocketMessagePrefix = "custom_boards_" diff --git a/server/boards/ws/plugin_adapter_client.go b/server/boards/ws/plugin_adapter_client.go index bb24ec5ccf..57de6b671b 100644 --- a/server/boards/ws/plugin_adapter_client.go +++ b/server/boards/ws/plugin_adapter_client.go @@ -8,7 +8,7 @@ import ( "sync/atomic" "time" - mm_model "github.com/mattermost/mattermost-server/server/v8/model" + mm_model "github.com/mattermost/mattermost-server/server/public/model" ) type PluginAdapterClient struct { diff --git a/server/boards/ws/plugin_adapter_cluster.go b/server/boards/ws/plugin_adapter_cluster.go index df55772787..e9844af1c6 100644 --- a/server/boards/ws/plugin_adapter_cluster.go +++ b/server/boards/ws/plugin_adapter_cluster.go @@ -6,8 +6,8 @@ package ws import ( "encoding/json" - 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 ClusterMessage struct { diff --git a/server/boards/ws/plugin_adapter_test.go b/server/boards/ws/plugin_adapter_test.go index 88fe421842..794b4a493e 100644 --- a/server/boards/ws/plugin_adapter_test.go +++ b/server/boards/ws/plugin_adapter_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/require" ) diff --git a/server/boards/ws/server.go b/server/boards/ws/server.go index 6c22f39ac3..e8bc6786cf 100644 --- a/server/boards/ws/server.go +++ b/server/boards/ws/server.go @@ -15,7 +15,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 (wss *websocketSession) WriteJSON(v interface{}) error { diff --git a/server/boards/ws/server_test.go b/server/boards/ws/server_test.go index 337e0205f4..35bd76e6ed 100644 --- a/server/boards/ws/server_test.go +++ b/server/boards/ws/server_test.go @@ -10,7 +10,7 @@ import ( "github.com/mattermost/mattermost-server/server/v8/boards/auth" "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" "github.com/gorilla/websocket" "github.com/stretchr/testify/require" diff --git a/server/channels/api4/api.go b/server/channels/api4/api.go index 5240be9b39..b0dc19c781 100644 --- a/server/channels/api4/api.go +++ b/server/channels/api4/api.go @@ -10,9 +10,9 @@ import ( graphql "github.com/graph-gophers/graphql-go" _ "github.com/mattermost/go-i18n/i18n" + "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/web" - "github.com/mattermost/mattermost-server/server/v8/model" ) type Routes struct { diff --git a/server/channels/api4/apitestlib.go b/server/channels/api4/apitestlib.go index c1ef006f8d..edcdc067d7 100644 --- a/server/channels/api4/apitestlib.go +++ b/server/channels/api4/apitestlib.go @@ -26,6 +26,9 @@ import ( "github.com/minio/minio-go/v7/pkg/credentials" "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin/plugintest/mock" + "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" @@ -34,10 +37,7 @@ import ( "github.com/mattermost/mattermost-server/server/v8/channels/web" "github.com/mattermost/mattermost-server/server/v8/channels/wsapi" "github.com/mattermost/mattermost-server/server/v8/config" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) type TestHelper struct { diff --git a/server/channels/api4/bleve.go b/server/channels/api4/bleve.go index 022445ca82..56cce8d100 100644 --- a/server/channels/api4/bleve.go +++ b/server/channels/api4/bleve.go @@ -6,8 +6,8 @@ package api4 import ( "net/http" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/audit" - "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitBleve() { diff --git a/server/channels/api4/bleve_test.go b/server/channels/api4/bleve_test.go index 29d873d022..e6a8e24a5d 100644 --- a/server/channels/api4/bleve_test.go +++ b/server/channels/api4/bleve_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestBlevePurgeIndexes(t *testing.T) { diff --git a/server/channels/api4/bot.go b/server/channels/api4/bot.go index e76ee02a53..96fef1c82f 100644 --- a/server/channels/api4/bot.go +++ b/server/channels/api4/bot.go @@ -8,9 +8,9 @@ import ( "net/http" "strconv" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitBot() { diff --git a/server/channels/api4/bot_test.go b/server/channels/api4/bot_test.go index 9c0cbb068d..aefb12ee78 100644 --- a/server/channels/api4/bot_test.go +++ b/server/channels/api4/bot_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestCreateBot(t *testing.T) { diff --git a/server/channels/api4/brand.go b/server/channels/api4/brand.go index b5e9640a61..e5ebdb9543 100644 --- a/server/channels/api4/brand.go +++ b/server/channels/api4/brand.go @@ -7,8 +7,8 @@ import ( "io" "net/http" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/audit" - "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitBrand() { diff --git a/server/channels/api4/channel.go b/server/channels/api4/channel.go index 8425df21b1..b5219663c4 100644 --- a/server/channels/api4/channel.go +++ b/server/channels/api4/channel.go @@ -10,10 +10,10 @@ import ( "strconv" "strings" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitChannel() { diff --git a/server/channels/api4/channel_category.go b/server/channels/api4/channel_category.go index 2eea5a5045..6a7c569177 100644 --- a/server/channels/api4/channel_category.go +++ b/server/channels/api4/channel_category.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func getCategoriesForTeamForUser(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/server/channels/api4/channel_category_test.go b/server/channels/api4/channel_category_test.go index 527686d70c..0acb067570 100644 --- a/server/channels/api4/channel_category_test.go +++ b/server/channels/api4/channel_category_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestCreateCategoryForTeamForUser(t *testing.T) { diff --git a/server/channels/api4/channel_local.go b/server/channels/api4/channel_local.go index c5e6c6b355..eed428efb9 100644 --- a/server/channels/api4/channel_local.go +++ b/server/channels/api4/channel_local.go @@ -7,10 +7,10 @@ import ( "encoding/json" "net/http" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitChannelLocal() { diff --git a/server/channels/api4/channel_test.go b/server/channels/api4/channel_test.go index 20ef2cd05a..4c656c7219 100644 --- a/server/channels/api4/channel_test.go +++ b/server/channels/api4/channel_test.go @@ -17,11 +17,11 @@ 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/plugin/plugintest/mock" "github.com/mattermost/mattermost-server/server/v8/channels/app" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestCreateChannel(t *testing.T) { diff --git a/server/channels/api4/cloud.go b/server/channels/api4/cloud.go index f795e3c1d2..c8c0446a8d 100644 --- a/server/channels/api4/cloud.go +++ b/server/channels/api4/cloud.go @@ -11,9 +11,9 @@ import ( "net/http" "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/audit" - "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/platform/shared/web" ) diff --git a/server/channels/api4/cloud_test.go b/server/channels/api4/cloud_test.go index 7cfe985df6..b9728a8b52 100644 --- a/server/channels/api4/cloud_test.go +++ b/server/channels/api4/cloud_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" ) func Test_getCloudLimits(t *testing.T) { diff --git a/server/channels/api4/cluster.go b/server/channels/api4/cluster.go index 233a83f3a0..7b14be2833 100644 --- a/server/channels/api4/cluster.go +++ b/server/channels/api4/cluster.go @@ -7,7 +7,7 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func (api *API) InitCluster() { diff --git a/server/channels/api4/cluster_test.go b/server/channels/api4/cluster_test.go index 175bfd1295..ae6a209e92 100644 --- a/server/channels/api4/cluster_test.go +++ b/server/channels/api4/cluster_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetClusterStatus(t *testing.T) { diff --git a/server/channels/api4/command.go b/server/channels/api4/command.go index 724994fe01..8ff82ad71d 100644 --- a/server/channels/api4/command.go +++ b/server/channels/api4/command.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitCommand() { diff --git a/server/channels/api4/command_help_test.go b/server/channels/api4/command_help_test.go index b7ba178a9c..9b0aca90cd 100644 --- a/server/channels/api4/command_help_test.go +++ b/server/channels/api4/command_help_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestHelpCommand(t *testing.T) { diff --git a/server/channels/api4/command_local.go b/server/channels/api4/command_local.go index 3c7f2d44b0..1398003a09 100644 --- a/server/channels/api4/command_local.go +++ b/server/channels/api4/command_local.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitCommandLocal() { diff --git a/server/channels/api4/command_test.go b/server/channels/api4/command_test.go index b1328da3b1..83fcff20b3 100644 --- a/server/channels/api4/command_test.go +++ b/server/channels/api4/command_test.go @@ -14,9 +14,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/public/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestCreateCommand(t *testing.T) { diff --git a/server/channels/api4/commands_test.go b/server/channels/api4/commands_test.go index 2ec4450759..1c05816dea 100644 --- a/server/channels/api4/commands_test.go +++ b/server/channels/api4/commands_test.go @@ -12,7 +12,7 @@ import ( _ "github.com/mattermost/mattermost-server/server/v8/channels/app/slashcommands" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestEchoCommand(t *testing.T) { diff --git a/server/channels/api4/compliance.go b/server/channels/api4/compliance.go index 8d86aa7030..ede2aebf15 100644 --- a/server/channels/api4/compliance.go +++ b/server/channels/api4/compliance.go @@ -10,9 +10,9 @@ import ( "github.com/avct/uasurfer" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitCompliance() { diff --git a/server/channels/api4/config.go b/server/channels/api4/config.go index 3d223424e0..14b7590688 100644 --- a/server/channels/api4/config.go +++ b/server/channels/api4/config.go @@ -10,12 +10,12 @@ import ( "reflect" "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/audit" "github.com/mattermost/mattermost-server/server/v8/channels/utils" "github.com/mattermost/mattermost-server/server/v8/config" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var writeFilter func(c *Context, structField reflect.StructField) bool diff --git a/server/channels/api4/config_local.go b/server/channels/api4/config_local.go index 33e4b9cc2f..c98c9b3e86 100644 --- a/server/channels/api4/config_local.go +++ b/server/channels/api4/config_local.go @@ -8,11 +8,11 @@ import ( "net/http" "reflect" + "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/audit" "github.com/mattermost/mattermost-server/server/v8/channels/utils" "github.com/mattermost/mattermost-server/server/v8/config" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitConfigLocal() { diff --git a/server/channels/api4/config_test.go b/server/channels/api4/config_test.go index a248254253..1b4ae12132 100644 --- a/server/channels/api4/config_test.go +++ b/server/channels/api4/config_test.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/app" "github.com/mattermost/mattermost-server/server/v8/config" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetConfig(t *testing.T) { diff --git a/server/channels/api4/cors_test.go b/server/channels/api4/cors_test.go index f95b764495..71b48df172 100644 --- a/server/channels/api4/cors_test.go +++ b/server/channels/api4/cors_test.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/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/api4/data_retention.go b/server/channels/api4/data_retention.go index 9acb51b11a..6d778138d4 100644 --- a/server/channels/api4/data_retention.go +++ b/server/channels/api4/data_retention.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitDataRetention() { diff --git a/server/channels/api4/drafts.go b/server/channels/api4/drafts.go index d48c0b3964..27d7eacdcf 100644 --- a/server/channels/api4/drafts.go +++ b/server/channels/api4/drafts.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" - "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 (api *API) InitDrafts() { diff --git a/server/channels/api4/drafts_test.go b/server/channels/api4/drafts_test.go index f9afe4eae8..da11f22029 100644 --- a/server/channels/api4/drafts_test.go +++ b/server/channels/api4/drafts_test.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/utils/testutils" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestUpsertDraft(t *testing.T) { diff --git a/server/channels/api4/elasticsearch.go b/server/channels/api4/elasticsearch.go index eaede8aa47..3dab3a8749 100644 --- a/server/channels/api4/elasticsearch.go +++ b/server/channels/api4/elasticsearch.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitElasticsearch() { diff --git a/server/channels/api4/elasticsearch_test.go b/server/channels/api4/elasticsearch_test.go index c814c61b5f..21bf316e35 100644 --- a/server/channels/api4/elasticsearch_test.go +++ b/server/channels/api4/elasticsearch_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestElasticsearchTest(t *testing.T) { diff --git a/server/channels/api4/emoji.go b/server/channels/api4/emoji.go index 42db023009..99505e3a7c 100644 --- a/server/channels/api4/emoji.go +++ b/server/channels/api4/emoji.go @@ -8,11 +8,11 @@ import ( "io" "net/http" + "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/audit" "github.com/mattermost/mattermost-server/server/v8/channels/web" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/api4/emoji_test.go b/server/channels/api4/emoji_test.go index 17f263e188..ce691eaf17 100644 --- a/server/channels/api4/emoji_test.go +++ b/server/channels/api4/emoji_test.go @@ -14,10 +14,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/v8/channels/app" "github.com/mattermost/mattermost-server/server/v8/channels/utils" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCreateEmoji(t *testing.T) { diff --git a/server/channels/api4/export.go b/server/channels/api4/export.go index 2f1110f031..d3124429fb 100644 --- a/server/channels/api4/export.go +++ b/server/channels/api4/export.go @@ -9,8 +9,8 @@ import ( "path/filepath" "time" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/audit" - "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitExport() { diff --git a/server/channels/api4/export_test.go b/server/channels/api4/export_test.go index b8c65b8ed8..78859e2148 100644 --- a/server/channels/api4/export_test.go +++ b/server/channels/api4/export_test.go @@ -10,8 +10,8 @@ import ( "path/filepath" "testing" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/stretchr/testify/require" ) diff --git a/server/channels/api4/file.go b/server/channels/api4/file.go index b09d6d1491..d46d742e01 100644 --- a/server/channels/api4/file.go +++ b/server/channels/api4/file.go @@ -14,11 +14,11 @@ import ( "strconv" "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/audit" "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/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/platform/shared/web" ) diff --git a/server/channels/api4/file_test.go b/server/channels/api4/file_test.go index af89e72fb0..a99d381506 100644 --- a/server/channels/api4/file_test.go +++ b/server/channels/api4/file_test.go @@ -22,10 +22,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/v8/channels/app" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" - "github.com/mattermost/mattermost-server/server/v8/model" ) var testDir = "" diff --git a/server/channels/api4/graphql.go b/server/channels/api4/graphql.go index 486fe117ff..332ca9ec32 100644 --- a/server/channels/api4/graphql.go +++ b/server/channels/api4/graphql.go @@ -13,9 +13,9 @@ import ( graphql "github.com/graph-gophers/graphql-go" gqlerrors "github.com/graph-gophers/graphql-go/errors" + "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/web" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type graphQLInput struct { diff --git a/server/channels/api4/graphql_client.go b/server/channels/api4/graphql_client.go index 571560665a..0b3d72106f 100644 --- a/server/channels/api4/graphql_client.go +++ b/server/channels/api4/graphql_client.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // graphQLClient is an internal test client to run the tests. diff --git a/server/channels/api4/group.go b/server/channels/api4/group.go index 0a465f4c00..6655f93ae0 100644 --- a/server/channels/api4/group.go +++ b/server/channels/api4/group.go @@ -11,9 +11,9 @@ import ( "strconv" "strings" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitGroup() { diff --git a/server/channels/api4/group_test.go b/server/channels/api4/group_test.go index f08909dc2a..8029dd7558 100644 --- a/server/channels/api4/group_test.go +++ b/server/channels/api4/group_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetGroup(t *testing.T) { diff --git a/server/channels/api4/handlers.go b/server/channels/api4/handlers.go index b7833fac87..9f7e93ab54 100644 --- a/server/channels/api4/handlers.go +++ b/server/channels/api4/handlers.go @@ -8,8 +8,8 @@ import ( "github.com/mattermost/gziphandler" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/web" - "github.com/mattermost/mattermost-server/server/v8/model" ) type Context = web.Context diff --git a/server/channels/api4/handlers_test.go b/server/channels/api4/handlers_test.go index 22a3757294..5e0a7a34ae 100644 --- a/server/channels/api4/handlers_test.go +++ b/server/channels/api4/handlers_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func handlerForGzip(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/server/channels/api4/hosted_customer.go b/server/channels/api4/hosted_customer.go index c7beef7ebd..29b1aef90f 100644 --- a/server/channels/api4/hosted_customer.go +++ b/server/channels/api4/hosted_customer.go @@ -14,9 +14,9 @@ import ( "github.com/pkg/errors" + "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/utils" - "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/platform/shared/web" ) diff --git a/server/channels/api4/hosted_customer_test.go b/server/channels/api4/hosted_customer_test.go index 671cc0f86e..65a4e4b1c3 100644 --- a/server/channels/api4/hosted_customer_test.go +++ b/server/channels/api4/hosted_customer_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" ) var valFalse = false diff --git a/server/channels/api4/image.go b/server/channels/api4/image.go index 3884ed0954..c6e4341eb3 100644 --- a/server/channels/api4/image.go +++ b/server/channels/api4/image.go @@ -7,7 +7,7 @@ import ( "net/http" "net/url" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func (api *API) InitImage() { diff --git a/server/channels/api4/image_test.go b/server/channels/api4/image_test.go index 5f188f77b8..031d94c92a 100644 --- a/server/channels/api4/image_test.go +++ b/server/channels/api4/image_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetImage(t *testing.T) { diff --git a/server/channels/api4/import.go b/server/channels/api4/import.go index acb1ade270..b52927817e 100644 --- a/server/channels/api4/import.go +++ b/server/channels/api4/import.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" - "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 (api *API) InitImport() { diff --git a/server/channels/api4/import_test.go b/server/channels/api4/import_test.go index 7ed85a0224..a89fd2b0f3 100644 --- a/server/channels/api4/import_test.go +++ b/server/channels/api4/import_test.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/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestListImports(t *testing.T) { diff --git a/server/channels/api4/insights.go b/server/channels/api4/insights.go index 48e3eee641..25c4f6d607 100644 --- a/server/channels/api4/insights.go +++ b/server/channels/api4/insights.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func (api *API) InitInsights() { diff --git a/server/channels/api4/insights_test.go b/server/channels/api4/insights_test.go index 88c40ffb1a..5dbd067bdc 100644 --- a/server/channels/api4/insights_test.go +++ b/server/channels/api4/insights_test.go @@ -10,9 +10,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/testutils" - "github.com/mattermost/mattermost-server/server/v8/model" ) // Top Reactions diff --git a/server/channels/api4/integration_action.go b/server/channels/api4/integration_action.go index bd9d65832f..6527ae1ba0 100644 --- a/server/channels/api4/integration_action.go +++ b/server/channels/api4/integration_action.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" - "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 (api *API) InitAction() { diff --git a/server/channels/api4/integration_action_test.go b/server/channels/api4/integration_action_test.go index d090b6c1ec..422f2eed37 100644 --- a/server/channels/api4/integration_action_test.go +++ b/server/channels/api4/integration_action_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type testHandler struct { diff --git a/server/channels/api4/job.go b/server/channels/api4/job.go index 63368eb1a1..0518700f0c 100644 --- a/server/channels/api4/job.go +++ b/server/channels/api4/job.go @@ -10,9 +10,9 @@ import ( "strconv" "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/audit" - "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/platform/shared/web" ) diff --git a/server/channels/api4/job_test.go b/server/channels/api4/job_test.go index 2ff395202f..d8da06e86e 100644 --- a/server/channels/api4/job_test.go +++ b/server/channels/api4/job_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestCreateJob(t *testing.T) { diff --git a/server/channels/api4/ldap.go b/server/channels/api4/ldap.go index cfdfe154b0..340c481176 100644 --- a/server/channels/api4/ldap.go +++ b/server/channels/api4/ldap.go @@ -8,9 +8,9 @@ import ( "mime/multipart" "net/http" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type mixedUnlinkedGroup struct { diff --git a/server/channels/api4/ldap_test.go b/server/channels/api4/ldap_test.go index 4187bb25c8..2118ceac60 100644 --- a/server/channels/api4/ldap_test.go +++ b/server/channels/api4/ldap_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" + "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/einterfaces/mocks" ) var spPrivateKey = `-----BEGIN PRIVATE KEY----- diff --git a/server/channels/api4/license.go b/server/channels/api4/license.go index 065ff90fd6..e202837801 100644 --- a/server/channels/api4/license.go +++ b/server/channels/api4/license.go @@ -11,11 +11,11 @@ import ( "io" "net/http" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/utils" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/audit" - "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitLicense() { diff --git a/server/channels/api4/license_local.go b/server/channels/api4/license_local.go index e1380b3f6f..31f3f4f59d 100644 --- a/server/channels/api4/license_local.go +++ b/server/channels/api4/license_local.go @@ -9,9 +9,9 @@ import ( "io" "net/http" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitLicenseLocal() { diff --git a/server/channels/api4/license_test.go b/server/channels/api4/license_test.go index d580d6243d..7a562d3901 100644 --- a/server/channels/api4/license_test.go +++ b/server/channels/api4/license_test.go @@ -10,11 +10,11 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/utils" mocks2 "github.com/mattermost/mattermost-server/server/v8/channels/utils/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/server/channels/api4/notify_admin.go b/server/channels/api4/notify_admin.go index e94f280de9..d109d6cef9 100644 --- a/server/channels/api4/notify_admin.go +++ b/server/channels/api4/notify_admin.go @@ -7,7 +7,7 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func handleNotifyAdmin(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/server/channels/api4/notify_admin_test.go b/server/channels/api4/notify_admin_test.go index d633421f42..442489cc2d 100644 --- a/server/channels/api4/notify_admin_test.go +++ b/server/channels/api4/notify_admin_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestNotifyAdmin(t *testing.T) { diff --git a/server/channels/api4/oauth.go b/server/channels/api4/oauth.go index fb486cc7c2..09de966f56 100644 --- a/server/channels/api4/oauth.go +++ b/server/channels/api4/oauth.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitOAuth() { diff --git a/server/channels/api4/oauth_test.go b/server/channels/api4/oauth_test.go index 1ab7ea5191..7d3b2ff5db 100644 --- a/server/channels/api4/oauth_test.go +++ b/server/channels/api4/oauth_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestCreateOAuthApp(t *testing.T) { diff --git a/server/channels/api4/openGraph.go b/server/channels/api4/openGraph.go index 0eba8030a8..5e00707bca 100644 --- a/server/channels/api4/openGraph.go +++ b/server/channels/api4/openGraph.go @@ -6,8 +6,8 @@ package api4 import ( "net/http" - "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 (api *API) InitOpenGraph() { diff --git a/server/channels/api4/openGraph_test.go b/server/channels/api4/openGraph_test.go index 5a038fb4da..cad83d2924 100644 --- a/server/channels/api4/openGraph_test.go +++ b/server/channels/api4/openGraph_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetOpenGraphMetadata(t *testing.T) { diff --git a/server/channels/api4/permission.go b/server/channels/api4/permission.go index f732f3afe9..11a38b6341 100644 --- a/server/channels/api4/permission.go +++ b/server/channels/api4/permission.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func (api *API) InitPermissions() { diff --git a/server/channels/api4/permissions_test.go b/server/channels/api4/permissions_test.go index 16aa71d135..4d5d9e35f5 100644 --- a/server/channels/api4/permissions_test.go +++ b/server/channels/api4/permissions_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetAncillaryPermissions(t *testing.T) { diff --git a/server/channels/api4/plugin.go b/server/channels/api4/plugin.go index c6aa44961e..4b8dc573e7 100644 --- a/server/channels/api4/plugin.go +++ b/server/channels/api4/plugin.go @@ -13,10 +13,10 @@ import ( "github.com/pkg/errors" + "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/audit" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/api4/plugin_test.go b/server/channels/api4/plugin_test.go index 8a923d1d0c..fb9ed20a57 100644 --- a/server/channels/api4/plugin_test.go +++ b/server/channels/api4/plugin_test.go @@ -22,10 +22,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/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/testlib" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) func TestPlugin(t *testing.T) { diff --git a/server/channels/api4/post.go b/server/channels/api4/post.go index 8690aa4e32..6c119fd728 100644 --- a/server/channels/api4/post.go +++ b/server/channels/api4/post.go @@ -9,11 +9,11 @@ import ( "strconv" "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/audit" "github.com/mattermost/mattermost-server/server/v8/channels/web" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitPost() { diff --git a/server/channels/api4/post_test.go b/server/channels/api4/post_test.go index 8ab88fefff..81692c3b7f 100644 --- a/server/channels/api4/post_test.go +++ b/server/channels/api4/post_test.go @@ -21,13 +21,13 @@ 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/plugin/plugintest/mock" + "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/store/storetest/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/utils" "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" - "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/plugintest/mock" ) func TestCreatePost(t *testing.T) { diff --git a/server/channels/api4/preference.go b/server/channels/api4/preference.go index 4483e00c22..c07c930133 100644 --- a/server/channels/api4/preference.go +++ b/server/channels/api4/preference.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitPreference() { diff --git a/server/channels/api4/preference_test.go b/server/channels/api4/preference_test.go index b270995099..1c660a4f71 100644 --- a/server/channels/api4/preference_test.go +++ b/server/channels/api4/preference_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetPreferences(t *testing.T) { diff --git a/server/channels/api4/reaction.go b/server/channels/api4/reaction.go index b58a71e8f9..64c6328324 100644 --- a/server/channels/api4/reaction.go +++ b/server/channels/api4/reaction.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" - "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 (api *API) InitReaction() { diff --git a/server/channels/api4/reaction_test.go b/server/channels/api4/reaction_test.go index 45d3aab9a3..54dde03e8d 100644 --- a/server/channels/api4/reaction_test.go +++ b/server/channels/api4/reaction_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestSaveReaction(t *testing.T) { diff --git a/server/channels/api4/remote_cluster.go b/server/channels/api4/remote_cluster.go index 75783f0c98..fe4a0009cf 100644 --- a/server/channels/api4/remote_cluster.go +++ b/server/channels/api4/remote_cluster.go @@ -9,11 +9,11 @@ import ( "net/http" "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitRemoteCluster() { diff --git a/server/channels/api4/resolver.go b/server/channels/api4/resolver.go index 1ebbcf04dd..14538d796c 100644 --- a/server/channels/api4/resolver.go +++ b/server/channels/api4/resolver.go @@ -10,10 +10,10 @@ import ( "github.com/graph-gophers/dataloader/v6" + "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/store" "github.com/mattermost/mattermost-server/server/v8/channels/web" - "github.com/mattermost/mattermost-server/server/v8/model" ) // cursorPrefix is used to categorize objects diff --git a/server/channels/api4/resolver_channel.go b/server/channels/api4/resolver_channel.go index 0650248131..a108bcc5c2 100644 --- a/server/channels/api4/resolver_channel.go +++ b/server/channels/api4/resolver_channel.go @@ -10,8 +10,8 @@ import ( "sort" "strings" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/web" - "github.com/mattermost/mattermost-server/server/v8/model" ) // channel is an internal graphQL wrapper struct to add resolver methods. diff --git a/server/channels/api4/resolver_channel_member.go b/server/channels/api4/resolver_channel_member.go index e26aaca041..a4327e1dfd 100644 --- a/server/channels/api4/resolver_channel_member.go +++ b/server/channels/api4/resolver_channel_member.go @@ -11,8 +11,8 @@ import ( "github.com/graph-gophers/dataloader/v6" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/web" - "github.com/mattermost/mattermost-server/server/v8/model" ) // channelMember is an internal graphQL wrapper struct to add resolver methods. diff --git a/server/channels/api4/resolver_channel_member_test.go b/server/channels/api4/resolver_channel_member_test.go index e1c5cc9699..480da37996 100644 --- a/server/channels/api4/resolver_channel_member_test.go +++ b/server/channels/api4/resolver_channel_member_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGraphQLChannelMembers(t *testing.T) { diff --git a/server/channels/api4/resolver_channel_test.go b/server/channels/api4/resolver_channel_test.go index 6d1b535568..88e78a7f27 100644 --- a/server/channels/api4/resolver_channel_test.go +++ b/server/channels/api4/resolver_channel_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGraphQLChannels(t *testing.T) { diff --git a/server/channels/api4/resolver_sidebar_categories_test.go b/server/channels/api4/resolver_sidebar_categories_test.go index 5d4b3ee691..7967f277ca 100644 --- a/server/channels/api4/resolver_sidebar_categories_test.go +++ b/server/channels/api4/resolver_sidebar_categories_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGraphQLSidebarCategories(t *testing.T) { diff --git a/server/channels/api4/resolver_team.go b/server/channels/api4/resolver_team.go index a94be2cc5a..b628227578 100644 --- a/server/channels/api4/resolver_team.go +++ b/server/channels/api4/resolver_team.go @@ -9,8 +9,8 @@ import ( "github.com/graph-gophers/dataloader/v6" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/web" - "github.com/mattermost/mattermost-server/server/v8/model" ) func getGraphQLTeam(ctx context.Context, id string) (*model.Team, error) { diff --git a/server/channels/api4/resolver_team_member.go b/server/channels/api4/resolver_team_member.go index 3036a4d146..c3c95b513f 100644 --- a/server/channels/api4/resolver_team_member.go +++ b/server/channels/api4/resolver_team_member.go @@ -9,7 +9,7 @@ import ( "github.com/graph-gophers/dataloader/v6" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // teamMember is an internal graphQL wrapper struct to add resolver methods. diff --git a/server/channels/api4/resolver_team_member_test.go b/server/channels/api4/resolver_team_member_test.go index 42b7c9efe1..660fbc436f 100644 --- a/server/channels/api4/resolver_team_member_test.go +++ b/server/channels/api4/resolver_team_member_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGraphQLTeamMembers(t *testing.T) { diff --git a/server/channels/api4/resolver_test.go b/server/channels/api4/resolver_test.go index 17eba4b864..b3df4a09ab 100644 --- a/server/channels/api4/resolver_test.go +++ b/server/channels/api4/resolver_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGraphQLConfig(t *testing.T) { diff --git a/server/channels/api4/resolver_user.go b/server/channels/api4/resolver_user.go index 588b961e7f..da9adc3ae1 100644 --- a/server/channels/api4/resolver_user.go +++ b/server/channels/api4/resolver_user.go @@ -9,8 +9,8 @@ import ( "github.com/graph-gophers/dataloader/v6" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/web" - "github.com/mattermost/mattermost-server/server/v8/model" ) // user is an internal graphQL wrapper struct to add resolver methods. diff --git a/server/channels/api4/resolver_user_test.go b/server/channels/api4/resolver_user_test.go index b6104a181d..d41d27443c 100644 --- a/server/channels/api4/resolver_user_test.go +++ b/server/channels/api4/resolver_user_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGraphQLUser(t *testing.T) { diff --git a/server/channels/api4/role.go b/server/channels/api4/role.go index 40d4527bf9..79417108d1 100644 --- a/server/channels/api4/role.go +++ b/server/channels/api4/role.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var notAllowedPermissions = []string{ diff --git a/server/channels/api4/role_test.go b/server/channels/api4/role_test.go index 5bc281a21c..350a8a03d8 100644 --- a/server/channels/api4/role_test.go +++ b/server/channels/api4/role_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetAllRoles(t *testing.T) { diff --git a/server/channels/api4/saml.go b/server/channels/api4/saml.go index 4cae4f2d55..7e92111d60 100644 --- a/server/channels/api4/saml.go +++ b/server/channels/api4/saml.go @@ -10,9 +10,9 @@ import ( "mime/multipart" "net/http" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitSaml() { diff --git a/server/channels/api4/saml_test.go b/server/channels/api4/saml_test.go index 2d41632fe5..3dedd894f5 100644 --- a/server/channels/api4/saml_test.go +++ b/server/channels/api4/saml_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" ) func TestGetSamlMetadata(t *testing.T) { diff --git a/server/channels/api4/scheme.go b/server/channels/api4/scheme.go index 85dc095382..6bf1edfaed 100644 --- a/server/channels/api4/scheme.go +++ b/server/channels/api4/scheme.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitScheme() { diff --git a/server/channels/api4/scheme_test.go b/server/channels/api4/scheme_test.go index 13e4e631d3..436c596803 100644 --- a/server/channels/api4/scheme_test.go +++ b/server/channels/api4/scheme_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestCreateScheme(t *testing.T) { diff --git a/server/channels/api4/shared_channel.go b/server/channels/api4/shared_channel.go index 8bb40a82d5..1f6038a3c5 100644 --- a/server/channels/api4/shared_channel.go +++ b/server/channels/api4/shared_channel.go @@ -7,7 +7,7 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func (api *API) InitSharedChannels() { diff --git a/server/channels/api4/shared_channel_test.go b/server/channels/api4/shared_channel_test.go index befe9642b6..d7ef5e930a 100644 --- a/server/channels/api4/shared_channel_test.go +++ b/server/channels/api4/shared_channel_test.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/app" - "github.com/mattermost/mattermost-server/server/v8/model" ) var ( diff --git a/server/channels/api4/status.go b/server/channels/api4/status.go index 62a4c0e7ec..788d8a4b71 100644 --- a/server/channels/api4/status.go +++ b/server/channels/api4/status.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" - "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 (api *API) InitStatus() { diff --git a/server/channels/api4/status_test.go b/server/channels/api4/status_test.go index bde3e695b4..58bc501603 100644 --- a/server/channels/api4/status_test.go +++ b/server/channels/api4/status_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetUserStatus(t *testing.T) { diff --git a/server/channels/api4/system.go b/server/channels/api4/system.go index bb3442ba54..739c506585 100644 --- a/server/channels/api4/system.go +++ b/server/channels/api4/system.go @@ -17,11 +17,11 @@ import ( "github.com/pkg/errors" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" "github.com/mattermost/mattermost-server/server/v8/platform/services/upgrader" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/platform/shared/web" ) diff --git a/server/channels/api4/system_local.go b/server/channels/api4/system_local.go index 65e6d12b1c..2619bc9452 100644 --- a/server/channels/api4/system_local.go +++ b/server/channels/api4/system_local.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/audit" - "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitSystemLocal() { diff --git a/server/channels/api4/system_test.go b/server/channels/api4/system_test.go index 25574e4400..4d30e43b77 100644 --- a/server/channels/api4/system_test.go +++ b/server/channels/api4/system_test.go @@ -21,9 +21,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/public/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestGetPing(t *testing.T) { diff --git a/server/channels/api4/team.go b/server/channels/api4/team.go index bef7d2223d..3be95b404c 100644 --- a/server/channels/api4/team.go +++ b/server/channels/api4/team.go @@ -14,9 +14,9 @@ import ( "strconv" "strings" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/api4/team_local.go b/server/channels/api4/team_local.go index 310ea0de84..d1b72f5c8e 100644 --- a/server/channels/api4/team_local.go +++ b/server/channels/api4/team_local.go @@ -12,11 +12,11 @@ import ( "github.com/pkg/errors" + "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/email" "github.com/mattermost/mattermost-server/server/v8/channels/audit" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitTeamLocal() { diff --git a/server/channels/api4/team_test.go b/server/channels/api4/team_test.go index e9ae1bea28..b5c6479716 100644 --- a/server/channels/api4/team_test.go +++ b/server/channels/api4/team_test.go @@ -17,14 +17,14 @@ 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/plugin/plugintest/mock" + "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/server/v8/channels/einterfaces/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestCreateTeam(t *testing.T) { diff --git a/server/channels/api4/terms_of_service.go b/server/channels/api4/terms_of_service.go index d0d72604f8..888a060734 100644 --- a/server/channels/api4/terms_of_service.go +++ b/server/channels/api4/terms_of_service.go @@ -7,10 +7,10 @@ import ( "encoding/json" "net/http" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitTermsOfService() { diff --git a/server/channels/api4/terms_of_service_test.go b/server/channels/api4/terms_of_service_test.go index eac3ed54fe..7aea400d25 100644 --- a/server/channels/api4/terms_of_service_test.go +++ b/server/channels/api4/terms_of_service_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetTermsOfService(t *testing.T) { diff --git a/server/channels/api4/upload.go b/server/channels/api4/upload.go index 55850903db..e50a314f75 100644 --- a/server/channels/api4/upload.go +++ b/server/channels/api4/upload.go @@ -10,10 +10,10 @@ import ( "mime/multipart" "net/http" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitUpload() { diff --git a/server/channels/api4/upload_test.go b/server/channels/api4/upload_test.go index 9ed6d1eaae..074596475a 100644 --- a/server/channels/api4/upload_test.go +++ b/server/channels/api4/upload_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCreateUpload(t *testing.T) { diff --git a/server/channels/api4/usage.go b/server/channels/api4/usage.go index fabf880a32..c9e9da6297 100644 --- a/server/channels/api4/usage.go +++ b/server/channels/api4/usage.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/utils" - "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitUsage() { diff --git a/server/channels/api4/usage_test.go b/server/channels/api4/usage_test.go index b85b2f0029..bfa1ae3c44 100644 --- a/server/channels/api4/usage_test.go +++ b/server/channels/api4/usage_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetPostsUsage(t *testing.T) { diff --git a/server/channels/api4/user.go b/server/channels/api4/user.go index 2269efe88c..491f02dbdd 100644 --- a/server/channels/api4/user.go +++ b/server/channels/api4/user.go @@ -12,13 +12,13 @@ import ( "strings" "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/audit" "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/channels/web" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitUser() { diff --git a/server/channels/api4/user_local.go b/server/channels/api4/user_local.go index 21cc0f800c..5ad09f468c 100644 --- a/server/channels/api4/user_local.go +++ b/server/channels/api4/user_local.go @@ -9,11 +9,11 @@ import ( "strconv" "strings" + "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/audit" "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/shared/mlog" ) func (api *API) InitUserLocal() { diff --git a/server/channels/api4/user_test.go b/server/channels/api4/user_test.go index de4e7c5f08..b9b6a22538 100644 --- a/server/channels/api4/user_test.go +++ b/server/channels/api4/user_test.go @@ -20,10 +20,10 @@ import ( "github.com/stretchr/testify/mock" "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/server/v8/channels/einterfaces/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" _ "github.com/mattermost/mattermost-server/server/v8/channels/app/oauthproviders/gitlab" diff --git a/server/channels/api4/user_viewmembers_test.go b/server/channels/api4/user_viewmembers_test.go index 40c051b0ae..8872645696 100644 --- a/server/channels/api4/user_viewmembers_test.go +++ b/server/channels/api4/user_viewmembers_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestAPIRestrictedViewMembers(t *testing.T) { diff --git a/server/channels/api4/webhook.go b/server/channels/api4/webhook.go index 4d96e08a61..b09dd42673 100644 --- a/server/channels/api4/webhook.go +++ b/server/channels/api4/webhook.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitWebhook() { diff --git a/server/channels/api4/webhook_local.go b/server/channels/api4/webhook_local.go index eacdf2af88..22c9507ed5 100644 --- a/server/channels/api4/webhook_local.go +++ b/server/channels/api4/webhook_local.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) InitWebhookLocal() { diff --git a/server/channels/api4/webhook_test.go b/server/channels/api4/webhook_test.go index 468fd58082..e100644ffe 100644 --- a/server/channels/api4/webhook_test.go +++ b/server/channels/api4/webhook_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestCreateIncomingWebhook(t *testing.T) { diff --git a/server/channels/api4/websocket.go b/server/channels/api4/websocket.go index 54fea3f4aa..e77905269e 100644 --- a/server/channels/api4/websocket.go +++ b/server/channels/api4/websocket.go @@ -8,9 +8,9 @@ import ( "github.com/gorilla/websocket" + "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/platform" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/api4/websocket_norace_test.go b/server/channels/api4/websocket_norace_test.go index 5be1d539c2..06c9ee6437 100644 --- a/server/channels/api4/websocket_norace_test.go +++ b/server/channels/api4/websocket_norace_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // TestWebSocket is intentionally made to skip -race mode diff --git a/server/channels/api4/websocket_test.go b/server/channels/api4/websocket_test.go index b7127814bc..564076df21 100644 --- a/server/channels/api4/websocket_test.go +++ b/server/channels/api4/websocket_test.go @@ -14,9 +14,9 @@ import ( "github.com/gorilla/websocket" "github.com/stretchr/testify/require" + "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/testlib" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestWebSocketTrailingSlash(t *testing.T) { diff --git a/server/channels/api4/work_templates.go b/server/channels/api4/work_templates.go index bdabd86df1..802ad7a01c 100644 --- a/server/channels/api4/work_templates.go +++ b/server/channels/api4/work_templates.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates" - "github.com/mattermost/mattermost-server/server/v8/model" ) const WorkTemplateContextOnboarding = "onboarding" diff --git a/server/channels/app/admin.go b/server/channels/app/admin.go index b559dca1e0..bf2c36c5cf 100644 --- a/server/channels/app/admin.go +++ b/server/channels/app/admin.go @@ -10,10 +10,10 @@ import ( "net/http" "time" + "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/request" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" ) diff --git a/server/channels/app/admin_advisor.go b/server/channels/app/admin_advisor.go index 70fb4b4151..279ca90744 100644 --- a/server/channels/app/admin_advisor.go +++ b/server/channels/app/admin_advisor.go @@ -7,11 +7,11 @@ import ( "net/http" "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/request" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) GetWarnMetricsStatus() (map[string]*model.WarnMetricStatus, *model.AppError) { diff --git a/server/channels/app/admin_test.go b/server/channels/app/admin_test.go index a583a572e3..fb222d74b8 100644 --- a/server/channels/app/admin_test.go +++ b/server/channels/app/admin_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetLatestVersion(t *testing.T) { diff --git a/server/channels/app/analytics.go b/server/channels/app/analytics.go index 83b8eb043f..bd896b1e6d 100644 --- a/server/channels/app/analytics.go +++ b/server/channels/app/analytics.go @@ -8,8 +8,8 @@ import ( "golang.org/x/sync/errgroup" - "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 ( diff --git a/server/channels/app/app.go b/server/channels/app/app.go index f7f30c1936..eb2f2713ef 100644 --- a/server/channels/app/app.go +++ b/server/channels/app/app.go @@ -9,15 +9,15 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/timezones" "github.com/mattermost/mattermost-server/server/v8/channels/product" "github.com/mattermost/mattermost-server/server/v8/channels/utils" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" "github.com/mattermost/mattermost-server/server/v8/platform/services/imageproxy" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" - "github.com/mattermost/mattermost-server/server/v8/platform/services/timezones" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/platform/shared/templates" ) diff --git a/server/channels/app/app_iface.go b/server/channels/app/app_iface.go index 704296f8b3..5a479b9c9d 100644 --- a/server/channels/app/app_iface.go +++ b/server/channels/app/app_iface.go @@ -18,23 +18,23 @@ import ( "reflect" "time" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/timezones" "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" "github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates" "github.com/mattermost/mattermost-server/server/v8/channels/audit" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" "github.com/mattermost/mattermost-server/server/v8/channels/product" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" "github.com/mattermost/mattermost-server/server/v8/platform/services/imageproxy" "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" - "github.com/mattermost/mattermost-server/server/v8/platform/services/timezones" "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) // AppIface is extracted from App struct and contains all it's exported methods. It's provided to allow partial interface passing and app layers creation. diff --git a/server/channels/app/app_test.go b/server/channels/app/app_test.go index 0ba8caff88..060dbacaeb 100644 --- a/server/channels/app/app_test.go +++ b/server/channels/app/app_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" ) /* TODO: Temporarily comment out until MM-11108 diff --git a/server/channels/app/audit.go b/server/channels/app/audit.go index e599d2e9d7..6445d433bc 100644 --- a/server/channels/app/audit.go +++ b/server/channels/app/audit.go @@ -9,11 +9,11 @@ import ( "net/http" "os/user" + "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/audit" "github.com/mattermost/mattermost-server/server/v8/channels/store" "github.com/mattermost/mattermost-server/server/v8/config" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var ( diff --git a/server/channels/app/authentication.go b/server/channels/app/authentication.go index aac42c936c..737ac414da 100644 --- a/server/channels/app/authentication.go +++ b/server/channels/app/authentication.go @@ -8,9 +8,9 @@ import ( "net/http" "strings" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" "github.com/mattermost/mattermost-server/server/v8/channels/app/users" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/shared/mfa" ) diff --git a/server/channels/app/authentication_test.go b/server/channels/app/authentication_test.go index eb4ed1d4cf..b21ea4fd97 100644 --- a/server/channels/app/authentication_test.go +++ b/server/channels/app/authentication_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestParseAuthTokenFromRequest(t *testing.T) { diff --git a/server/channels/app/authorization.go b/server/channels/app/authorization.go index 261dc39a34..4af1c1b989 100644 --- a/server/channels/app/authorization.go +++ b/server/channels/app/authorization.go @@ -9,9 +9,9 @@ import ( "net/http" "strings" + "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" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) MakePermissionError(s *model.Session, permissions []*model.Permission) *model.AppError { diff --git a/server/channels/app/authorization_test.go b/server/channels/app/authorization_test.go index 4106cd1966..ab78fe3ac1 100644 --- a/server/channels/app/authorization_test.go +++ b/server/channels/app/authorization_test.go @@ -16,9 +16,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/public/plugin/plugintest/mock" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestCheckIfRolesGrantPermission(t *testing.T) { diff --git a/server/channels/app/auto_responder.go b/server/channels/app/auto_responder.go index d002cf0ab5..e2110b26f9 100644 --- a/server/channels/app/auto_responder.go +++ b/server/channels/app/auto_responder.go @@ -7,8 +7,8 @@ import ( "net/http" "time" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - "github.com/mattermost/mattermost-server/server/v8/model" ) // check if there is any auto_response type post in channel by the user in a calender day diff --git a/server/channels/app/auto_responder_test.go b/server/channels/app/auto_responder_test.go index 8bd9e8493a..fa8023b77e 100644 --- a/server/channels/app/auto_responder_test.go +++ b/server/channels/app/auto_responder_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestSetAutoResponderStatus(t *testing.T) { diff --git a/server/channels/app/bot.go b/server/channels/app/bot.go index ae117a05da..906bc3be59 100644 --- a/server/channels/app/bot.go +++ b/server/channels/app/bot.go @@ -9,12 +9,12 @@ import ( "fmt" "net/http" + "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/request" "github.com/mattermost/mattermost-server/server/v8/channels/product" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/app/bot_test.go b/server/channels/app/bot_test.go index c55a01414e..46bad500f7 100644 --- a/server/channels/app/bot_test.go +++ b/server/channels/app/bot_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestCreateBot(t *testing.T) { diff --git a/server/channels/app/brand.go b/server/channels/app/brand.go index 3c2abf3650..947540342e 100644 --- a/server/channels/app/brand.go +++ b/server/channels/app/brand.go @@ -9,7 +9,7 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) const ( diff --git a/server/channels/app/busy.go b/server/channels/app/busy.go index a72bb2ce71..4555170369 100644 --- a/server/channels/app/busy.go +++ b/server/channels/app/busy.go @@ -10,8 +10,8 @@ import ( "sync/atomic" "time" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" ) const ( diff --git a/server/channels/app/busy_test.go b/server/channels/app/busy_test.go index 2b267fa443..361b3b80b9 100644 --- a/server/channels/app/busy_test.go +++ b/server/channels/app/busy_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" ) func TestBusySet(t *testing.T) { diff --git a/server/channels/app/channel.go b/server/channels/app/channel.go index 3738132cc4..c4399cecd4 100644 --- a/server/channels/app/channel.go +++ b/server/channels/app/channel.go @@ -14,15 +14,15 @@ import ( "github.com/mattermost/logr/v2" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "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/request" "github.com/mattermost/mattermost-server/server/v8/channels/product" "github.com/mattermost/mattermost-server/server/v8/channels/store" "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" "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/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) // channelsWrapper provides an implementation of `product.ChannelService` to be used by products. diff --git a/server/channels/app/channel_category.go b/server/channels/app/channel_category.go index 4c8e3585bb..0e2ed89b82 100644 --- a/server/channels/app/channel_category.go +++ b/server/channels/app/channel_category.go @@ -8,10 +8,10 @@ import ( "errors" "net/http" + "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" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) createInitialSidebarCategories(userID string, opts *store.SidebarCategorySearchOpts) (*model.OrderedSidebarCategories, *model.AppError) { diff --git a/server/channels/app/channel_category_test.go b/server/channels/app/channel_category_test.go index f697f773d7..e89626e098 100644 --- a/server/channels/app/channel_category_test.go +++ b/server/channels/app/channel_category_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestSidebarCategory(t *testing.T) { diff --git a/server/channels/app/channel_category_with_apps_category_test.go b/server/channels/app/channel_category_with_apps_category_test.go index 7ce2f9fbb3..7a1bcb9dad 100644 --- a/server/channels/app/channel_category_with_apps_category_test.go +++ b/server/channels/app/channel_category_with_apps_category_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestSidebarCategoryWithAppsCategory(t *testing.T) { diff --git a/server/channels/app/channel_test.go b/server/channels/app/channel_test.go index 2b427ba806..4503cdcaf0 100644 --- a/server/channels/app/channel_test.go +++ b/server/channels/app/channel_test.go @@ -18,9 +18,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/app/users" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestPermanentDeleteChannel(t *testing.T) { diff --git a/server/channels/app/channels.go b/server/channels/app/channels.go index 57252b403a..7bbb0248e6 100644 --- a/server/channels/app/channels.go +++ b/server/channels/app/channels.go @@ -11,16 +11,16 @@ import ( "github.com/pkg/errors" + "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/app/imaging" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" "github.com/mattermost/mattermost-server/server/v8/channels/product" "github.com/mattermost/mattermost-server/server/v8/config" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" "github.com/mattermost/mattermost-server/server/v8/platform/services/imageproxy" "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) const ServerKey product.ServiceKey = "server" diff --git a/server/channels/app/cloud.go b/server/channels/app/cloud.go index 3114368f1f..a40b22da37 100644 --- a/server/channels/app/cloud.go +++ b/server/channels/app/cloud.go @@ -10,10 +10,10 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/product" - "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/einterfaces" ) // Ensure cloud service wrapper implements `product.CloudService` diff --git a/server/channels/app/cluster_handlers.go b/server/channels/app/cluster_handlers.go index 7c5ce3b983..2d3386c9e5 100644 --- a/server/channels/app/cluster_handlers.go +++ b/server/channels/app/cluster_handlers.go @@ -6,9 +6,9 @@ package app import ( "encoding/json" - "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" + "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" ) func (s *Server) clusterInstallPluginHandler(msg *model.ClusterMessage) { diff --git a/server/channels/app/collection.go b/server/channels/app/collection.go index dbe7c0d8a3..ace25a1432 100644 --- a/server/channels/app/collection.go +++ b/server/channels/app/collection.go @@ -6,8 +6,8 @@ package app import ( "net/http" - "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 (a *App) RegisterCollectionAndTopic(pluginID, collectionType, topicType string) error { diff --git a/server/channels/app/command.go b/server/channels/app/command.go index 1e94e5cdad..c7fd371806 100644 --- a/server/channels/app/command.go +++ b/server/channels/app/command.go @@ -14,11 +14,11 @@ import ( "sync" "unicode" + "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/request" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/app/command_autocomplete.go b/server/channels/app/command_autocomplete.go index 6132332d31..3492369999 100644 --- a/server/channels/app/command_autocomplete.go +++ b/server/channels/app/command_autocomplete.go @@ -11,9 +11,9 @@ import ( "sort" "strings" + "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" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // AutocompleteDynamicArgProvider dynamically provides auto-completion args for built-in commands. diff --git a/server/channels/app/command_autocomplete_test.go b/server/channels/app/command_autocomplete_test.go index 99e5d40855..2d9b95ef30 100644 --- a/server/channels/app/command_autocomplete_test.go +++ b/server/channels/app/command_autocomplete_test.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/public/shared/i18n" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func TestParseStaticListArgument(t *testing.T) { diff --git a/server/channels/app/compliance.go b/server/channels/app/compliance.go index 40e333825f..4db83f138f 100644 --- a/server/channels/app/compliance.go +++ b/server/channels/app/compliance.go @@ -8,9 +8,9 @@ import ( "net/http" "os" + "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/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) GetComplianceReports(page, perPage int) (model.Compliances, *model.AppError) { diff --git a/server/channels/app/config.go b/server/channels/app/config.go index d7265935c3..578d3db87c 100644 --- a/server/channels/app/config.go +++ b/server/channels/app/config.go @@ -14,10 +14,10 @@ import ( "github.com/pkg/errors" + "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/utils" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/app/config_test.go b/server/channels/app/config_test.go index 102de38754..21bcf4ca66 100644 --- a/server/channels/app/config_test.go +++ b/server/channels/app/config_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/utils" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestAsymmetricSigningKey(t *testing.T) { diff --git a/server/channels/app/context.go b/server/channels/app/context.go index 03cb895b37..6a1037c356 100644 --- a/server/channels/app/context.go +++ b/server/channels/app/context.go @@ -6,9 +6,9 @@ package app import ( "context" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) // WithMaster adds the context value that master DB should be selected for this request. diff --git a/server/channels/app/data_retention.go b/server/channels/app/data_retention.go index dd2ef11dca..99c221d88e 100644 --- a/server/channels/app/data_retention.go +++ b/server/channels/app/data_retention.go @@ -6,7 +6,7 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func (a *App) GetGlobalRetentionPolicy() (*model.GlobalRetentionPolicy, *model.AppError) { diff --git a/server/channels/app/download.go b/server/channels/app/download.go index ec6ddf8b14..23f9f5c26d 100644 --- a/server/channels/app/download.go +++ b/server/channels/app/download.go @@ -11,8 +11,8 @@ import ( "github.com/pkg/errors" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/utils" - "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/app/download_test.go b/server/channels/app/download_test.go index 172c527c19..d63052ab78 100644 --- a/server/channels/app/download_test.go +++ b/server/channels/app/download_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestDownloadFromURL(t *testing.T) { diff --git a/server/channels/app/draft.go b/server/channels/app/draft.go index 83e9d748ff..66506acbf4 100644 --- a/server/channels/app/draft.go +++ b/server/channels/app/draft.go @@ -9,10 +9,10 @@ import ( "errors" "net/http" + "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" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) GetDraft(userID, channelID, rootID string) (*model.Draft, *model.AppError) { diff --git a/server/channels/app/draft_test.go b/server/channels/app/draft_test.go index ac19cedac0..5864a00a7b 100644 --- a/server/channels/app/draft_test.go +++ b/server/channels/app/draft_test.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/utils/testutils" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetDraft(t *testing.T) { diff --git a/server/channels/app/email/email.go b/server/channels/app/email/email.go index 2b3fcacef8..718765bcba 100644 --- a/server/channels/app/email/email.go +++ b/server/channels/app/email/email.go @@ -15,10 +15,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "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/platform/shared/mail" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/platform/shared/templates" "github.com/microcosm-cc/bluemonday" diff --git a/server/channels/app/email/email_batching.go b/server/channels/app/email/email_batching.go index 1988a358cd..053f27b5e4 100644 --- a/server/channels/app/email/email_batching.go +++ b/server/channels/app/email/email_batching.go @@ -14,9 +14,9 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "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/i18n" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) const ( diff --git a/server/channels/app/email/email_batching_test.go b/server/channels/app/email/email_batching_test.go index 087351e6a3..cc8003a829 100644 --- a/server/channels/app/email/email_batching_test.go +++ b/server/channels/app/email/email_batching_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestHandleNewNotifications(t *testing.T) { diff --git a/server/channels/app/email/email_test.go b/server/channels/app/email/email_test.go index 7a8c87979e..27446e8fcb 100644 --- a/server/channels/app/email/email_test.go +++ b/server/channels/app/email/email_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" ) diff --git a/server/channels/app/email/helper_test.go b/server/channels/app/email/helper_test.go index 52f97c0af7..0de6e0f709 100644 --- a/server/channels/app/email/helper_test.go +++ b/server/channels/app/email/helper_test.go @@ -9,15 +9,15 @@ import ( "path/filepath" "testing" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/app/users" "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/channels/testlib" "github.com/mattermost/mattermost-server/server/v8/config" - "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/platform/shared/templates" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) type TestHelper struct { diff --git a/server/channels/app/email/mocks/ServiceInterface.go b/server/channels/app/email/mocks/ServiceInterface.go index 8dcf51de5d..5fdb4e6a4c 100644 --- a/server/channels/app/email/mocks/ServiceInterface.go +++ b/server/channels/app/email/mocks/ServiceInterface.go @@ -7,11 +7,11 @@ package mocks import ( io "io" - i18n "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + i18n "github.com/mattermost/mattermost-server/server/public/shared/i18n" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/server/v8/model" + model "github.com/mattermost/mattermost-server/server/public/model" templates "github.com/mattermost/mattermost-server/server/v8/platform/shared/templates" diff --git a/server/channels/app/email/notification_email.go b/server/channels/app/email/notification_email.go index 5bf441be8c..6331f79153 100644 --- a/server/channels/app/email/notification_email.go +++ b/server/channels/app/email/notification_email.go @@ -10,10 +10,10 @@ import ( "path/filepath" "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/utils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type FieldRow struct { diff --git a/server/channels/app/email/notification_email_test.go b/server/channels/app/email/notification_email_test.go index f9bf6e6ae1..247d45101e 100644 --- a/server/channels/app/email/notification_email_test.go +++ b/server/channels/app/email/notification_email_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestProcessMessageAttachments(t *testing.T) { diff --git a/server/channels/app/email/service.go b/server/channels/app/email/service.go index 0ddf55f35f..8f21972fb9 100644 --- a/server/channels/app/email/service.go +++ b/server/channels/app/email/service.go @@ -12,11 +12,11 @@ import ( "github.com/throttled/throttled" "github.com/throttled/throttled/store/memstore" + "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/users" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/platform/shared/templates" ) diff --git a/server/channels/app/email_test.go b/server/channels/app/email_test.go index d0969ccd67..532b776cd4 100644 --- a/server/channels/app/email_test.go +++ b/server/channels/app/email_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestSendInviteEmailRateLimits(t *testing.T) { diff --git a/server/channels/app/emoji.go b/server/channels/app/emoji.go index 02725afe01..b5990f2bbe 100644 --- a/server/channels/app/emoji.go +++ b/server/channels/app/emoji.go @@ -22,11 +22,11 @@ import ( "github.com/disintegration/imaging" _ "golang.org/x/image/webp" + "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" "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/shared/mlog" ) const ( diff --git a/server/channels/app/enterprise.go b/server/channels/app/enterprise.go index bf7a18b05c..8befd43515 100644 --- a/server/channels/app/enterprise.go +++ b/server/channels/app/enterprise.go @@ -4,8 +4,8 @@ package app import ( - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" - ejobs "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/jobs" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" + ejobs "github.com/mattermost/mattermost-server/server/v8/einterfaces/jobs" ) var accountMigrationInterface func(*App) einterfaces.AccountMigrationInterface diff --git a/server/channels/app/enterprise_test.go b/server/channels/app/enterprise_test.go index 79ec61cc6d..b8b53d97ba 100644 --- a/server/channels/app/enterprise_test.go +++ b/server/channels/app/enterprise_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/public/model" storemocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" ) func TestSAMLSettings(t *testing.T) { diff --git a/server/channels/app/expirynotify.go b/server/channels/app/expirynotify.go index 6155815b54..17cbdec3d5 100644 --- a/server/channels/app/expirynotify.go +++ b/server/channels/app/expirynotify.go @@ -6,9 +6,9 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "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/i18n" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) const ( diff --git a/server/channels/app/expirynotify_test.go b/server/channels/app/expirynotify_test.go index 3db5d09003..bea5717190 100644 --- a/server/channels/app/expirynotify_test.go +++ b/server/channels/app/expirynotify_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestNotifySessionsExpired(t *testing.T) { diff --git a/server/channels/app/export.go b/server/channels/app/export.go index 1ba7450bb1..3c3e986df7 100644 --- a/server/channels/app/export.go +++ b/server/channels/app/export.go @@ -18,11 +18,11 @@ import ( "github.com/pkg/errors" + "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/imports" "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/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // We use this map to identify the exportable preferences. diff --git a/server/channels/app/export_converters.go b/server/channels/app/export_converters.go index 10b943caef..3caabc0ea2 100644 --- a/server/channels/app/export_converters.go +++ b/server/channels/app/export_converters.go @@ -6,8 +6,8 @@ package app import ( "strings" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/app/imports" - "github.com/mattermost/mattermost-server/server/v8/model" ) func ImportLineFromTeam(team *model.TeamForExport) *imports.LineImportData { diff --git a/server/channels/app/export_test.go b/server/channels/app/export_test.go index 5a6fa59752..d9bb25cd49 100644 --- a/server/channels/app/export_test.go +++ b/server/channels/app/export_test.go @@ -14,9 +14,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/utils" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestReactionsOfPost(t *testing.T) { diff --git a/server/channels/app/extract_plugin_tar.go b/server/channels/app/extract_plugin_tar.go index 5212e73e12..4466cffd24 100644 --- a/server/channels/app/extract_plugin_tar.go +++ b/server/channels/app/extract_plugin_tar.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) // extractTarGz takes in an io.Reader containing the bytes for a .tar.gz file and diff --git a/server/channels/app/featureflag/feature_flags_sync.go b/server/channels/app/featureflag/feature_flags_sync.go index 7d1af97a7a..b7485c09ff 100644 --- a/server/channels/app/featureflag/feature_flags_sync.go +++ b/server/channels/app/featureflag/feature_flags_sync.go @@ -13,8 +13,8 @@ import ( "github.com/splitio/go-client/v6/splitio/client" "github.com/splitio/go-client/v6/splitio/conf" - "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 SyncParams struct { diff --git a/server/channels/app/featureflag/feature_flags_sync_test.go b/server/channels/app/featureflag/feature_flags_sync_test.go index eb967d00da..d2e3976dd8 100644 --- a/server/channels/app/featureflag/feature_flags_sync_test.go +++ b/server/channels/app/featureflag/feature_flags_sync_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetStructFields(t *testing.T) { diff --git a/server/channels/app/featureflag/split_logger.go b/server/channels/app/featureflag/split_logger.go index 6a61a9a324..21098a1910 100644 --- a/server/channels/app/featureflag/split_logger.go +++ b/server/channels/app/featureflag/split_logger.go @@ -6,7 +6,7 @@ package featureflag import ( "fmt" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) type splitLogger struct { diff --git a/server/channels/app/file.go b/server/channels/app/file.go index 3d728e19ac..b35ca9880b 100644 --- a/server/channels/app/file.go +++ b/server/channels/app/file.go @@ -24,16 +24,16 @@ import ( "sync" "time" + "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/app/imaging" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" "github.com/mattermost/mattermost-server/server/v8/channels/product" "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/docextractor" "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin" "github.com/pkg/errors" ) diff --git a/server/channels/app/file_bench_test.go b/server/channels/app/file_bench_test.go index 315bc304ef..bd81760af3 100644 --- a/server/channels/app/file_bench_test.go +++ b/server/channels/app/file_bench_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) var randomJPEG []byte diff --git a/server/channels/app/file_helper.go b/server/channels/app/file_helper.go index 309867e3b6..e2e9c4af53 100644 --- a/server/channels/app/file_helper.go +++ b/server/channels/app/file_helper.go @@ -6,7 +6,7 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // removeInaccessibleContentFromFilesSlice removes content from the files beyond the cloud plan's limit diff --git a/server/channels/app/file_helper_test.go b/server/channels/app/file_helper_test.go index b1b26be527..d23afe485c 100644 --- a/server/channels/app/file_helper_test.go +++ b/server/channels/app/file_helper_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestFilterInaccessibleFiles(t *testing.T) { diff --git a/server/channels/app/file_info.go b/server/channels/app/file_info.go index 40b181afff..7ca34fc594 100644 --- a/server/channels/app/file_info.go +++ b/server/channels/app/file_info.go @@ -11,8 +11,8 @@ import ( "path/filepath" "strings" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/utils/imgutils" - "github.com/mattermost/mattermost-server/server/v8/model" ) func getInfoForBytes(name string, data io.ReadSeeker, size int) (*model.FileInfo, *model.AppError) { diff --git a/server/channels/app/file_test.go b/server/channels/app/file_test.go index 5ba9acef39..d7cfd44545 100644 --- a/server/channels/app/file_test.go +++ b/server/channels/app/file_test.go @@ -16,11 +16,11 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - eMocks "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/store" storemocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" + eMocks "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/mocks" filesStoreMocks "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore/mocks" ) diff --git a/server/channels/app/group.go b/server/channels/app/group.go index d004e4d4d9..b3474cca51 100644 --- a/server/channels/app/group.go +++ b/server/channels/app/group.go @@ -8,8 +8,8 @@ import ( "errors" "net/http" + "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 (a *App) GetGroup(id string, opts *model.GetGroupOpts, viewRestrictions *model.ViewUsersRestrictions) (*model.Group, *model.AppError) { diff --git a/server/channels/app/group_test.go b/server/channels/app/group_test.go index bf6b51eeec..eaded65970 100644 --- a/server/channels/app/group_test.go +++ b/server/channels/app/group_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetGroup(t *testing.T) { diff --git a/server/channels/app/helper_test.go b/server/channels/app/helper_test.go index e192560c43..b30b296296 100644 --- a/server/channels/app/helper_test.go +++ b/server/channels/app/helper_test.go @@ -15,16 +15,16 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "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/app/request" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" "github.com/mattermost/mattermost-server/server/v8/channels/store" "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/testlib" "github.com/mattermost/mattermost-server/server/v8/config" - "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" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" ) type TestHelper struct { diff --git a/server/channels/app/hosted_customer.go b/server/channels/app/hosted_customer.go index 8b95353e7f..a6544e3efb 100644 --- a/server/channels/app/hosted_customer.go +++ b/server/channels/app/hosted_customer.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func (a *App) NotifySelfHostedSignupProgress(progress string, userId string) { diff --git a/server/channels/app/import.go b/server/channels/app/import.go index ec00dc5325..f600f7149a 100644 --- a/server/channels/app/import.go +++ b/server/channels/app/import.go @@ -14,10 +14,10 @@ import ( "strings" "sync" + "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/imports" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type ReactionImportData = imports.ReactionImportData // part of the app interface diff --git a/server/channels/app/import_functions.go b/server/channels/app/import_functions.go index 1a3bd3eb91..66ab23bd66 100644 --- a/server/channels/app/import_functions.go +++ b/server/channels/app/import_functions.go @@ -17,14 +17,14 @@ import ( "github.com/mattermost/logr/v2" + "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/imports" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" "github.com/mattermost/mattermost-server/server/v8/channels/app/teams" "github.com/mattermost/mattermost-server/server/v8/channels/app/users" "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/shared/mlog" ) // -- Bulk Import Functions -- diff --git a/server/channels/app/import_functions_test.go b/server/channels/app/import_functions_test.go index d540783603..3764cbb697 100644 --- a/server/channels/app/import_functions_test.go +++ b/server/channels/app/import_functions_test.go @@ -14,13 +14,13 @@ 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/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/app/imports" "github.com/mattermost/mattermost-server/server/v8/channels/store" "github.com/mattermost/mattermost-server/server/v8/channels/testlib" "github.com/mattermost/mattermost-server/server/v8/channels/utils" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestImportImportScheme(t *testing.T) { diff --git a/server/channels/app/import_test.go b/server/channels/app/import_test.go index 82ef27fe6a..c6f1a1ba27 100644 --- a/server/channels/app/import_test.go +++ b/server/channels/app/import_test.go @@ -16,12 +16,12 @@ 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/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/app/imports" "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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func ptrStr(s string) *string { diff --git a/server/channels/app/imports/import_types.go b/server/channels/app/imports/import_types.go index 19e2ad90fd..608c1aaf3a 100644 --- a/server/channels/app/imports/import_types.go +++ b/server/channels/app/imports/import_types.go @@ -7,7 +7,7 @@ import ( "archive/zip" "encoding/json" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // Import Data Models diff --git a/server/channels/app/imports/import_validators.go b/server/channels/app/imports/import_validators.go index d0f98b1482..90e5154103 100644 --- a/server/channels/app/imports/import_validators.go +++ b/server/channels/app/imports/import_validators.go @@ -10,8 +10,8 @@ import ( "strings" "unicode/utf8" - "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 ValidateSchemeImportData(data *SchemeImportData) *model.AppError { diff --git a/server/channels/app/imports/import_validators_test.go b/server/channels/app/imports/import_validators_test.go index 318177e191..3b39f9c57a 100644 --- a/server/channels/app/imports/import_validators_test.go +++ b/server/channels/app/imports/import_validators_test.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/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestImportValidateSchemeImportData(t *testing.T) { diff --git a/server/channels/app/integration_action.go b/server/channels/app/integration_action.go index c82feb04d3..8d75560834 100644 --- a/server/channels/app/integration_action.go +++ b/server/channels/app/integration_action.go @@ -32,12 +32,12 @@ import ( "github.com/gorilla/mux" + "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/request" "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/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) DoPostAction(c *request.Context, postID, actionId, userID, selectedOption string) (string, *model.AppError) { diff --git a/server/channels/app/integration_action_test.go b/server/channels/app/integration_action_test.go index 1f459296a3..3972d1e94b 100644 --- a/server/channels/app/integration_action_test.go +++ b/server/channels/app/integration_action_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // Test for MM-13598 where an invalid integration URL was causing a crash @@ -548,8 +548,8 @@ func TestSubmitInteractiveDialog(t *testing.T) { "net/http" "encoding/json" - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -840,8 +840,8 @@ func TestPostActionRelativePluginURL(t *testing.T) { "net/http" "encoding/json" - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -1042,7 +1042,7 @@ func TestDoPluginRequest(t *testing.T) { "reflect" "sort" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/job.go b/server/channels/app/job.go index b3cc6697ce..41975610f5 100644 --- a/server/channels/app/job.go +++ b/server/channels/app/job.go @@ -7,8 +7,8 @@ import ( "errors" "net/http" + "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 (a *App) GetJob(id string) (*model.Job, *model.AppError) { diff --git a/server/channels/app/job_test.go b/server/channels/app/job_test.go index 1dd635f505..d85857ce49 100644 --- a/server/channels/app/job_test.go +++ b/server/channels/app/job_test.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/sqlstore" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestGetJob(t *testing.T) { diff --git a/server/channels/app/ldap.go b/server/channels/app/ldap.go index 0735baa74b..fc268dd161 100644 --- a/server/channels/app/ldap.go +++ b/server/channels/app/ldap.go @@ -8,9 +8,9 @@ import ( "mime/multipart" "net/http" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "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/i18n" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) // SyncLdap starts an LDAP sync job. diff --git a/server/channels/app/license.go b/server/channels/app/license.go index 3444f244bc..d07c00b8d3 100644 --- a/server/channels/app/license.go +++ b/server/channels/app/license.go @@ -10,9 +10,9 @@ import ( "github.com/dgrijalva/jwt-go" "github.com/pkg/errors" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/product" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/app/license_test.go b/server/channels/app/license_test.go index ea6bbcf7eb..d0f05e6acf 100644 --- a/server/channels/app/license_test.go +++ b/server/channels/app/license_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestLoadLicense(t *testing.T) { diff --git a/server/channels/app/login.go b/server/channels/app/login.go index 27a7a0caf9..0d415d12f6 100644 --- a/server/channels/app/login.go +++ b/server/channels/app/login.go @@ -16,12 +16,12 @@ import ( "github.com/avct/uasurfer" + "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/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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) const cwsTokenEnv = "CWS_CLOUD_TOKEN" diff --git a/server/channels/app/login_test.go b/server/channels/app/login_test.go index 72e596b52b..66dbb573bd 100644 --- a/server/channels/app/login_test.go +++ b/server/channels/app/login_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestCheckForClientSideCert(t *testing.T) { diff --git a/server/channels/app/migrations.go b/server/channels/app/migrations.go index 66eab5f40f..3b26dceaa1 100644 --- a/server/channels/app/migrations.go +++ b/server/channels/app/migrations.go @@ -8,8 +8,8 @@ import ( "fmt" "reflect" - "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 EmojisPermissionsMigrationKey = "EmojisPermissionsMigrationComplete" diff --git a/server/channels/app/mocks/WorkTemplateExecutor.go b/server/channels/app/mocks/WorkTemplateExecutor.go index 93fb2693c5..6fc819b9be 100644 --- a/server/channels/app/mocks/WorkTemplateExecutor.go +++ b/server/channels/app/mocks/WorkTemplateExecutor.go @@ -5,8 +5,8 @@ package mocks import ( + model "github.com/mattermost/mattermost-server/server/public/model" request "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" worktemplates "github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates" diff --git a/server/channels/app/notification.go b/server/channels/app/notification.go index 68ae82bff1..03cce2090c 100644 --- a/server/channels/app/notification.go +++ b/server/channels/app/notification.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/markdown" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "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/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/markdown" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) canSendPushNotifications() bool { diff --git a/server/channels/app/notification_email.go b/server/channels/app/notification_email.go index b540ac066c..3a75858335 100644 --- a/server/channels/app/notification_email.go +++ b/server/channels/app/notification_email.go @@ -14,12 +14,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" email "github.com/mattermost/mattermost-server/server/v8/channels/app/email" "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/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) sendNotificationEmail(c request.CTX, notification *PostNotification, user *model.User, team *model.Team, senderProfileImage []byte) error { diff --git a/server/channels/app/notification_email_test.go b/server/channels/app/notification_email_test.go index c6948f0ff5..55dea3a7e9 100644 --- a/server/channels/app/notification_email_test.go +++ b/server/channels/app/notification_email_test.go @@ -14,10 +14,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/i18n" + "github.com/mattermost/mattermost-server/server/public/shared/timezones" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/services/timezones" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func TestGetDirectMessageNotificationEmailSubject(t *testing.T) { diff --git a/server/channels/app/notification_push.go b/server/channels/app/notification_push.go index 5c188322f0..1ba3195029 100644 --- a/server/channels/app/notification_push.go +++ b/server/channels/app/notification_push.go @@ -14,11 +14,11 @@ import ( "strings" "sync" + "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/request" "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/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type notificationType string diff --git a/server/channels/app/notification_push_test.go b/server/channels/app/notification_push_test.go index b4803db659..bbffa5f8f8 100644 --- a/server/channels/app/notification_push_test.go +++ b/server/channels/app/notification_push_test.go @@ -17,14 +17,14 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "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/platform" "github.com/mattermost/mattermost-server/server/v8/channels/product" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/testlib" "github.com/mattermost/mattermost-server/server/v8/config" - "github.com/mattermost/mattermost-server/server/v8/model" fmocks "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore/mocks" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func TestDoesNotifyPropsAllowPushNotification(t *testing.T) { diff --git a/server/channels/app/notification_test.go b/server/channels/app/notification_test.go index 4dfcd3f74d..7a5eafa2f5 100644 --- a/server/channels/app/notification_test.go +++ b/server/channels/app/notification_test.go @@ -10,10 +10,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/i18n" "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/shared/i18n" ) func getLicWithSkuShortName(skuShortName string) *model.License { diff --git a/server/channels/app/notify_admin.go b/server/channels/app/notify_admin.go index 3437e392f2..8ce2f477d1 100644 --- a/server/channels/app/notify_admin.go +++ b/server/channels/app/notify_admin.go @@ -11,11 +11,11 @@ import ( "strconv" "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/request" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const lastTrialNotificationTimeStamp = "LAST_TRIAL_NOTIFICATION_TIMESTAMP" diff --git a/server/channels/app/notify_admin_test.go b/server/channels/app/notify_admin_test.go index a521b3fa05..b7503b6acc 100644 --- a/server/channels/app/notify_admin_test.go +++ b/server/channels/app/notify_admin_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - "github.com/mattermost/mattermost-server/server/v8/model" ) const PluginIdGithub = "github" diff --git a/server/channels/app/oauth.go b/server/channels/app/oauth.go index 6b3e937abb..8e0b1447f8 100644 --- a/server/channels/app/oauth.go +++ b/server/channels/app/oauth.go @@ -18,14 +18,14 @@ 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/platform" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" "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/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" ) const ( diff --git a/server/channels/app/oauth_test.go b/server/channels/app/oauth_test.go index 8e9d591373..3e4fa87910 100644 --- a/server/channels/app/oauth_test.go +++ b/server/channels/app/oauth_test.go @@ -17,11 +17,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "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/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" ) func TestGetOAuthAccessTokenForImplicitFlow(t *testing.T) { diff --git a/server/channels/app/oauthproviders/gitlab/gitlab.go b/server/channels/app/oauthproviders/gitlab/gitlab.go index 8e41124b9d..16a0190c07 100644 --- a/server/channels/app/oauthproviders/gitlab/gitlab.go +++ b/server/channels/app/oauthproviders/gitlab/gitlab.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" ) type GitLabProvider struct { diff --git a/server/channels/app/onboarding.go b/server/channels/app/onboarding.go index df4015c7e9..c3726b627a 100644 --- a/server/channels/app/onboarding.go +++ b/server/channels/app/onboarding.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" + "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" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) markAdminOnboardingComplete(c *request.Context) *model.AppError { diff --git a/server/channels/app/onboarding_test.go b/server/channels/app/onboarding_test.go index 208620f730..5c27644274 100644 --- a/server/channels/app/onboarding_test.go +++ b/server/channels/app/onboarding_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/channels/app/request" - mm_model "github.com/mattermost/mattermost-server/server/v8/model" ) func TestOnboardingSavesOrganizationName(t *testing.T) { diff --git a/server/channels/app/opengraph.go b/server/channels/app/opengraph.go index cf002e50c8..d0e7e839bb 100644 --- a/server/channels/app/opengraph.go +++ b/server/channels/app/opengraph.go @@ -12,7 +12,7 @@ import ( "github.com/dyatlov/go-opengraph/opengraph" "golang.org/x/net/html/charset" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) const ( diff --git a/server/channels/app/opentracing/opentracing_layer.go b/server/channels/app/opentracing/opentracing_layer.go index 130a740995..ec949709d6 100644 --- a/server/channels/app/opentracing/opentracing_layer.go +++ b/server/channels/app/opentracing/opentracing_layer.go @@ -18,25 +18,25 @@ import ( "reflect" "time" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/timezones" "github.com/mattermost/mattermost-server/server/v8/channels/app" "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" "github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates" "github.com/mattermost/mattermost-server/server/v8/channels/audit" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" "github.com/mattermost/mattermost-server/server/v8/channels/product" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" "github.com/mattermost/mattermost-server/server/v8/platform/services/imageproxy" "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" - "github.com/mattermost/mattermost-server/server/v8/platform/services/timezones" "github.com/mattermost/mattermost-server/server/v8/platform/services/tracing" "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin" "github.com/opentracing/opentracing-go/ext" spanlog "github.com/opentracing/opentracing-go/log" ) diff --git a/server/channels/app/options.go b/server/channels/app/options.go index 4134194bf7..4e2e916a26 100644 --- a/server/channels/app/options.go +++ b/server/channels/app/options.go @@ -4,13 +4,13 @@ package app import ( + "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/platform" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" "github.com/mattermost/mattermost-server/server/v8/channels/store" "github.com/mattermost/mattermost-server/server/v8/config" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type Option func(s *Server) error diff --git a/server/channels/app/permissions.go b/server/channels/app/permissions.go index 374e44be37..6e63231c95 100644 --- a/server/channels/app/permissions.go +++ b/server/channels/app/permissions.go @@ -13,9 +13,9 @@ import ( "github.com/pkg/errors" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" "github.com/mattermost/mattermost-server/server/v8/channels/product" - "github.com/mattermost/mattermost-server/server/v8/model" ) const permissionsExportBatchSize = 100 diff --git a/server/channels/app/permissions_migrations.go b/server/channels/app/permissions_migrations.go index 0e2e3135bc..c17c19c0af 100644 --- a/server/channels/app/permissions_migrations.go +++ b/server/channels/app/permissions_migrations.go @@ -8,9 +8,9 @@ import ( "net/http" "strings" + "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/sqlstore" - "github.com/mattermost/mattermost-server/server/v8/model" ) type permissionTransformation struct { diff --git a/server/channels/app/permissions_migrations_test.go b/server/channels/app/permissions_migrations_test.go index 6f3418157c..af16075800 100644 --- a/server/channels/app/permissions_migrations_test.go +++ b/server/channels/app/permissions_migrations_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/v8/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestApplyPermissionsMap(t *testing.T) { diff --git a/server/channels/app/permissions_test.go b/server/channels/app/permissions_test.go index 37ced9bd92..6891186f5b 100644 --- a/server/channels/app/permissions_test.go +++ b/server/channels/app/permissions_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type testWriter struct { diff --git a/server/channels/app/platform/busy.go b/server/channels/app/platform/busy.go index 7db12dc3ce..f75f151077 100644 --- a/server/channels/app/platform/busy.go +++ b/server/channels/app/platform/busy.go @@ -10,8 +10,8 @@ import ( "sync/atomic" "time" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" ) const ( diff --git a/server/channels/app/platform/busy_test.go b/server/channels/app/platform/busy_test.go index 475b8f1408..e39255e4cf 100644 --- a/server/channels/app/platform/busy_test.go +++ b/server/channels/app/platform/busy_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" ) func TestBusySet(t *testing.T) { diff --git a/server/channels/app/platform/cluster.go b/server/channels/app/platform/cluster.go index b953cd82f1..b10bf04bc9 100644 --- a/server/channels/app/platform/cluster.go +++ b/server/channels/app/platform/cluster.go @@ -8,11 +8,11 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/product" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "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/einterfaces" ) // ensure cluster service wrapper implements `product.ClusterService` diff --git a/server/channels/app/platform/cluster_discovery.go b/server/channels/app/platform/cluster_discovery.go index 200dfe734f..9c13f0d89a 100644 --- a/server/channels/app/platform/cluster_discovery.go +++ b/server/channels/app/platform/cluster_discovery.go @@ -6,8 +6,8 @@ package platform import ( "time" - "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 ( diff --git a/server/channels/app/platform/cluster_discovery_test.go b/server/channels/app/platform/cluster_discovery_test.go index d19ab0c4ad..e59d9ae3d8 100644 --- a/server/channels/app/platform/cluster_discovery_test.go +++ b/server/channels/app/platform/cluster_discovery_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestClusterDiscoveryService(t *testing.T) { diff --git a/server/channels/app/platform/cluster_handlers.go b/server/channels/app/platform/cluster_handlers.go index 690d912ab0..15cca37473 100644 --- a/server/channels/app/platform/cluster_handlers.go +++ b/server/channels/app/platform/cluster_handlers.go @@ -9,9 +9,9 @@ import ( "fmt" "runtime/debug" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" - "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" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" ) func (ps *PlatformService) RegisterClusterHandlers() { diff --git a/server/channels/app/platform/config.go b/server/channels/app/platform/config.go index 30dddabd61..00d32eb6a3 100644 --- a/server/channels/app/platform/config.go +++ b/server/channels/app/platform/config.go @@ -17,12 +17,12 @@ import ( "reflect" "strconv" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/product" "github.com/mattermost/mattermost-server/server/v8/channels/store" "github.com/mattermost/mattermost-server/server/v8/config" - "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/einterfaces" ) // ServiceConfig is used to initialize the PlatformService. diff --git a/server/channels/app/platform/config_test.go b/server/channels/app/platform/config_test.go index 777396feb6..cc874e0d94 100644 --- a/server/channels/app/platform/config_test.go +++ b/server/channels/app/platform/config_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/public/model" smocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" ) func TestConfigListener(t *testing.T) { diff --git a/server/channels/app/platform/enterprise.go b/server/channels/app/platform/enterprise.go index 19c0da9d03..ae51246cc3 100644 --- a/server/channels/app/platform/enterprise.go +++ b/server/channels/app/platform/enterprise.go @@ -4,7 +4,7 @@ package platform import ( - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" ) diff --git a/server/channels/app/platform/feature_flags.go b/server/channels/app/platform/feature_flags.go index eedee3b95c..3ed1d16ebc 100644 --- a/server/channels/app/platform/feature_flags.go +++ b/server/channels/app/platform/feature_flags.go @@ -8,8 +8,8 @@ import ( "os" "time" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/app/featureflag" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // SetupFeatureFlags called on startup and when the cluster leader changes. diff --git a/server/channels/app/platform/helper_test.go b/server/channels/app/platform/helper_test.go index e4adda7ea4..aafee0a4d3 100644 --- a/server/channels/app/platform/helper_test.go +++ b/server/channels/app/platform/helper_test.go @@ -11,12 +11,12 @@ import ( "github.com/stretchr/testify/mock" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/channels/testlib" "github.com/mattermost/mattermost-server/server/v8/config" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" ) type TestHelper struct { diff --git a/server/channels/app/platform/license.go b/server/channels/app/platform/license.go index 4531acfcc0..334f042521 100644 --- a/server/channels/app/platform/license.go +++ b/server/channels/app/platform/license.go @@ -14,11 +14,11 @@ import ( "github.com/dgrijalva/jwt-go" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/jobs" "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/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" ) const ( diff --git a/server/channels/app/platform/license_test.go b/server/channels/app/platform/license_test.go index 258c2fbe38..62e31beacd 100644 --- a/server/channels/app/platform/license_test.go +++ b/server/channels/app/platform/license_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestLoadLicense(t *testing.T) { diff --git a/server/channels/app/platform/log.go b/server/channels/app/platform/log.go index eee1b3096e..dec1f9a0e2 100644 --- a/server/channels/app/platform/log.go +++ b/server/channels/app/platform/log.go @@ -13,9 +13,9 @@ import ( "os" "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/config" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (ps *PlatformService) Log() mlog.LoggerIFace { diff --git a/server/channels/app/platform/metrics.go b/server/channels/app/platform/metrics.go index 9f753d269a..3ac551b437 100644 --- a/server/channels/app/platform/metrics.go +++ b/server/channels/app/platform/metrics.go @@ -18,9 +18,9 @@ import ( "github.com/gorilla/mux" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" - "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" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" ) const TimeToWaitForConnectionsToCloseOnServerShutdown = time.Second diff --git a/server/channels/app/platform/mocks/SuiteIFace.go b/server/channels/app/platform/mocks/SuiteIFace.go index 8d437058d1..b939366892 100644 --- a/server/channels/app/platform/mocks/SuiteIFace.go +++ b/server/channels/app/platform/mocks/SuiteIFace.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" ) diff --git a/server/channels/app/platform/options.go b/server/channels/app/platform/options.go index 656a6d7932..97d948ae68 100644 --- a/server/channels/app/platform/options.go +++ b/server/channels/app/platform/options.go @@ -8,13 +8,13 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/store" "github.com/mattermost/mattermost-server/server/v8/channels/store/localcachelayer" "github.com/mattermost/mattermost-server/server/v8/config" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type Option func(ps *PlatformService) error diff --git a/server/channels/app/platform/searchengine.go b/server/channels/app/platform/searchengine.go index 5852965ec7..0ea2a2aef3 100644 --- a/server/channels/app/platform/searchengine.go +++ b/server/channels/app/platform/searchengine.go @@ -4,8 +4,8 @@ package platform import ( - "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 (ps *PlatformService) StartSearchEngine() (string, string) { diff --git a/server/channels/app/platform/service.go b/server/channels/app/platform/service.go index 4f3635b6a8..d235531a34 100644 --- a/server/channels/app/platform/service.go +++ b/server/channels/app/platform/service.go @@ -11,8 +11,10 @@ import ( "sync" "sync/atomic" + "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/app/featureflag" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" "github.com/mattermost/mattermost-server/server/v8/channels/jobs" "github.com/mattermost/mattermost-server/server/v8/channels/store" "github.com/mattermost/mattermost-server/server/v8/channels/store/localcachelayer" @@ -21,13 +23,11 @@ import ( "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" "github.com/mattermost/mattermost-server/server/v8/channels/store/timerlayer" "github.com/mattermost/mattermost-server/server/v8/config" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/bleveengine" "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) // PlatformService is the service for the platform related tasks. It is diff --git a/server/channels/app/platform/service_test.go b/server/channels/app/platform/service_test.go index f9840c35bf..958ae742aa 100644 --- a/server/channels/app/platform/service_test.go +++ b/server/channels/app/platform/service_test.go @@ -15,10 +15,10 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" "github.com/mattermost/mattermost-server/server/v8/config" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" ) func TestReadReplicaDisabledBasedOnLicense(t *testing.T) { diff --git a/server/channels/app/platform/session.go b/server/channels/app/platform/session.go index 1b09f5c583..719f2c6c86 100644 --- a/server/channels/app/platform/session.go +++ b/server/channels/app/platform/session.go @@ -8,9 +8,9 @@ import ( "fmt" "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/store/sqlstore" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (ps *PlatformService) ReturnSessionToPool(session *model.Session) { diff --git a/server/channels/app/platform/session_test.go b/server/channels/app/platform/session_test.go index 6682fb7771..4beb82cf33 100644 --- a/server/channels/app/platform/session_test.go +++ b/server/channels/app/platform/session_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) const ( diff --git a/server/channels/app/platform/shared_channel_notifier.go b/server/channels/app/platform/shared_channel_notifier.go index b04c57a7a9..b7b38d1ad2 100644 --- a/server/channels/app/platform/shared_channel_notifier.go +++ b/server/channels/app/platform/shared_channel_notifier.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/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/services/sharedchannel" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var sharedChannelEventsForSync model.StringArray = []string{ diff --git a/server/channels/app/platform/shared_channel_notifier_test.go b/server/channels/app/platform/shared_channel_notifier_test.go index 7a4ca14c89..7130e9c557 100644 --- a/server/channels/app/platform/shared_channel_notifier_test.go +++ b/server/channels/app/platform/shared_channel_notifier_test.go @@ -9,9 +9,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/public/plugin/plugintest/mock" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestServerSyncSharedChannelHandler(t *testing.T) { diff --git a/server/channels/app/platform/shared_channel_service_iface.go b/server/channels/app/platform/shared_channel_service_iface.go index 7e00d874a1..8dc53d434d 100644 --- a/server/channels/app/platform/shared_channel_service_iface.go +++ b/server/channels/app/platform/shared_channel_service_iface.go @@ -4,7 +4,7 @@ package platform import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/sharedchannel" ) diff --git a/server/channels/app/platform/status.go b/server/channels/app/platform/status.go index eba8034838..4cb7e39b2b 100644 --- a/server/channels/app/platform/status.go +++ b/server/channels/app/platform/status.go @@ -8,9 +8,9 @@ import ( "errors" "net/http" + "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/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (ps *PlatformService) AddStatusCacheSkipClusterSend(status *model.Status) { diff --git a/server/channels/app/platform/status_test.go b/server/channels/app/platform/status_test.go index 2f341f2f0b..64736c8652 100644 --- a/server/channels/app/platform/status_test.go +++ b/server/channels/app/platform/status_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestSaveStatus(t *testing.T) { diff --git a/server/channels/app/platform/web_conn.go b/server/channels/app/platform/web_conn.go index 4925f41439..03fcb66fea 100644 --- a/server/channels/app/platform/web_conn.go +++ b/server/channels/app/platform/web_conn.go @@ -20,10 +20,10 @@ import ( "github.com/gorilla/websocket" "github.com/vmihailenco/msgpack/v5" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) const ( diff --git a/server/channels/app/platform/web_conn_test.go b/server/channels/app/platform/web_conn_test.go index d0d0b3b350..9fe76d1c19 100644 --- a/server/channels/app/platform/web_conn_test.go +++ b/server/channels/app/platform/web_conn_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type hookRunner struct { diff --git a/server/channels/app/platform/web_hub.go b/server/channels/app/platform/web_hub.go index 7193215f47..2fa25260b9 100644 --- a/server/channels/app/platform/web_hub.go +++ b/server/channels/app/platform/web_hub.go @@ -11,8 +11,8 @@ import ( "sync/atomic" "time" - "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 ( diff --git a/server/channels/app/platform/web_hub_test.go b/server/channels/app/platform/web_hub_test.go index d11b7c4fec..433cc7e359 100644 --- a/server/channels/app/platform/web_hub_test.go +++ b/server/channels/app/platform/web_hub_test.go @@ -17,11 +17,11 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" platform_mocks "github.com/mattermost/mattermost-server/server/v8/channels/app/platform/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/testlib" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func dummyWebsocketHandler(t *testing.T) http.HandlerFunc { diff --git a/server/channels/app/platform/websocket_router.go b/server/channels/app/platform/websocket_router.go index d8b0c8167a..4ff5fe2ada 100644 --- a/server/channels/app/platform/websocket_router.go +++ b/server/channels/app/platform/websocket_router.go @@ -6,9 +6,9 @@ package platform import ( "net/http" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "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/i18n" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) type webSocketHandler interface { diff --git a/server/channels/app/plugin.go b/server/channels/app/plugin.go index e6f5c2a4de..893b5ac897 100644 --- a/server/channels/app/plugin.go +++ b/server/channels/app/plugin.go @@ -20,14 +20,14 @@ import ( svg "github.com/h2non/go-is-svg" "github.com/pkg/errors" + "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/app/request" "github.com/mattermost/mattermost-server/server/v8/channels/product" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/marketplace" "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) const prepackagedPluginsDir = "prepackaged_plugins" diff --git a/server/channels/app/plugin_api.go b/server/channels/app/plugin_api.go index 71fefaa2aa..ceb32adcb3 100644 --- a/server/channels/app/plugin_api.go +++ b/server/channels/app/plugin_api.go @@ -14,10 +14,10 @@ import ( "strconv" "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/request" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type PluginAPI struct { diff --git a/server/channels/app/plugin_api_test.go b/server/channels/app/plugin_api_test.go index c70a9d4d76..c4312c6ce3 100644 --- a/server/channels/app/plugin_api_test.go +++ b/server/channels/app/plugin_api_test.go @@ -25,13 +25,13 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin/utils" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/plugin/utils" + "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" ) func getDefaultPluginSettingsSchema() string { @@ -143,7 +143,7 @@ func TestPublicFilesPathConfiguration(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { @@ -830,7 +830,7 @@ func TestPluginAPIGetPlugins(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { @@ -982,7 +982,7 @@ func TestInstallPlugin(t *testing.T) { "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type configuration struct { @@ -1498,7 +1498,7 @@ func TestInterpluginPluginHTTP(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" "bytes" "net/http" ) @@ -1539,8 +1539,8 @@ func TestInterpluginPluginHTTP(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" "bytes" "net/http" "io" @@ -1644,8 +1644,8 @@ func TestAPIMetrics(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { @@ -2044,7 +2044,7 @@ func TestRegisterCollectionAndTopic(t *testing.T) { import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { @@ -2112,8 +2112,8 @@ func TestPluginUploadsAPI(t *testing.T) { "fmt" "bytes" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type TestPlugin struct { diff --git a/server/channels/app/plugin_api_tests/manual.test_http_hijack_plugin/main.go b/server/channels/app/plugin_api_tests/manual.test_http_hijack_plugin/main.go index 4d9a744d13..d15bbcea65 100644 --- a/server/channels/app/plugin_api_tests/manual.test_http_hijack_plugin/main.go +++ b/server/channels/app/plugin_api_tests/manual.test_http_hijack_plugin/main.go @@ -6,7 +6,7 @@ package main import ( "net/http" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type Plugin struct { diff --git a/server/channels/app/plugin_api_tests/manual.test_http_upgrade_websocket_plugin/main.go b/server/channels/app/plugin_api_tests/manual.test_http_upgrade_websocket_plugin/main.go index 2d301d192b..6c5add3563 100644 --- a/server/channels/app/plugin_api_tests/manual.test_http_upgrade_websocket_plugin/main.go +++ b/server/channels/app/plugin_api_tests/manual.test_http_upgrade_websocket_plugin/main.go @@ -9,8 +9,8 @@ import ( "github.com/gorilla/websocket" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type Plugin struct { diff --git a/server/channels/app/plugin_api_tests/manual.test_load_configuration_defaults_plugin/main.go b/server/channels/app/plugin_api_tests/manual.test_load_configuration_defaults_plugin/main.go index 03d9b4376a..8c0dab4772 100644 --- a/server/channels/app/plugin_api_tests/manual.test_load_configuration_defaults_plugin/main.go +++ b/server/channels/app/plugin_api_tests/manual.test_load_configuration_defaults_plugin/main.go @@ -4,9 +4,9 @@ package main import ( + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type configuration struct { diff --git a/server/channels/app/plugin_api_tests/manual.test_load_configuration_plugin/main.go b/server/channels/app/plugin_api_tests/manual.test_load_configuration_plugin/main.go index 287f526240..f64f02727d 100644 --- a/server/channels/app/plugin_api_tests/manual.test_load_configuration_plugin/main.go +++ b/server/channels/app/plugin_api_tests/manual.test_load_configuration_plugin/main.go @@ -6,9 +6,9 @@ package main import ( "fmt" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type configuration struct { diff --git a/server/channels/app/plugin_api_tests/test_bots_plugin/main.go b/server/channels/app/plugin_api_tests/test_bots_plugin/main.go index 4b1660efad..0c9f735638 100644 --- a/server/channels/app/plugin_api_tests/test_bots_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_bots_plugin/main.go @@ -4,9 +4,9 @@ package main import ( + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_call_log_api_plugin/main.go b/server/channels/app/plugin_api_tests/test_call_log_api_plugin/main.go index fbe4c004b8..7bd3a17a5c 100644 --- a/server/channels/app/plugin_api_tests/test_call_log_api_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_call_log_api_plugin/main.go @@ -6,8 +6,8 @@ package main import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type PluginUsingLogAPI struct { diff --git a/server/channels/app/plugin_api_tests/test_db_driver/main.go b/server/channels/app/plugin_api_tests/test_db_driver/main.go index 010a906978..4c940a4ebd 100644 --- a/server/channels/app/plugin_api_tests/test_db_driver/main.go +++ b/server/channels/app/plugin_api_tests/test_db_driver/main.go @@ -7,12 +7,12 @@ import ( "database/sql" "testing" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/shared/driver" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_get_bundle_path_plugin/main.go b/server/channels/app/plugin_api_tests/test_get_bundle_path_plugin/main.go index 3a9aed3369..73cfd2b8ee 100644 --- a/server/channels/app/plugin_api_tests/test_get_bundle_path_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_get_bundle_path_plugin/main.go @@ -7,9 +7,9 @@ import ( "fmt" "path/filepath" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go b/server/channels/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go index 04574a56c8..ebd8996d39 100644 --- a/server/channels/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go @@ -4,9 +4,9 @@ package main import ( + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_get_direct_channel_plugin/main.go b/server/channels/app/plugin_api_tests/test_get_direct_channel_plugin/main.go index cd2c7b402c..7d2038d67c 100644 --- a/server/channels/app/plugin_api_tests/test_get_direct_channel_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_get_direct_channel_plugin/main.go @@ -4,9 +4,9 @@ package main import ( + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_get_plugin_status_plugin/main.go b/server/channels/app/plugin_api_tests/test_get_plugin_status_plugin/main.go index b4c8857345..1d824b6b9f 100644 --- a/server/channels/app/plugin_api_tests/test_get_plugin_status_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_get_plugin_status_plugin/main.go @@ -4,9 +4,9 @@ package main import ( + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_get_profile_image_plugin/main.go b/server/channels/app/plugin_api_tests/test_get_profile_image_plugin/main.go index 95aad7da56..52eea5fa0d 100644 --- a/server/channels/app/plugin_api_tests/test_get_profile_image_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_get_profile_image_plugin/main.go @@ -4,9 +4,9 @@ package main import ( + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_kv/main.go b/server/channels/app/plugin_api_tests/test_kv/main.go index 0d9cf00fed..b8d991878c 100644 --- a/server/channels/app/plugin_api_tests/test_kv/main.go +++ b/server/channels/app/plugin_api_tests/test_kv/main.go @@ -7,9 +7,9 @@ import ( "bytes" "fmt" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_member_channels_plugin/main.go b/server/channels/app/plugin_api_tests/test_member_channels_plugin/main.go index 901be0098b..920ec4c6c2 100644 --- a/server/channels/app/plugin_api_tests/test_member_channels_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_member_channels_plugin/main.go @@ -4,9 +4,9 @@ package main import ( + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_members_plugin/main.go b/server/channels/app/plugin_api_tests/test_members_plugin/main.go index 2f34426b35..cd1ebadb96 100644 --- a/server/channels/app/plugin_api_tests/test_members_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_members_plugin/main.go @@ -4,9 +4,9 @@ package main import ( + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_search_channels_plugin/main.go b/server/channels/app/plugin_api_tests/test_search_channels_plugin/main.go index f37e59700a..196db502e8 100644 --- a/server/channels/app/plugin_api_tests/test_search_channels_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_search_channels_plugin/main.go @@ -4,9 +4,9 @@ package main import ( + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go b/server/channels/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go index fa9a252f99..51794ae854 100644 --- a/server/channels/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go @@ -6,9 +6,9 @@ package main import ( "fmt" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_search_teams_plugin/main.go b/server/channels/app/plugin_api_tests/test_search_teams_plugin/main.go index 225af48903..8a42f2be29 100644 --- a/server/channels/app/plugin_api_tests/test_search_teams_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_search_teams_plugin/main.go @@ -6,9 +6,9 @@ package main import ( "fmt" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_send_mail_plugin/main.go b/server/channels/app/plugin_api_tests/test_send_mail_plugin/main.go index 5b2d0e551e..62f788248c 100644 --- a/server/channels/app/plugin_api_tests/test_send_mail_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_send_mail_plugin/main.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_sessions_plugin/main.go b/server/channels/app/plugin_api_tests/test_sessions_plugin/main.go index 2a3fd4bf76..4a4e870434 100644 --- a/server/channels/app/plugin_api_tests/test_sessions_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_sessions_plugin/main.go @@ -7,9 +7,9 @@ import ( "fmt" "time" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_set_profile_image_plugin/main.go b/server/channels/app/plugin_api_tests/test_set_profile_image_plugin/main.go index 0980ee2bfa..90e9a859b7 100644 --- a/server/channels/app/plugin_api_tests/test_set_profile_image_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_set_profile_image_plugin/main.go @@ -10,9 +10,9 @@ import ( "image/color" "image/png" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_update_user_active_plugin/main.go b/server/channels/app/plugin_api_tests/test_update_user_active_plugin/main.go index 1ada1da272..7ef20df348 100644 --- a/server/channels/app/plugin_api_tests/test_update_user_active_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_update_user_active_plugin/main.go @@ -4,9 +4,9 @@ package main import ( + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_api_tests/test_update_user_status_plugin/main.go b/server/channels/app/plugin_api_tests/test_update_user_status_plugin/main.go index dceee1f502..07146cbb76 100644 --- a/server/channels/app/plugin_api_tests/test_update_user_status_plugin/main.go +++ b/server/channels/app/plugin_api_tests/test_update_user_status_plugin/main.go @@ -6,9 +6,9 @@ package main import ( "fmt" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/channels/app/plugin_api_tests" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_commands.go b/server/channels/app/plugin_commands.go index fb47b6373d..fa817f7140 100644 --- a/server/channels/app/plugin_commands.go +++ b/server/channels/app/plugin_commands.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" + "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" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type PluginCommand struct { diff --git a/server/channels/app/plugin_commands_test.go b/server/channels/app/plugin_commands_test.go index 3c70fb718a..0049af38ab 100644 --- a/server/channels/app/plugin_commands_test.go +++ b/server/channels/app/plugin_commands_test.go @@ -10,11 +10,11 @@ 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/plugin" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" "github.com/mattermost/mattermost-server/server/v8/channels/product" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) func TestPluginCommand(t *testing.T) { @@ -43,8 +43,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type configuration struct { @@ -124,8 +124,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type configuration struct { @@ -231,8 +231,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type configuration struct { @@ -296,8 +296,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -341,8 +341,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -392,8 +392,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type configuration struct { @@ -548,8 +548,8 @@ func TestProductCommands(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type configuration struct { diff --git a/server/channels/app/plugin_db_driver.go b/server/channels/app/plugin_db_driver.go index d13a7df35d..e060ab20d2 100644 --- a/server/channels/app/plugin_db_driver.go +++ b/server/channels/app/plugin_db_driver.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" ) // DriverImpl implements the plugin.Driver interface on the server-side. diff --git a/server/channels/app/plugin_deadlock_test.go b/server/channels/app/plugin_deadlock_test.go index 227f72c57e..e6dbd82b38 100644 --- a/server/channels/app/plugin_deadlock_test.go +++ b/server/channels/app/plugin_deadlock_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestPluginDeadlock(t *testing.T) { @@ -24,8 +24,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -112,8 +112,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -147,8 +147,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -218,8 +218,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_event.go b/server/channels/app/plugin_event.go index 3391a792aa..41ec282512 100644 --- a/server/channels/app/plugin_event.go +++ b/server/channels/app/plugin_event.go @@ -6,7 +6,7 @@ package app import ( "encoding/json" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func (ch *Channels) notifyClusterPluginEvent(event model.ClusterEvent, data model.PluginEventData) { diff --git a/server/channels/app/plugin_health_check_test.go b/server/channels/app/plugin_health_check_test.go index 73e0c31f21..1ec801890e 100644 --- a/server/channels/app/plugin_health_check_test.go +++ b/server/channels/app/plugin_health_check_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" ) func TestHealthCheckJob(t *testing.T) { @@ -21,8 +21,8 @@ func TestHealthCheckJob(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_hooks_test.go b/server/channels/app/plugin_hooks_test.go index 192dc2e9b1..25542a3f79 100644 --- a/server/channels/app/plugin_hooks_test.go +++ b/server/channels/app/plugin_hooks_test.go @@ -19,12 +19,12 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin/plugintest" + "github.com/mattermost/mattermost-server/server/public/plugin/utils" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest" - "github.com/mattermost/mattermost-server/server/v8/plugin/utils" + "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" ) func SetAppEnvironmentWithPlugins(t *testing.T, pluginCode []string, app *App, apiFunc func(*model.Manifest) plugin.API) (func(), []string, []error) { @@ -72,8 +72,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -112,8 +112,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -153,8 +153,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -196,8 +196,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -240,8 +240,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -262,8 +262,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -308,8 +308,8 @@ func TestHookMessageHasBeenPosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -346,8 +346,8 @@ func TestHookMessageWillBeUpdated(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -394,8 +394,8 @@ func TestHookMessageHasBeenUpdated(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -442,8 +442,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { import ( "io" - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -487,8 +487,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { import ( "fmt" "io" - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -536,8 +536,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { import ( "io" - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -593,8 +593,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { "io" "fmt" "bytes" - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -661,8 +661,8 @@ func TestUserWillLogIn_Blocked(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -700,8 +700,8 @@ func TestUserWillLogInIn_Passed(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -740,8 +740,8 @@ func TestUserHasLoggedIn(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -782,8 +782,8 @@ func TestUserHasBeenCreated(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -831,7 +831,7 @@ func TestErrorString(t *testing.T) { import ( "errors" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { @@ -860,8 +860,8 @@ func TestErrorString(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -913,8 +913,8 @@ func TestHookContext(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -956,8 +956,8 @@ func TestActiveHooks(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { @@ -1042,8 +1042,8 @@ func TestHookMetrics(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { @@ -1129,8 +1129,8 @@ func TestHookReactionHasBeenAdded(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -1171,8 +1171,8 @@ func TestHookReactionHasBeenRemoved(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -1211,7 +1211,7 @@ func TestHookRunDataRetention(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { @@ -1255,7 +1255,7 @@ func TestHookOnSendDailyTelemetry(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { @@ -1298,8 +1298,8 @@ func TestHookOnCloudLimitsUpdated(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_install.go b/server/channels/app/plugin_install.go index c31c727ae5..8c85264cab 100644 --- a/server/channels/app/plugin_install.go +++ b/server/channels/app/plugin_install.go @@ -45,11 +45,11 @@ import ( "github.com/blang/semver" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/model/utils" + "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/public/utils" "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) // managedPluginFileName is the file name of the flag file that marks diff --git a/server/channels/app/plugin_install_test.go b/server/channels/app/plugin_install_test.go index 0b2b912ff3..90d4c2b145 100644 --- a/server/channels/app/plugin_install_test.go +++ b/server/channels/app/plugin_install_test.go @@ -17,8 +17,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/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" ) type nilReadSeeker struct { diff --git a/server/channels/app/plugin_key_value_store.go b/server/channels/app/plugin_key_value_store.go index a10d3fc3fb..71c431b6d4 100644 --- a/server/channels/app/plugin_key_value_store.go +++ b/server/channels/app/plugin_key_value_store.go @@ -9,9 +9,9 @@ import ( "errors" "net/http" + "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/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func getKeyHash(key string) string { diff --git a/server/channels/app/plugin_requests.go b/server/channels/app/plugin_requests.go index 4db8b9b425..c573565bba 100644 --- a/server/channels/app/plugin_requests.go +++ b/server/channels/app/plugin_requests.go @@ -13,10 +13,10 @@ import ( "github.com/gorilla/mux" + "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/utils" - "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" ) func (ch *Channels) ServePluginRequest(w http.ResponseWriter, r *http.Request) { diff --git a/server/channels/app/plugin_requests_test.go b/server/channels/app/plugin_requests_test.go index cc869a72a2..4f27a78759 100644 --- a/server/channels/app/plugin_requests_test.go +++ b/server/channels/app/plugin_requests_test.go @@ -15,8 +15,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/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestServePluginPublicRequest(t *testing.T) { diff --git a/server/channels/app/plugin_shutdown_test.go b/server/channels/app/plugin_shutdown_test.go index 193c2b9d1c..34077911ac 100644 --- a/server/channels/app/plugin_shutdown_test.go +++ b/server/channels/app/plugin_shutdown_test.go @@ -24,7 +24,7 @@ func TestPluginShutdownTest(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { @@ -39,7 +39,7 @@ func TestPluginShutdownTest(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_signature.go b/server/channels/app/plugin_signature.go index ed9a126105..e218bad79e 100644 --- a/server/channels/app/plugin_signature.go +++ b/server/channels/app/plugin_signature.go @@ -13,9 +13,9 @@ import ( "golang.org/x/crypto/openpgp" //nolint:staticcheck "golang.org/x/crypto/openpgp/armor" //nolint:staticcheck + "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/utils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // GetPublicKey will return the actual public key saved in the `name` file. diff --git a/server/channels/app/plugin_signature_test.go b/server/channels/app/plugin_signature_test.go index 10db749b03..d016a6a823 100644 --- a/server/channels/app/plugin_signature_test.go +++ b/server/channels/app/plugin_signature_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestPluginPublicKeys(t *testing.T) { diff --git a/server/channels/app/plugin_statuses.go b/server/channels/app/plugin_statuses.go index e3493199ba..2405812a14 100644 --- a/server/channels/app/plugin_statuses.go +++ b/server/channels/app/plugin_statuses.go @@ -6,7 +6,7 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // GetPluginStatus returns the status for a plugin installed on this server. diff --git a/server/channels/app/plugin_test.go b/server/channels/app/plugin_test.go index 0df3f4d6ab..eddd57ca4c 100644 --- a/server/channels/app/plugin_test.go +++ b/server/channels/app/plugin_test.go @@ -20,12 +20,12 @@ 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/plugin" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" "github.com/mattermost/mattermost-server/server/v8/channels/testlib" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" - "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" ) func getHashedKey(key string) string { @@ -729,8 +729,8 @@ func TestPluginPanicLogs(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -778,7 +778,7 @@ func TestPluginStatusActivateError(t *testing.T) { import ( "errors" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/post.go b/server/channels/app/post.go index f309209ed6..2548832529 100644 --- a/server/channels/app/post.go +++ b/server/channels/app/post.go @@ -15,15 +15,15 @@ import ( "sync" "time" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "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/request" "github.com/mattermost/mattermost-server/server/v8/channels/product" "github.com/mattermost/mattermost-server/server/v8/channels/store" "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) const ( diff --git a/server/channels/app/post_acknowledgements.go b/server/channels/app/post_acknowledgements.go index 259dea4f90..51c50e6e77 100644 --- a/server/channels/app/post_acknowledgements.go +++ b/server/channels/app/post_acknowledgements.go @@ -8,10 +8,10 @@ import ( "errors" "net/http" + "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" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) SaveAcknowledgementForPost(c *request.Context, postID, userID string) (*model.PostAcknowledgement, *model.AppError) { diff --git a/server/channels/app/post_acknowledgements_test.go b/server/channels/app/post_acknowledgements_test.go index aa54200dcb..b7b6ac034e 100644 --- a/server/channels/app/post_acknowledgements_test.go +++ b/server/channels/app/post_acknowledgements_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestPostAcknowledgementsApp(t *testing.T) { diff --git a/server/channels/app/post_helpers.go b/server/channels/app/post_helpers.go index 625cfe458b..17e7447722 100644 --- a/server/channels/app/post_helpers.go +++ b/server/channels/app/post_helpers.go @@ -7,7 +7,7 @@ import ( "net/http" "sort" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type filterPostOptions struct { diff --git a/server/channels/app/post_helpers_test.go b/server/channels/app/post_helpers_test.go index 8bcbbdcc84..a3d1726d55 100644 --- a/server/channels/app/post_helpers_test.go +++ b/server/channels/app/post_helpers_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetTimeSortedPostAccessibleBounds(t *testing.T) { diff --git a/server/channels/app/post_metadata.go b/server/channels/app/post_metadata.go index 33b50e00ff..9addf12b70 100644 --- a/server/channels/app/post_metadata.go +++ b/server/channels/app/post_metadata.go @@ -19,12 +19,12 @@ import ( "github.com/dyatlov/go-opengraph/opengraph" "golang.org/x/net/idna" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/shared/markdown" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" "github.com/mattermost/mattermost-server/server/v8/channels/utils/imgutils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/markdown" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type linkMetadataCache struct { diff --git a/server/channels/app/post_metadata_test.go b/server/channels/app/post_metadata_test.go index caaa423818..43921ab03a 100644 --- a/server/channels/app/post_metadata_test.go +++ b/server/channels/app/post_metadata_test.go @@ -27,9 +27,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/app/platform" "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" "github.com/mattermost/mattermost-server/server/v8/platform/services/imageproxy" ) diff --git a/server/channels/app/post_priority.go b/server/channels/app/post_priority.go index cc0a74f490..99ddf69e2f 100644 --- a/server/channels/app/post_priority.go +++ b/server/channels/app/post_priority.go @@ -7,7 +7,7 @@ import ( "database/sql" "net/http" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func (a *App) GetPriorityForPost(postId string) (*model.PostPriority, *model.AppError) { diff --git a/server/channels/app/post_test.go b/server/channels/app/post_test.go index a9dd68dcd5..cbcce306c3 100644 --- a/server/channels/app/post_test.go +++ b/server/channels/app/post_test.go @@ -17,17 +17,17 @@ 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/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" - eMocks "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/store" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" storemocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/testlib" - "github.com/mattermost/mattermost-server/server/v8/model" + eMocks "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" "github.com/mattermost/mattermost-server/server/v8/platform/services/imageproxy" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/mocks" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestCreatePostDeduplicate(t *testing.T) { @@ -61,8 +61,8 @@ func TestCreatePostDeduplicate(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { @@ -110,8 +110,8 @@ func TestCreatePostDeduplicate(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" "time" ) diff --git a/server/channels/app/preference.go b/server/channels/app/preference.go index 4fdf19cb66..b3a5652284 100644 --- a/server/channels/app/preference.go +++ b/server/channels/app/preference.go @@ -8,8 +8,8 @@ import ( "errors" "net/http" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/product" - "github.com/mattermost/mattermost-server/server/v8/model" ) // Ensure preferences service wrapper implements `product.PreferencesService` diff --git a/server/channels/app/product.go b/server/channels/app/product.go index bcffb6b504..7183e38d3a 100644 --- a/server/channels/app/product.go +++ b/server/channels/app/product.go @@ -9,8 +9,8 @@ import ( "os" "strings" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/product" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (s *Server) initializeProducts( diff --git a/server/channels/app/product_notices.go b/server/channels/app/product_notices.go index 1d4f47aa07..6178e7da70 100644 --- a/server/channels/app/product_notices.go +++ b/server/channels/app/product_notices.go @@ -15,12 +15,12 @@ import ( "github.com/pkg/errors" date_constraints "github.com/reflog/dateconstraints" + "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" "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/config" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const MaxRepeatViewings = 3 diff --git a/server/channels/app/product_notices_test.go b/server/channels/app/product_notices_test.go index 50959cc902..bf42d13a04 100644 --- a/server/channels/app/product_notices_test.go +++ b/server/channels/app/product_notices_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestNoticeValidation(t *testing.T) { diff --git a/server/channels/app/ratelimit.go b/server/channels/app/ratelimit.go index 49c34930ba..f050be89ed 100644 --- a/server/channels/app/ratelimit.go +++ b/server/channels/app/ratelimit.go @@ -13,10 +13,10 @@ import ( "github.com/throttled/throttled" "github.com/throttled/throttled/store/memstore" + "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/utils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type RateLimiter struct { diff --git a/server/channels/app/ratelimit_test.go b/server/channels/app/ratelimit_test.go index d976816e45..7e3b45e29e 100644 --- a/server/channels/app/ratelimit_test.go +++ b/server/channels/app/ratelimit_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func genRateLimitSettings(useAuth, useIP bool, header string) *model.RateLimitSettings { diff --git a/server/channels/app/reaction.go b/server/channels/app/reaction.go index 6242b30b4d..289d6fde66 100644 --- a/server/channels/app/reaction.go +++ b/server/channels/app/reaction.go @@ -8,10 +8,10 @@ import ( "errors" "net/http" + "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/app/request" - "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" ) func (a *App) SaveReactionForPost(c *request.Context, reaction *model.Reaction) (*model.Reaction, *model.AppError) { diff --git a/server/channels/app/reaction_test.go b/server/channels/app/reaction_test.go index 1d75d91003..bd17ee03c0 100644 --- a/server/channels/app/reaction_test.go +++ b/server/channels/app/reaction_test.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/testlib" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestSharedChannelSyncForReactionActions(t *testing.T) { diff --git a/server/channels/app/remote_cluster.go b/server/channels/app/remote_cluster.go index 6c6c67dc93..50a5a57e41 100644 --- a/server/channels/app/remote_cluster.go +++ b/server/channels/app/remote_cluster.go @@ -11,7 +11,7 @@ import ( "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func (a *App) AddRemoteCluster(rc *model.RemoteCluster) (*model.RemoteCluster, *model.AppError) { diff --git a/server/channels/app/remote_cluster_service_mock.go b/server/channels/app/remote_cluster_service_mock.go index 69fee0fd62..aade20cba7 100644 --- a/server/channels/app/remote_cluster_service_mock.go +++ b/server/channels/app/remote_cluster_service_mock.go @@ -6,7 +6,7 @@ package app import ( "context" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" ) diff --git a/server/channels/app/remote_cluster_test.go b/server/channels/app/remote_cluster_test.go index 508220ac40..b18af6cc26 100644 --- a/server/channels/app/remote_cluster_test.go +++ b/server/channels/app/remote_cluster_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" ) func TestAddRemoteCluster(t *testing.T) { diff --git a/server/channels/app/request/context.go b/server/channels/app/request/context.go index df3809ffe4..2555528292 100644 --- a/server/channels/app/request/context.go +++ b/server/channels/app/request/context.go @@ -6,9 +6,9 @@ package request import ( "context" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "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/i18n" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) type Context struct { diff --git a/server/channels/app/role.go b/server/channels/app/role.go index ca8a159eb7..aad5a692bf 100644 --- a/server/channels/app/role.go +++ b/server/channels/app/role.go @@ -11,9 +11,9 @@ import ( "reflect" "strings" + "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 (a *App) GetRole(id string) (*model.Role, *model.AppError) { diff --git a/server/channels/app/role_test.go b/server/channels/app/role_test.go index c9db5a8c27..a776020c72 100644 --- a/server/channels/app/role_test.go +++ b/server/channels/app/role_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/utils" - "github.com/mattermost/mattermost-server/server/v8/model" ) type permissionInheritanceTestData struct { diff --git a/server/channels/app/saml.go b/server/channels/app/saml.go index 09cd1b0e12..b8ed9830d8 100644 --- a/server/channels/app/saml.go +++ b/server/channels/app/saml.go @@ -13,7 +13,7 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) const ( diff --git a/server/channels/app/scheme.go b/server/channels/app/scheme.go index abe442195e..0e8cc6c68a 100644 --- a/server/channels/app/scheme.go +++ b/server/channels/app/scheme.go @@ -7,8 +7,8 @@ import ( "errors" "net/http" + "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 (a *App) GetScheme(id string) (*model.Scheme, *model.AppError) { diff --git a/server/channels/app/searchengine.go b/server/channels/app/searchengine.go index fb9539cb1a..c6b4b22a46 100644 --- a/server/channels/app/searchengine.go +++ b/server/channels/app/searchengine.go @@ -6,7 +6,7 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" ) diff --git a/server/channels/app/security_update_check.go b/server/channels/app/security_update_check.go index edd31cf48b..fd90333743 100644 --- a/server/channels/app/security_update_check.go +++ b/server/channels/app/security_update_check.go @@ -11,10 +11,10 @@ import ( "runtime" "strconv" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "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/platform/shared/mail" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/app/server.go b/server/channels/app/server.go index ddfebd63c4..8a540af3d6 100644 --- a/server/channels/app/server.go +++ b/server/channels/app/server.go @@ -27,13 +27,16 @@ import ( "github.com/rs/cors" "golang.org/x/crypto/acme/autocert" + "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/public/shared/timezones" "github.com/mattermost/mattermost-server/server/v8/channels/app/email" "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" "github.com/mattermost/mattermost-server/server/v8/channels/app/teams" "github.com/mattermost/mattermost-server/server/v8/channels/app/users" "github.com/mattermost/mattermost-server/server/v8/channels/audit" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" "github.com/mattermost/mattermost-server/server/v8/channels/jobs" "github.com/mattermost/mattermost-server/server/v8/channels/jobs/active_users" "github.com/mattermost/mattermost-server/server/v8/channels/jobs/expirynotify" @@ -54,7 +57,7 @@ import ( "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/config" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" "github.com/mattermost/mattermost-server/server/v8/platform/services/awsmeter" "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" @@ -63,13 +66,10 @@ import ( "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/bleveengine/indexer" "github.com/mattermost/mattermost-server/server/v8/platform/services/sharedchannel" "github.com/mattermost/mattermost-server/server/v8/platform/services/telemetry" - "github.com/mattermost/mattermost-server/server/v8/platform/services/timezones" "github.com/mattermost/mattermost-server/server/v8/platform/services/tracing" "github.com/mattermost/mattermost-server/server/v8/platform/services/upgrader" "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/platform/shared/templates" ) diff --git a/server/channels/app/server_test.go b/server/channels/app/server_test.go index 5403c82ffe..3391dee0d2 100644 --- a/server/channels/app/server_test.go +++ b/server/channels/app/server_test.go @@ -24,12 +24,12 @@ 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/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" "github.com/mattermost/mattermost-server/server/v8/config" - "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/mlog" ) func newServer(t *testing.T) (*Server, error) { diff --git a/server/channels/app/session.go b/server/channels/app/session.go index 4fd1bfeffc..69b2ccacd3 100644 --- a/server/channels/app/session.go +++ b/server/channels/app/session.go @@ -10,12 +10,12 @@ import ( "net/http" "os" + "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/platform" "github.com/mattermost/mattermost-server/server/v8/channels/app/users" "github.com/mattermost/mattermost-server/server/v8/channels/audit" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (a *App) CreateSession(session *model.Session) (*model.Session, *model.AppError) { diff --git a/server/channels/app/session_test.go b/server/channels/app/session_test.go index a4af3e93e4..e6cf6a6f6c 100644 --- a/server/channels/app/session_test.go +++ b/server/channels/app/session_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetSessionIdleTimeoutInMinutes(t *testing.T) { diff --git a/server/channels/app/shared_channel.go b/server/channels/app/shared_channel.go index 82ccb7a624..ecf4f77a30 100644 --- a/server/channels/app/shared_channel.go +++ b/server/channels/app/shared_channel.go @@ -8,9 +8,9 @@ import ( "fmt" "net/http" + "github.com/mattermost/mattermost-server/server/public/model" "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/model" ) func (a *App) checkChannelNotShared(c request.CTX, channelId string) error { diff --git a/server/channels/app/shared_channel_service_iface.go b/server/channels/app/shared_channel_service_iface.go index c599b5f11d..aab7998bda 100644 --- a/server/channels/app/shared_channel_service_iface.go +++ b/server/channels/app/shared_channel_service_iface.go @@ -5,7 +5,7 @@ package app // TODO: platform: remove this and use from platform package import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/sharedchannel" ) diff --git a/server/channels/app/shared_channel_test.go b/server/channels/app/shared_channel_test.go index 44175c0f44..f012d65b48 100644 --- a/server/channels/app/shared_channel_test.go +++ b/server/channels/app/shared_channel_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestApp_CheckCanInviteToSharedChannel(t *testing.T) { diff --git a/server/channels/app/slack.go b/server/channels/app/slack.go index 76e3dc96dd..88b99ee466 100644 --- a/server/channels/app/slack.go +++ b/server/channels/app/slack.go @@ -13,9 +13,9 @@ import ( "strings" "time" + "github.com/mattermost/mattermost-server/server/public/model" "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/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/slackimport" ) diff --git a/server/channels/app/slack_test.go b/server/channels/app/slack_test.go index 21f968281e..2d06fb0287 100644 --- a/server/channels/app/slack_test.go +++ b/server/channels/app/slack_test.go @@ -6,7 +6,7 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestProcessSlackText(t *testing.T) { diff --git a/server/channels/app/slashcommands/auto_channels.go b/server/channels/app/slashcommands/auto_channels.go index 073f281221..a7ce762db9 100644 --- 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/server/v8/model" ) type AutoChannelCreator struct { diff --git a/server/channels/app/slashcommands/auto_constants.go b/server/channels/app/slashcommands/auto_constants.go index 880e06eee6..420076ed27 100644 --- 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/server/v8/model" ) const ( diff --git a/server/channels/app/slashcommands/auto_environment.go b/server/channels/app/slashcommands/auto_environment.go index f3e7d50957..1321dbb0a2 100644 --- a/server/channels/app/slashcommands/auto_environment.go +++ b/server/channels/app/slashcommands/auto_environment.go @@ -7,10 +7,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/server/v8/model" ) type TestEnvironment struct { diff --git a/server/channels/app/slashcommands/auto_posts.go b/server/channels/app/slashcommands/auto_posts.go index e375f97403..db5de0223c 100644 --- 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/server/v8/model" ) type AutoPostCreator struct { diff --git a/server/channels/app/slashcommands/auto_teams.go b/server/channels/app/slashcommands/auto_teams.go index 30cd1ef97b..aa6930e423 100644 --- a/server/channels/app/slashcommands/auto_teams.go +++ b/server/channels/app/slashcommands/auto_teams.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/server/v8/model" ) type TeamEnvironment struct { diff --git a/server/channels/app/slashcommands/auto_users.go b/server/channels/app/slashcommands/auto_users.go index ed2125da79..af7e50ae58 100644 --- a/server/channels/app/slashcommands/auto_users.go +++ b/server/channels/app/slashcommands/auto_users.go @@ -7,11 +7,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/server/v8/model" ) type AutoUserCreator struct { diff --git a/server/channels/app/slashcommands/command_away.go b/server/channels/app/slashcommands/command_away.go index bc64e53461..163266b2b8 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type AwayProvider struct { diff --git a/server/channels/app/slashcommands/command_channel_header.go b/server/channels/app/slashcommands/command_channel_header.go index 5f8bad0dd5..f122c9de85 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type HeaderProvider struct { diff --git a/server/channels/app/slashcommands/command_channel_header_test.go b/server/channels/app/slashcommands/command_channel_header_test.go index 7f48a978b4..0d9f3915bc 100644 --- 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/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestHeaderProviderDoCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_channel_purpose.go b/server/channels/app/slashcommands/command_channel_purpose.go index 1477142ae0..01af2f0713 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type PurposeProvider struct { diff --git a/server/channels/app/slashcommands/command_channel_purpose_test.go b/server/channels/app/slashcommands/command_channel_purpose_test.go index 5663690cac..d4cb61901c 100644 --- 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/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestPurposeProviderDoCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_channel_rename.go b/server/channels/app/slashcommands/command_channel_rename.go index 6cf8b1a139..d85d5508e8 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type RenameProvider struct { diff --git a/server/channels/app/slashcommands/command_channel_rename_test.go b/server/channels/app/slashcommands/command_channel_rename_test.go index 4530e6d917..f755cea62a 100644 --- 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/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestRenameProviderDoCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_code.go b/server/channels/app/slashcommands/command_code.go index bb57353e94..5b77577e4b 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type CodeProvider struct { diff --git a/server/channels/app/slashcommands/command_code_test.go b/server/channels/app/slashcommands/command_code_test.go index cdc0bc6d68..b45ca22408 100644 --- 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/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestCodeProviderDoCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_custom_status.go b/server/channels/app/slashcommands/command_custom_status.go index c7a60acd2a..7daaad4f02 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type CustomStatusProvider struct { diff --git a/server/channels/app/slashcommands/command_custom_status_test.go b/server/channels/app/slashcommands/command_custom_status_test.go index 359b8c11c9..a72ca28752 100644 --- 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/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetCustomStatus(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_dnd.go b/server/channels/app/slashcommands/command_dnd.go index f028f3eb22..95c76baeeb 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type DndProvider struct { diff --git a/server/channels/app/slashcommands/command_echo.go b/server/channels/app/slashcommands/command_echo.go index 58dd39e5f5..f43552a7c1 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var echoSem chan bool diff --git a/server/channels/app/slashcommands/command_expand_collapse.go b/server/channels/app/slashcommands/command_expand_collapse.go index 477a027935..0ea064490d 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type ExpandProvider struct { diff --git a/server/channels/app/slashcommands/command_groupmsg.go b/server/channels/app/slashcommands/command_groupmsg.go index 4083b2f628..c76530a93c 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type groupmsgProvider struct { diff --git a/server/channels/app/slashcommands/command_groupmsg_test.go b/server/channels/app/slashcommands/command_groupmsg_test.go index 6743a57de7..9f936e1793 100644 --- 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/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" ) func TestGroupMsgUsernames(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_help.go b/server/channels/app/slashcommands/command_help.go index 61b85dd7b9..99fc57662a 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type HelpProvider struct { diff --git a/server/channels/app/slashcommands/command_invite.go b/server/channels/app/slashcommands/command_invite.go index 906b9596ae..3d9d4906d5 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type InviteProvider struct { diff --git a/server/channels/app/slashcommands/command_invite_people.go b/server/channels/app/slashcommands/command_invite_people.go index 11040ac74f..cbd33460fc 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type InvitePeopleProvider struct { diff --git a/server/channels/app/slashcommands/command_invite_people_test.go b/server/channels/app/slashcommands/command_invite_people_test.go index 09112b3f57..e46c3fa716 100644 --- 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/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestInvitePeopleProvider(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_invite_test.go b/server/channels/app/slashcommands/command_invite_test.go index b2e2532168..06ad9416e8 100644 --- 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/server/v8/model" ) func TestInviteProvider(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_join.go b/server/channels/app/slashcommands/command_join.go index 9b87073e27..7d1644c345 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type JoinProvider struct { diff --git a/server/channels/app/slashcommands/command_join_test.go b/server/channels/app/slashcommands/command_join_test.go index 850a4bcc31..94066b0bfb 100644 --- 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/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" ) func TestJoinCommandNoChannel(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_leave.go b/server/channels/app/slashcommands/command_leave.go index 2711d73c2b..42e60d3fdb 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type LeaveProvider struct { diff --git a/server/channels/app/slashcommands/command_leave_test.go b/server/channels/app/slashcommands/command_leave_test.go index e7e2d149cd..64ac1aa1c6 100644 --- 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/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestLeaveProviderDoCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_loadtest.go b/server/channels/app/slashcommands/command_loadtest.go index a3beb9bc23..e51fb3d1c6 100644 --- a/server/channels/app/slashcommands/command_loadtest.go +++ b/server/channels/app/slashcommands/command_loadtest.go @@ -14,12 +14,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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var usage = `Mattermost testing commands to help configure the system diff --git a/server/channels/app/slashcommands/command_logout.go b/server/channels/app/slashcommands/command_logout.go index a8df517bf9..18acf62b60 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type LogoutProvider struct { diff --git a/server/channels/app/slashcommands/command_marketplace.go b/server/channels/app/slashcommands/command_marketplace.go index 5ffbd49d2b..09cb882652 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type MarketplaceProvider struct { diff --git a/server/channels/app/slashcommands/command_marketplace_test.go b/server/channels/app/slashcommands/command_marketplace_test.go index 0b6fe14bdf..4fa0686c85 100644 --- 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/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestMarketplaceProviderGetCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_me.go b/server/channels/app/slashcommands/command_me.go index 8415d21d2c..8381e3f2dc 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type MeProvider struct { diff --git a/server/channels/app/slashcommands/command_me_test.go b/server/channels/app/slashcommands/command_me_test.go index 467374f817..d8f426b2b2 100644 --- 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/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestMeProviderDoCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_msg.go b/server/channels/app/slashcommands/command_msg.go index 7daae35e74..70abc5b692 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type msgProvider struct { diff --git a/server/channels/app/slashcommands/command_msg_test.go b/server/channels/app/slashcommands/command_msg_test.go index 4f8fd0d172..71c3c387bd 100644 --- 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/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" ) func TestMsgProvider(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_mute.go b/server/channels/app/slashcommands/command_mute.go index 8b83b7fa5d..6b36782053 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type MuteProvider struct { diff --git a/server/channels/app/slashcommands/command_mute_test.go b/server/channels/app/slashcommands/command_mute_test.go index 5cc43352b6..b102c5301c 100644 --- 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/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" ) func TestMuteCommandNoChannel(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_offline.go b/server/channels/app/slashcommands/command_offline.go index c11729cf62..f211451c5e 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type OfflineProvider struct { diff --git a/server/channels/app/slashcommands/command_online.go b/server/channels/app/slashcommands/command_online.go index df38029fd1..4eef698493 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type OnlineProvider struct { diff --git a/server/channels/app/slashcommands/command_open.go b/server/channels/app/slashcommands/command_open.go index 904a5f50ac..13f4b6d80b 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type OpenProvider struct { diff --git a/server/channels/app/slashcommands/command_remote.go b/server/channels/app/slashcommands/command_remote.go index ca50466586..4e1061e097 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) const ( diff --git a/server/channels/app/slashcommands/command_remove.go b/server/channels/app/slashcommands/command_remove.go index e021c976a6..b82acd2c4d 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type RemoveProvider struct { diff --git a/server/channels/app/slashcommands/command_remove_test.go b/server/channels/app/slashcommands/command_remove_test.go index 2d1c7821e6..bbf43e9f95 100644 --- 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/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestRemoveProviderDoCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_search.go b/server/channels/app/slashcommands/command_search.go index 1587ae46b1..edebdd4d73 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type SearchProvider struct { diff --git a/server/channels/app/slashcommands/command_settings.go b/server/channels/app/slashcommands/command_settings.go index dc19789e1f..812bad4d4d 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type SettingsProvider struct { diff --git a/server/channels/app/slashcommands/command_share.go b/server/channels/app/slashcommands/command_share.go index 0827eaf733..fede1a96ed 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type ShareProvider struct { diff --git a/server/channels/app/slashcommands/command_share_test.go b/server/channels/app/slashcommands/command_share_test.go index 1d4e6a8fdf..1c5cbb0b14 100644 --- a/server/channels/app/slashcommands/command_share_test.go +++ b/server/channels/app/slashcommands/command_share_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestShareProviderDoCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_shortcuts.go b/server/channels/app/slashcommands/command_shortcuts.go index cad9369d16..794865e686 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type ShortcutsProvider struct { diff --git a/server/channels/app/slashcommands/command_shrug.go b/server/channels/app/slashcommands/command_shrug.go index 019ed4e6c6..1150c6f58b 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type ShrugProvider struct { diff --git a/server/channels/app/slashcommands/command_templates.go b/server/channels/app/slashcommands/command_templates.go index 04fa5aaba1..24cbe829ac 100644 --- a/server/channels/app/slashcommands/command_templates.go +++ b/server/channels/app/slashcommands/command_templates.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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) type TemplatesProvider struct { diff --git a/server/channels/app/slashcommands/command_test.go b/server/channels/app/slashcommands/command_test.go index 1ca8d861d6..ca71462f08 100644 --- a/server/channels/app/slashcommands/command_test.go +++ b/server/channels/app/slashcommands/command_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" ) diff --git a/server/channels/app/slashcommands/helper_test.go b/server/channels/app/slashcommands/helper_test.go index b0890d3d38..fc58c63618 100644 --- 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/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type TestHelper struct { diff --git a/server/channels/app/slashcommands/util.go b/server/channels/app/slashcommands/util.go index 5ebd3273c2..d4e3be7621 100644 --- 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/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" ) const ( diff --git a/server/channels/app/status.go b/server/channels/app/status.go index 0ae8ea0a58..d1c5c58216 100644 --- a/server/channels/app/status.go +++ b/server/channels/app/status.go @@ -7,9 +7,9 @@ import ( "encoding/json" "net/http" + "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" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // GetUserStatusesByIds used by apiV4 diff --git a/server/channels/app/status_test.go b/server/channels/app/status_test.go index 4b12665359..3f8c282914 100644 --- a/server/channels/app/status_test.go +++ b/server/channels/app/status_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/app/users" "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" ) func TestCustomStatus(t *testing.T) { diff --git a/server/channels/app/support_packet.go b/server/channels/app/support_packet.go index 96d5ccff07..0481444c03 100644 --- a/server/channels/app/support_packet.go +++ b/server/channels/app/support_packet.go @@ -13,8 +13,8 @@ import ( "github.com/pkg/errors" "gopkg.in/yaml.v2" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/config" - "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *App) GenerateSupportPacket() []model.FileData { diff --git a/server/channels/app/support_packet_test.go b/server/channels/app/support_packet_test.go index 72a206b9fd..3377c08c9d 100644 --- a/server/channels/app/support_packet_test.go +++ b/server/channels/app/support_packet_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestCreatePluginsFile(t *testing.T) { diff --git a/server/channels/app/syncables.go b/server/channels/app/syncables.go index f4ba78f235..e2de5e779f 100644 --- a/server/channels/app/syncables.go +++ b/server/channels/app/syncables.go @@ -8,9 +8,9 @@ import ( "net/http" "strings" + "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" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // createDefaultChannelMemberships adds users to channels based on their group memberships and how those groups are diff --git a/server/channels/app/syncables_test.go b/server/channels/app/syncables_test.go index 85dad92182..bcce997ad1 100644 --- a/server/channels/app/syncables_test.go +++ b/server/channels/app/syncables_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestCreateDefaultMemberships(t *testing.T) { diff --git a/server/channels/app/team.go b/server/channels/app/team.go index 66055b4afc..382a7b8fda 100644 --- a/server/channels/app/team.go +++ b/server/channels/app/team.go @@ -20,6 +20,10 @@ import ( fb_model "github.com/mattermost/mattermost-server/server/v8/boards/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/i18n" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/app/email" "github.com/mattermost/mattermost-server/server/v8/channels/app/imaging" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" @@ -28,10 +32,6 @@ import ( "github.com/mattermost/mattermost-server/server/v8/channels/product" "github.com/mattermost/mattermost-server/server/v8/channels/store" "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) // teamServiceWrapper provides an implementation of `product.TeamService` to be used by products. diff --git a/server/channels/app/team_test.go b/server/channels/app/team_test.go index c8cda76eaf..6240a688c3 100644 --- a/server/channels/app/team_test.go +++ b/server/channels/app/team_test.go @@ -18,6 +18,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/app/email" emailmocks "github.com/mattermost/mattermost-server/server/v8/channels/app/email/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/app/teams" @@ -26,7 +27,6 @@ import ( "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/testlib" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCreateTeam(t *testing.T) { diff --git a/server/channels/app/teams/helper_test.go b/server/channels/app/teams/helper_test.go index b7265d9d61..ba6817596f 100644 --- a/server/channels/app/teams/helper_test.go +++ b/server/channels/app/teams/helper_test.go @@ -9,10 +9,10 @@ import ( "path/filepath" "testing" + "github.com/mattermost/mattermost-server/server/public/model" "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/server/v8/model" ) type TestHelper struct { diff --git a/server/channels/app/teams/service.go b/server/channels/app/teams/service.go index 54336fa6b1..902883da7f 100644 --- a/server/channels/app/teams/service.go +++ b/server/channels/app/teams/service.go @@ -6,8 +6,8 @@ package teams import ( "errors" + "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" ) type TeamService struct { diff --git a/server/channels/app/teams/teams.go b/server/channels/app/teams/teams.go index e5b12a3d57..bbf5b4286f 100644 --- a/server/channels/app/teams/teams.go +++ b/server/channels/app/teams/teams.go @@ -6,8 +6,8 @@ package teams import ( "context" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" ) func (ts *TeamService) CreateTeam(team *model.Team) (*model.Team, error) { diff --git a/server/channels/app/teams/teams_test.go b/server/channels/app/teams/teams_test.go index 04a01cf897..8537fa4aae 100644 --- a/server/channels/app/teams/teams_test.go +++ b/server/channels/app/teams/teams_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestCreateTeam(t *testing.T) { diff --git a/server/channels/app/teams/utils.go b/server/channels/app/teams/utils.go index a2e12a589f..18cf516a8a 100644 --- a/server/channels/app/teams/utils.go +++ b/server/channels/app/teams/utils.go @@ -6,7 +6,7 @@ package teams import ( "strings" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // By default the list will be (not necessarily in this order): diff --git a/server/channels/app/terms_of_service.go b/server/channels/app/terms_of_service.go index fca66abaa1..75630a558f 100644 --- a/server/channels/app/terms_of_service.go +++ b/server/channels/app/terms_of_service.go @@ -7,8 +7,8 @@ import ( "errors" "net/http" + "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 (a *App) CreateTermsOfService(text, userID string) (*model.TermsOfService, *model.AppError) { diff --git a/server/channels/app/true_up.go b/server/channels/app/true_up.go index ab90154fd7..7a4064ff48 100644 --- a/server/channels/app/true_up.go +++ b/server/channels/app/true_up.go @@ -11,9 +11,9 @@ import ( "strings" "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/mattermost/mattermost-server/server/v8/platform/services/telemetry" ) diff --git a/server/channels/app/upload.go b/server/channels/app/upload.go index c8944eb27a..74b6a83c50 100644 --- a/server/channels/app/upload.go +++ b/server/channels/app/upload.go @@ -13,11 +13,11 @@ import ( "sync" "time" + "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/app/request" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "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 minFirstPartSize = 5 * 1024 * 1024 // 5MB diff --git a/server/channels/app/upload_test.go b/server/channels/app/upload_test.go index 7946d29b20..32a7b773b2 100644 --- a/server/channels/app/upload_test.go +++ b/server/channels/app/upload_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" "github.com/mattermost/mattermost-server/server/v8/channels/utils/imgutils" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestCreateUploadSession(t *testing.T) { diff --git a/server/channels/app/usage.go b/server/channels/app/usage.go index 31ba2257c9..99bd9610be 100644 --- a/server/channels/app/usage.go +++ b/server/channels/app/usage.go @@ -6,8 +6,8 @@ package app import ( "net/http" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/utils" - "github.com/mattermost/mattermost-server/server/v8/model" ) // GetPostsUsage returns the total posts count rounded down to the most diff --git a/server/channels/app/user.go b/server/channels/app/user.go index 8787402a50..9a7aa6b2d1 100644 --- a/server/channels/app/user.go +++ b/server/channels/app/user.go @@ -19,17 +19,17 @@ import ( "golang.org/x/sync/errgroup" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "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/email" "github.com/mattermost/mattermost-server/server/v8/channels/app/imaging" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" "github.com/mattermost/mattermost-server/server/v8/channels/app/users" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" "github.com/mattermost/mattermost-server/server/v8/platform/shared/mfa" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) const ( diff --git a/server/channels/app/user_terms_of_service.go b/server/channels/app/user_terms_of_service.go index 73360d739d..5945a83273 100644 --- a/server/channels/app/user_terms_of_service.go +++ b/server/channels/app/user_terms_of_service.go @@ -7,8 +7,8 @@ import ( "errors" "net/http" + "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 (a *App) GetUserTermsOfService(userID string) (*model.UserTermsOfService, *model.AppError) { diff --git a/server/channels/app/user_test.go b/server/channels/app/user_test.go index caad0fe877..bb488afff4 100644 --- a/server/channels/app/user_test.go +++ b/server/channels/app/user_test.go @@ -18,15 +18,15 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" oauthgitlab "github.com/mattermost/mattermost-server/server/v8/channels/app/oauthproviders/gitlab" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" "github.com/mattermost/mattermost-server/server/v8/channels/app/users" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/store" storemocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" ) func TestCreateOAuthUser(t *testing.T) { @@ -284,8 +284,8 @@ func TestCreateUser(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/model" ) type MyPlugin struct { diff --git a/server/channels/app/user_viewmembers_test.go b/server/channels/app/user_viewmembers_test.go index 7da06426e8..64f9fd15a4 100644 --- a/server/channels/app/user_viewmembers_test.go +++ b/server/channels/app/user_viewmembers_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/store" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestRestrictedViewMembers(t *testing.T) { diff --git a/server/channels/app/users/helper_test.go b/server/channels/app/users/helper_test.go index c979ba2d08..3d0803608a 100644 --- a/server/channels/app/users/helper_test.go +++ b/server/channels/app/users/helper_test.go @@ -10,10 +10,10 @@ import ( "sync" "testing" + "github.com/mattermost/mattermost-server/server/public/model" "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/server/v8/model" ) var initBasicOnce sync.Once diff --git a/server/channels/app/users/password.go b/server/channels/app/users/password.go index 81dfa30529..f072714ee2 100644 --- a/server/channels/app/users/password.go +++ b/server/channels/app/users/password.go @@ -9,7 +9,7 @@ import ( "golang.org/x/crypto/bcrypt" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func CheckUserPassword(user *model.User, password string) error { diff --git a/server/channels/app/users/password_test.go b/server/channels/app/users/password_test.go index 84ef4e2971..a5ea55f74e 100644 --- a/server/channels/app/users/password_test.go +++ b/server/channels/app/users/password_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestComparePassword(t *testing.T) { diff --git a/server/channels/app/users/profile_picture.go b/server/channels/app/users/profile_picture.go index d6f96a5fe2..642ff5ed99 100644 --- a/server/channels/app/users/profile_picture.go +++ b/server/channels/app/users/profile_picture.go @@ -19,8 +19,8 @@ import ( "github.com/golang/freetype" "github.com/golang/freetype/truetype" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" ) diff --git a/server/channels/app/users/service.go b/server/channels/app/users/service.go index f1db3b2a35..6ea2c20387 100644 --- a/server/channels/app/users/service.go +++ b/server/channels/app/users/service.go @@ -6,9 +6,9 @@ package users import ( "errors" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/mattermost/mattermost-server/server/v8/einterfaces" ) type UserService struct { diff --git a/server/channels/app/users/service_test.go b/server/channels/app/users/service_test.go index 5d5d50e231..ee51e2d55a 100644 --- a/server/channels/app/users/service_test.go +++ b/server/channels/app/users/service_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestNew(t *testing.T) { diff --git a/server/channels/app/users/users.go b/server/channels/app/users/users.go index 543be78956..a24d506562 100644 --- a/server/channels/app/users/users.go +++ b/server/channels/app/users/users.go @@ -8,11 +8,11 @@ import ( "encoding/base64" "fmt" + "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/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" "github.com/mattermost/mattermost-server/server/v8/platform/shared/mfa" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/pkg/errors" ) diff --git a/server/channels/app/users/users_test.go b/server/channels/app/users/users_test.go index d68b223122..ad855b715f 100644 --- a/server/channels/app/users/users_test.go +++ b/server/channels/app/users/users_test.go @@ -6,7 +6,7 @@ package users import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/stretchr/testify/require" ) diff --git a/server/channels/app/users/utils.go b/server/channels/app/users/utils.go index f4cb7017ca..4be9a140ac 100644 --- a/server/channels/app/users/utils.go +++ b/server/channels/app/users/utils.go @@ -6,7 +6,7 @@ package users import ( "strings" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // CheckUserDomain checks that a user's email domain matches a list of space-delimited domains as a string. diff --git a/server/channels/app/web_conn.go b/server/channels/app/web_conn.go index 2ec1537586..b2fbf24fd7 100644 --- a/server/channels/app/web_conn.go +++ b/server/channels/app/web_conn.go @@ -4,8 +4,8 @@ package app import ( + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" - "github.com/mattermost/mattermost-server/server/v8/model" ) // PopulateWebConnConfig checks if the connection id already exists in the hub, diff --git a/server/channels/app/web_conn_test.go b/server/channels/app/web_conn_test.go index 099caf6ca3..cde8d48b61 100644 --- a/server/channels/app/web_conn_test.go +++ b/server/channels/app/web_conn_test.go @@ -9,9 +9,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/public/shared/i18n" "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func TestWebConnShouldSendEvent(t *testing.T) { diff --git a/server/channels/app/web_hub.go b/server/channels/app/web_hub.go index a064562039..0d0d95ebd9 100644 --- a/server/channels/app/web_hub.go +++ b/server/channels/app/web_hub.go @@ -4,8 +4,8 @@ package app import ( + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" - "github.com/mattermost/mattermost-server/server/v8/model" ) func (a *App) TotalWebsocketConnections() int { diff --git a/server/channels/app/webhook.go b/server/channels/app/webhook.go index 7395086130..2b1b0f7d0c 100644 --- a/server/channels/app/webhook.go +++ b/server/channels/app/webhook.go @@ -14,11 +14,11 @@ import ( "strings" "unicode/utf8" + "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" "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/shared/mlog" ) const ( diff --git a/server/channels/app/webhook_test.go b/server/channels/app/webhook_test.go index caac38a08b..ba141480e4 100644 --- a/server/channels/app/webhook_test.go +++ b/server/channels/app/webhook_test.go @@ -17,8 +17,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/testlib" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" ) diff --git a/server/channels/app/webhub_fuzz.go b/server/channels/app/webhub_fuzz.go index 829aeb2025..a6ab061fc6 100644 --- a/server/channels/app/webhub_fuzz.go +++ b/server/channels/app/webhub_fuzz.go @@ -18,9 +18,9 @@ import ( "github.com/gorilla/websocket" + "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/testlib" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) // This is a file used to fuzz test the web_hub code. diff --git a/server/channels/app/websocket_router.go b/server/channels/app/websocket_router.go index e76223860f..783faee8cd 100644 --- a/server/channels/app/websocket_router.go +++ b/server/channels/app/websocket_router.go @@ -6,9 +6,9 @@ package app // import ( // "net/http" -// "github.com/mattermost/mattermost-server/server/v8/model" -// "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" -// "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/i18n" +// "github.com/mattermost/mattermost-server/server/public/shared/mlog" // ) // type webSocketHandler interface { diff --git a/server/channels/app/work_template_executor.go b/server/channels/app/work_template_executor.go index 63b680387c..d4afbd2e4a 100644 --- a/server/channels/app/work_template_executor.go +++ b/server/channels/app/work_template_executor.go @@ -10,17 +10,17 @@ import ( "regexp" "strings" + "github.com/mattermost/mattermost-server/server/public/plugin" pbclient "github.com/mattermost/mattermost-server/server/v8/playbooks/client" - "github.com/mattermost/mattermost-server/server/v8/plugin" fb_model "github.com/mattermost/mattermost-server/server/v8/boards/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" "github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates" "github.com/mattermost/mattermost-server/server/v8/channels/product" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type WorkTemplateExecutor interface { diff --git a/server/channels/app/work_templates.go b/server/channels/app/work_templates.go index 7d53d3dad3..d61451c6e1 100644 --- a/server/channels/app/work_templates.go +++ b/server/channels/app/work_templates.go @@ -6,10 +6,10 @@ package app import ( "net/http" + "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/request" "github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func (a *App) GetWorkTemplateCategories(t i18n.TranslateFunc) ([]*model.WorkTemplateCategory, *model.AppError) { diff --git a/server/channels/app/work_templates_test.go b/server/channels/app/work_templates_test.go index c33ec85d24..1bb338f902 100644 --- a/server/channels/app/work_templates_test.go +++ b/server/channels/app/work_templates_test.go @@ -12,10 +12,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/v8/channels/app/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" "github.com/mattermost/mattermost-server/server/v8/channels/app/worktemplates" - "github.com/mattermost/mattermost-server/server/v8/model" pbclient "github.com/mattermost/mattermost-server/server/v8/playbooks/client" ) diff --git a/server/channels/app/worktemplates/model.go b/server/channels/app/worktemplates/model.go index 418df3b690..2788440eda 100644 --- a/server/channels/app/worktemplates/model.go +++ b/server/channels/app/worktemplates/model.go @@ -8,7 +8,7 @@ import ( pbclient "github.com/mattermost/mattermost-server/server/v8/playbooks/client" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type ExecutionRequest struct { diff --git a/server/channels/app/worktemplates/model_test.go b/server/channels/app/worktemplates/model_test.go index fb131ffab6..a120be684d 100644 --- a/server/channels/app/worktemplates/model_test.go +++ b/server/channels/app/worktemplates/model_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" pbclient "github.com/mattermost/mattermost-server/server/v8/playbooks/client" ) diff --git a/server/channels/app/worktemplates/types.go b/server/channels/app/worktemplates/types.go index 56c83ea5f3..67d12dafa2 100644 --- a/server/channels/app/worktemplates/types.go +++ b/server/channels/app/worktemplates/types.go @@ -8,8 +8,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" ) type WorkTemplateCategory struct { diff --git a/server/channels/audit/audit.go b/server/channels/audit/audit.go index 9259051919..bceebd1d76 100644 --- a/server/channels/audit/audit.go +++ b/server/channels/audit/audit.go @@ -6,7 +6,7 @@ package audit import ( "fmt" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) type Audit struct { diff --git a/server/channels/audit/audit_test.go b/server/channels/audit/audit_test.go index ed526b3457..02f5fc46da 100644 --- a/server/channels/audit/audit_test.go +++ b/server/channels/audit/audit_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" - "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 TestAudit_LogRecord(t *testing.T) { diff --git a/server/channels/jobs/active_users/scheduler.go b/server/channels/jobs/active_users/scheduler.go index e1cd95a93c..fb043e6efc 100644 --- a/server/channels/jobs/active_users/scheduler.go +++ b/server/channels/jobs/active_users/scheduler.go @@ -6,8 +6,8 @@ package active_users import ( "time" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" ) const schedFreq = 10 * time.Minute diff --git a/server/channels/jobs/active_users/worker.go b/server/channels/jobs/active_users/worker.go index c078a87ad3..5d421e49a6 100644 --- a/server/channels/jobs/active_users/worker.go +++ b/server/channels/jobs/active_users/worker.go @@ -4,10 +4,10 @@ package active_users import ( - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/jobs" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" ) const ( diff --git a/server/channels/jobs/base_schedulers.go b/server/channels/jobs/base_schedulers.go index 5b198a59af..ef49da7978 100644 --- a/server/channels/jobs/base_schedulers.go +++ b/server/channels/jobs/base_schedulers.go @@ -8,7 +8,7 @@ import ( "math/big" "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type PeriodicScheduler struct { diff --git a/server/channels/jobs/base_workers.go b/server/channels/jobs/base_workers.go index 92bd3041d0..850adc4381 100644 --- a/server/channels/jobs/base_workers.go +++ b/server/channels/jobs/base_workers.go @@ -6,8 +6,8 @@ package jobs import ( "net/http" - "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 SimpleWorker struct { diff --git a/server/channels/jobs/expirynotify/scheduler.go b/server/channels/jobs/expirynotify/scheduler.go index 6cf302b239..2b63fd0b08 100644 --- a/server/channels/jobs/expirynotify/scheduler.go +++ b/server/channels/jobs/expirynotify/scheduler.go @@ -6,8 +6,8 @@ package expirynotify import ( "time" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" ) const schedFreq = 10 * time.Minute diff --git a/server/channels/jobs/expirynotify/worker.go b/server/channels/jobs/expirynotify/worker.go index 67662b8de2..32b0eb1e76 100644 --- a/server/channels/jobs/expirynotify/worker.go +++ b/server/channels/jobs/expirynotify/worker.go @@ -4,8 +4,8 @@ package expirynotify import ( + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/jobs/export_delete/scheduler.go b/server/channels/jobs/export_delete/scheduler.go index 6348b88a10..de0fc33a94 100644 --- a/server/channels/jobs/export_delete/scheduler.go +++ b/server/channels/jobs/export_delete/scheduler.go @@ -6,8 +6,8 @@ package export_delete import ( "time" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" ) const schedFreq = 24 * time.Hour diff --git a/server/channels/jobs/export_delete/worker.go b/server/channels/jobs/export_delete/worker.go index 372e6a3221..0474c229aa 100644 --- a/server/channels/jobs/export_delete/worker.go +++ b/server/channels/jobs/export_delete/worker.go @@ -9,10 +9,10 @@ import ( "github.com/wiggin77/merror" + "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/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/configservice" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const jobName = "ExportDelete" diff --git a/server/channels/jobs/export_process/worker.go b/server/channels/jobs/export_process/worker.go index ef496a98c2..b567e549cd 100644 --- a/server/channels/jobs/export_process/worker.go +++ b/server/channels/jobs/export_process/worker.go @@ -8,11 +8,11 @@ import ( "io" "path/filepath" + "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" "github.com/mattermost/mattermost-server/server/v8/channels/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/configservice" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const jobName = "ExportProcess" diff --git a/server/channels/jobs/extract_content/worker.go b/server/channels/jobs/extract_content/worker.go index af2b819ccb..42d33cd43f 100644 --- a/server/channels/jobs/extract_content/worker.go +++ b/server/channels/jobs/extract_content/worker.go @@ -6,10 +6,10 @@ package extract_content import ( "strconv" + "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/jobs" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var ignoredFiles = map[string]bool{ diff --git a/server/channels/jobs/hosted_purchase_screening/scheduler.go b/server/channels/jobs/hosted_purchase_screening/scheduler.go index 612bc89188..6765ad4529 100644 --- a/server/channels/jobs/hosted_purchase_screening/scheduler.go +++ b/server/channels/jobs/hosted_purchase_screening/scheduler.go @@ -6,8 +6,8 @@ package hosted_purchase_screening import ( "time" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" ) const schedFreq = 24 * time.Hour diff --git a/server/channels/jobs/hosted_purchase_screening/worker.go b/server/channels/jobs/hosted_purchase_screening/worker.go index 7a00705a2f..f94506b1d5 100644 --- a/server/channels/jobs/hosted_purchase_screening/worker.go +++ b/server/channels/jobs/hosted_purchase_screening/worker.go @@ -7,8 +7,8 @@ import ( "strconv" "time" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/jobs/import_delete/scheduler.go b/server/channels/jobs/import_delete/scheduler.go index 16191741a8..9e5ac1b9bc 100644 --- a/server/channels/jobs/import_delete/scheduler.go +++ b/server/channels/jobs/import_delete/scheduler.go @@ -6,8 +6,8 @@ package import_delete import ( "time" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" ) const schedFreq = 24 * time.Hour diff --git a/server/channels/jobs/import_delete/worker.go b/server/channels/jobs/import_delete/worker.go index 9d4eb4c0b3..8ef7d4abcc 100644 --- a/server/channels/jobs/import_delete/worker.go +++ b/server/channels/jobs/import_delete/worker.go @@ -10,11 +10,11 @@ import ( "github.com/wiggin77/merror" + "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/jobs" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/configservice" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const jobName = "ImportDelete" diff --git a/server/channels/jobs/import_process/worker.go b/server/channels/jobs/import_process/worker.go index e87e6792d2..1989bc82fc 100644 --- a/server/channels/jobs/import_process/worker.go +++ b/server/channels/jobs/import_process/worker.go @@ -12,12 +12,12 @@ import ( "strconv" "strings" + "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" "github.com/mattermost/mattermost-server/server/v8/channels/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/configservice" "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const jobName = "ImportProcess" diff --git a/server/channels/jobs/jobs.go b/server/channels/jobs/jobs.go index 03322c9874..88e3381994 100644 --- a/server/channels/jobs/jobs.go +++ b/server/channels/jobs/jobs.go @@ -12,9 +12,9 @@ import ( "strings" "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/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/jobs/jobs_test.go b/server/channels/jobs/jobs_test.go index f3f05a9acf..53b4a3484e 100644 --- a/server/channels/jobs/jobs_test.go +++ b/server/channels/jobs/jobs_test.go @@ -11,11 +11,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" + "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" "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" ) func makeJobServer(t *testing.T) (*JobServer, *storetest.Store, *mocks.MetricsInterface) { diff --git a/server/channels/jobs/jobs_watcher.go b/server/channels/jobs/jobs_watcher.go index f28a816074..3bd8f11cef 100644 --- a/server/channels/jobs/jobs_watcher.go +++ b/server/channels/jobs/jobs_watcher.go @@ -7,8 +7,8 @@ import ( "math/rand" "time" - "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" ) // Default polling interval for jobs termination. diff --git a/server/channels/jobs/last_accessible_file/scheduler.go b/server/channels/jobs/last_accessible_file/scheduler.go index e31fd06983..beb337b3e0 100644 --- a/server/channels/jobs/last_accessible_file/scheduler.go +++ b/server/channels/jobs/last_accessible_file/scheduler.go @@ -7,9 +7,9 @@ import ( "strconv" "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/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const schedFreq = 2 * time.Hour diff --git a/server/channels/jobs/last_accessible_file/worker.go b/server/channels/jobs/last_accessible_file/worker.go index e11ff23797..dab886a615 100644 --- a/server/channels/jobs/last_accessible_file/worker.go +++ b/server/channels/jobs/last_accessible_file/worker.go @@ -4,8 +4,8 @@ package last_accessible_file import ( + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/jobs/last_accessible_post/scheduler.go b/server/channels/jobs/last_accessible_post/scheduler.go index f9195c5755..33bf878ecd 100644 --- a/server/channels/jobs/last_accessible_post/scheduler.go +++ b/server/channels/jobs/last_accessible_post/scheduler.go @@ -7,9 +7,9 @@ import ( "strconv" "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/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const schedFreq = 30 * time.Minute diff --git a/server/channels/jobs/last_accessible_post/worker.go b/server/channels/jobs/last_accessible_post/worker.go index 0c7eb11695..91e53f6d81 100644 --- a/server/channels/jobs/last_accessible_post/worker.go +++ b/server/channels/jobs/last_accessible_post/worker.go @@ -4,8 +4,8 @@ package last_accessible_post import ( + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/jobs/migrations/advanced_permissions_phase_2.go b/server/channels/jobs/migrations/advanced_permissions_phase_2.go index 2fa16316ef..114a2f7933 100644 --- a/server/channels/jobs/migrations/advanced_permissions_phase_2.go +++ b/server/channels/jobs/migrations/advanced_permissions_phase_2.go @@ -9,8 +9,8 @@ import ( "net/http" "strings" - "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 AdvancedPermissionsPhase2Progress struct { diff --git a/server/channels/jobs/migrations/helper_test.go b/server/channels/jobs/migrations/helper_test.go index 54f2e59ab5..4941e81263 100644 --- a/server/channels/jobs/migrations/helper_test.go +++ b/server/channels/jobs/migrations/helper_test.go @@ -6,8 +6,8 @@ package migrations import ( "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" ) func Setup(tb testing.TB) store.Store { diff --git a/server/channels/jobs/migrations/migrations.go b/server/channels/jobs/migrations/migrations.go index 2e38b827aa..98805d076e 100644 --- a/server/channels/jobs/migrations/migrations.go +++ b/server/channels/jobs/migrations/migrations.go @@ -6,8 +6,8 @@ package migrations import ( "net/http" + "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 ( diff --git a/server/channels/jobs/migrations/migrations_test.go b/server/channels/jobs/migrations/migrations_test.go index 73e7602d4e..86fef11ff4 100644 --- a/server/channels/jobs/migrations/migrations_test.go +++ b/server/channels/jobs/migrations/migrations_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetMigrationState(t *testing.T) { diff --git a/server/channels/jobs/migrations/scheduler.go b/server/channels/jobs/migrations/scheduler.go index 9607cb8381..b17fab301a 100644 --- a/server/channels/jobs/migrations/scheduler.go +++ b/server/channels/jobs/migrations/scheduler.go @@ -6,10 +6,10 @@ package migrations import ( "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/jobs" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/jobs/migrations/worker.go b/server/channels/jobs/migrations/worker.go index bc3d340747..d6bad9dd1f 100644 --- a/server/channels/jobs/migrations/worker.go +++ b/server/channels/jobs/migrations/worker.go @@ -9,10 +9,10 @@ import ( "sync/atomic" "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/jobs" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/jobs/notify_admin/install_plugin_scheduler.go b/server/channels/jobs/notify_admin/install_plugin_scheduler.go index 241697b9f9..0e525ddf99 100644 --- a/server/channels/jobs/notify_admin/install_plugin_scheduler.go +++ b/server/channels/jobs/notify_admin/install_plugin_scheduler.go @@ -7,9 +7,9 @@ import ( "strconv" "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/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const installPluginSchedFreq = 24 * time.Hour diff --git a/server/channels/jobs/notify_admin/scheduler.go b/server/channels/jobs/notify_admin/scheduler.go index 84974bd87c..e9064dde22 100644 --- a/server/channels/jobs/notify_admin/scheduler.go +++ b/server/channels/jobs/notify_admin/scheduler.go @@ -7,9 +7,9 @@ import ( "strconv" "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/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const schedFreq = 24 * time.Hour diff --git a/server/channels/jobs/notify_admin/worker.go b/server/channels/jobs/notify_admin/worker.go index f6fa418204..fe498bbc35 100644 --- a/server/channels/jobs/notify_admin/worker.go +++ b/server/channels/jobs/notify_admin/worker.go @@ -4,8 +4,8 @@ package notify_admin import ( + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" ) const ( diff --git a/server/channels/jobs/plugins/scheduler.go b/server/channels/jobs/plugins/scheduler.go index ceae9897a3..a50836f711 100644 --- a/server/channels/jobs/plugins/scheduler.go +++ b/server/channels/jobs/plugins/scheduler.go @@ -6,8 +6,8 @@ package plugins import ( "time" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" ) const schedFreq = 24 * time.Hour diff --git a/server/channels/jobs/plugins/worker.go b/server/channels/jobs/plugins/worker.go index f824013120..1df0339fb9 100644 --- a/server/channels/jobs/plugins/worker.go +++ b/server/channels/jobs/plugins/worker.go @@ -4,9 +4,9 @@ package plugins import ( + "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/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type AppIface interface { diff --git a/server/channels/jobs/product_notices/scheduler.go b/server/channels/jobs/product_notices/scheduler.go index a4008772b7..06f35f9630 100644 --- a/server/channels/jobs/product_notices/scheduler.go +++ b/server/channels/jobs/product_notices/scheduler.go @@ -6,8 +6,8 @@ package product_notices import ( "time" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" ) type Scheduler struct { diff --git a/server/channels/jobs/product_notices/worker.go b/server/channels/jobs/product_notices/worker.go index 65bee0bcc2..2923a70f3d 100644 --- a/server/channels/jobs/product_notices/worker.go +++ b/server/channels/jobs/product_notices/worker.go @@ -4,9 +4,9 @@ package product_notices import ( + "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/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const jobName = "ProductNotices" diff --git a/server/channels/jobs/resend_invitation_email/worker.go b/server/channels/jobs/resend_invitation_email/worker.go index 9bcdaf6473..162473d5bf 100644 --- a/server/channels/jobs/resend_invitation_email/worker.go +++ b/server/channels/jobs/resend_invitation_email/worker.go @@ -8,12 +8,12 @@ import ( "os" "strconv" + "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/jobs" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/configservice" "github.com/mattermost/mattermost-server/server/v8/platform/services/telemetry" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const FourtyEightHoursInMillis int64 = 172800000 diff --git a/server/channels/jobs/schedulers.go b/server/channels/jobs/schedulers.go index 73afae178f..fe8932dfa7 100644 --- a/server/channels/jobs/schedulers.go +++ b/server/channels/jobs/schedulers.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "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 Schedulers struct { diff --git a/server/channels/jobs/schedulers_test.go b/server/channels/jobs/schedulers_test.go index 6bd51981ee..6cfecfb414 100644 --- a/server/channels/jobs/schedulers_test.go +++ b/server/channels/jobs/schedulers_test.go @@ -10,10 +10,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/plugin/plugintest/mock" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) type MockScheduler struct { diff --git a/server/channels/jobs/server.go b/server/channels/jobs/server.go index 90d045a68b..2dcaf515f2 100644 --- a/server/channels/jobs/server.go +++ b/server/channels/jobs/server.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/mattermost/mattermost-server/server/v8/einterfaces" "github.com/mattermost/mattermost-server/server/v8/platform/services/configservice" ) diff --git a/server/channels/jobs/workers.go b/server/channels/jobs/workers.go index d09b783d5a..7e06449495 100644 --- a/server/channels/jobs/workers.go +++ b/server/channels/jobs/workers.go @@ -6,9 +6,9 @@ package jobs import ( "errors" - "github.com/mattermost/mattermost-server/server/v8/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/services/configservice" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type Workers struct { diff --git a/server/channels/manualtesting/manual_testing.go b/server/channels/manualtesting/manual_testing.go index 7e07d26bd2..19e21201b9 100644 --- a/server/channels/manualtesting/manual_testing.go +++ b/server/channels/manualtesting/manual_testing.go @@ -12,14 +12,14 @@ import ( "strconv" "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/api4" "github.com/mattermost/mattermost-server/server/v8/channels/app" "github.com/mattermost/mattermost-server/server/v8/channels/app/slashcommands" "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/channels/web" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // TestEnvironment is a helper struct used for tests in manualtesting. diff --git a/server/channels/manualtesting/test_autolink.go b/server/channels/manualtesting/test_autolink.go index 844b70858e..b8bb6a4433 100644 --- a/server/channels/manualtesting/test_autolink.go +++ b/server/channels/manualtesting/test_autolink.go @@ -7,8 +7,8 @@ import ( "errors" "net/http" - "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 linkPostText = ` diff --git a/server/channels/product/api.go b/server/channels/product/api.go index 73cff0a451..4a2a98912b 100644 --- a/server/channels/product/api.go +++ b/server/channels/product/api.go @@ -8,10 +8,10 @@ import ( "github.com/gorilla/mux" + "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" - "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/mlog" fb_model "github.com/mattermost/mattermost-server/server/v8/boards/model" ) diff --git a/server/channels/product/hooks.go b/server/channels/product/hooks.go index aa06b5e92f..53c3f23d89 100644 --- a/server/channels/product/hooks.go +++ b/server/channels/product/hooks.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" ) type HooksManager struct { diff --git a/server/channels/store/layer_generators/opentracing_layer.go.tmpl b/server/channels/store/layer_generators/opentracing_layer.go.tmpl index 0215c6489f..ed3ca3f73b 100644 --- a/server/channels/store/layer_generators/opentracing_layer.go.tmpl +++ b/server/channels/store/layer_generators/opentracing_layer.go.tmpl @@ -10,7 +10,7 @@ import ( "context" "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/tracing" "github.com/mattermost/mattermost-server/server/v8/channels/store" "github.com/opentracing/opentracing-go/ext" diff --git a/server/channels/store/layer_generators/retry_layer.go.tmpl b/server/channels/store/layer_generators/retry_layer.go.tmpl index 4f192b2b7f..680d909893 100644 --- a/server/channels/store/layer_generators/retry_layer.go.tmpl +++ b/server/channels/store/layer_generators/retry_layer.go.tmpl @@ -12,7 +12,7 @@ import ( "time" "github.com/lib/pq" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/store" "github.com/pkg/errors" "github.com/go-sql-driver/mysql" diff --git a/server/channels/store/layer_generators/timer_layer.go.tmpl b/server/channels/store/layer_generators/timer_layer.go.tmpl index 6549449af4..cf6f0d9a35 100644 --- a/server/channels/store/layer_generators/timer_layer.go.tmpl +++ b/server/channels/store/layer_generators/timer_layer.go.tmpl @@ -10,8 +10,8 @@ import ( "context" "time" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/store" ) diff --git a/server/channels/store/localcachelayer/channel_layer.go b/server/channels/store/localcachelayer/channel_layer.go index 0dec2eb1bc..05fda221c1 100644 --- a/server/channels/store/localcachelayer/channel_layer.go +++ b/server/channels/store/localcachelayer/channel_layer.go @@ -6,8 +6,8 @@ package localcachelayer import ( "bytes" + "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" ) type LocalCacheChannelStore struct { diff --git a/server/channels/store/localcachelayer/channel_layer_test.go b/server/channels/store/localcachelayer/channel_layer_test.go index 618db4cb92..3a000f25f9 100644 --- a/server/channels/store/localcachelayer/channel_layer_test.go +++ b/server/channels/store/localcachelayer/channel_layer_test.go @@ -9,9 +9,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/storetest" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestChannelStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/emoji_layer.go b/server/channels/store/localcachelayer/emoji_layer.go index 35cce34576..2ca9581a87 100644 --- a/server/channels/store/localcachelayer/emoji_layer.go +++ b/server/channels/store/localcachelayer/emoji_layer.go @@ -8,9 +8,9 @@ import ( "context" "sync" + "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/sqlstore" - "github.com/mattermost/mattermost-server/server/v8/model" ) type LocalCacheEmojiStore struct { diff --git a/server/channels/store/localcachelayer/emoji_layer_test.go b/server/channels/store/localcachelayer/emoji_layer_test.go index 8882c26ef5..a4d4d3b4e8 100644 --- a/server/channels/store/localcachelayer/emoji_layer_test.go +++ b/server/channels/store/localcachelayer/emoji_layer_test.go @@ -10,9 +10,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/storetest" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestEmojiStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/file_info_layer.go b/server/channels/store/localcachelayer/file_info_layer.go index 45017b45f4..474741cd89 100644 --- a/server/channels/store/localcachelayer/file_info_layer.go +++ b/server/channels/store/localcachelayer/file_info_layer.go @@ -6,8 +6,8 @@ package localcachelayer import ( "bytes" + "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" ) type LocalCacheFileInfoStore struct { diff --git a/server/channels/store/localcachelayer/file_info_layer_test.go b/server/channels/store/localcachelayer/file_info_layer_test.go index 313a2dbfea..1d04e0aacd 100644 --- a/server/channels/store/localcachelayer/file_info_layer_test.go +++ b/server/channels/store/localcachelayer/file_info_layer_test.go @@ -9,9 +9,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/storetest" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestFileInfoStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/layer.go b/server/channels/store/localcachelayer/layer.go index 66130657a0..326320563e 100644 --- a/server/channels/store/localcachelayer/layer.go +++ b/server/channels/store/localcachelayer/layer.go @@ -7,9 +7,9 @@ import ( "runtime" "time" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/mattermost/mattermost-server/server/v8/einterfaces" "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" ) diff --git a/server/channels/store/localcachelayer/layer_test.go b/server/channels/store/localcachelayer/layer_test.go index 4a94793ae1..3518905f31 100644 --- a/server/channels/store/localcachelayer/layer_test.go +++ b/server/channels/store/localcachelayer/layer_test.go @@ -8,10 +8,10 @@ import ( "sync" "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/channels/store/sqlstore" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" - "github.com/mattermost/mattermost-server/server/v8/model" ) type storeType struct { diff --git a/server/channels/store/localcachelayer/main_test.go b/server/channels/store/localcachelayer/main_test.go index c76f6e9cbc..618bd48d6a 100644 --- a/server/channels/store/localcachelayer/main_test.go +++ b/server/channels/store/localcachelayer/main_test.go @@ -10,11 +10,11 @@ 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/sqlstore" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/testlib" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" cachemocks "github.com/mattermost/mattermost-server/server/v8/platform/services/cache/mocks" ) diff --git a/server/channels/store/localcachelayer/post_layer.go b/server/channels/store/localcachelayer/post_layer.go index 80e0995a7f..dfd921c0a6 100644 --- a/server/channels/store/localcachelayer/post_layer.go +++ b/server/channels/store/localcachelayer/post_layer.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" + "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" ) type LocalCachePostStore struct { diff --git a/server/channels/store/localcachelayer/post_layer_test.go b/server/channels/store/localcachelayer/post_layer_test.go index 9d2f1c6aec..d1304a9eea 100644 --- a/server/channels/store/localcachelayer/post_layer_test.go +++ b/server/channels/store/localcachelayer/post_layer_test.go @@ -10,9 +10,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/storetest" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestPostStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/reaction_layer.go b/server/channels/store/localcachelayer/reaction_layer.go index 5dc191c2e2..b8d1a2f461 100644 --- a/server/channels/store/localcachelayer/reaction_layer.go +++ b/server/channels/store/localcachelayer/reaction_layer.go @@ -6,8 +6,8 @@ package localcachelayer import ( "bytes" + "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" ) type LocalCacheReactionStore struct { diff --git a/server/channels/store/localcachelayer/reaction_layer_test.go b/server/channels/store/localcachelayer/reaction_layer_test.go index 523bbd7d26..f7b099e866 100644 --- a/server/channels/store/localcachelayer/reaction_layer_test.go +++ b/server/channels/store/localcachelayer/reaction_layer_test.go @@ -9,9 +9,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/storetest" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestReactionStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/role_layer.go b/server/channels/store/localcachelayer/role_layer.go index 24525386fc..6062bd7489 100644 --- a/server/channels/store/localcachelayer/role_layer.go +++ b/server/channels/store/localcachelayer/role_layer.go @@ -9,8 +9,8 @@ import ( "sort" "strings" + "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" ) type LocalCacheRoleStore struct { diff --git a/server/channels/store/localcachelayer/role_layer_test.go b/server/channels/store/localcachelayer/role_layer_test.go index 9e709634d9..148d8a65e6 100644 --- a/server/channels/store/localcachelayer/role_layer_test.go +++ b/server/channels/store/localcachelayer/role_layer_test.go @@ -10,9 +10,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/storetest" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestRoleStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/scheme_layer.go b/server/channels/store/localcachelayer/scheme_layer.go index 1d32cfb5b3..58ccc2a0f5 100644 --- a/server/channels/store/localcachelayer/scheme_layer.go +++ b/server/channels/store/localcachelayer/scheme_layer.go @@ -6,8 +6,8 @@ package localcachelayer import ( "bytes" + "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" ) type LocalCacheSchemeStore struct { diff --git a/server/channels/store/localcachelayer/scheme_layer_test.go b/server/channels/store/localcachelayer/scheme_layer_test.go index 414708a558..7c71e3ab6a 100644 --- a/server/channels/store/localcachelayer/scheme_layer_test.go +++ b/server/channels/store/localcachelayer/scheme_layer_test.go @@ -9,9 +9,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/storetest" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestSchemeStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/team_layer.go b/server/channels/store/localcachelayer/team_layer.go index 88ddfb974a..90c98b081b 100644 --- a/server/channels/store/localcachelayer/team_layer.go +++ b/server/channels/store/localcachelayer/team_layer.go @@ -6,8 +6,8 @@ package localcachelayer import ( "bytes" + "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" ) type LocalCacheTeamStore struct { diff --git a/server/channels/store/localcachelayer/terms_of_service_layer.go b/server/channels/store/localcachelayer/terms_of_service_layer.go index 4589103795..76b84323be 100644 --- a/server/channels/store/localcachelayer/terms_of_service_layer.go +++ b/server/channels/store/localcachelayer/terms_of_service_layer.go @@ -6,8 +6,8 @@ package localcachelayer import ( "bytes" + "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 ( diff --git a/server/channels/store/localcachelayer/terms_of_service_layer_test.go b/server/channels/store/localcachelayer/terms_of_service_layer_test.go index 8a454f1385..46d717d87e 100644 --- a/server/channels/store/localcachelayer/terms_of_service_layer_test.go +++ b/server/channels/store/localcachelayer/terms_of_service_layer_test.go @@ -9,9 +9,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/storetest" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestTermsOfServiceStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/user_layer.go b/server/channels/store/localcachelayer/user_layer.go index a0170f1ec0..e003ee9b07 100644 --- a/server/channels/store/localcachelayer/user_layer.go +++ b/server/channels/store/localcachelayer/user_layer.go @@ -9,9 +9,9 @@ import ( "sort" "sync" + "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/sqlstore" - "github.com/mattermost/mattermost-server/server/v8/model" ) type LocalCacheUserStore struct { diff --git a/server/channels/store/localcachelayer/user_layer_test.go b/server/channels/store/localcachelayer/user_layer_test.go index f25fb84178..b7e2b602c9 100644 --- a/server/channels/store/localcachelayer/user_layer_test.go +++ b/server/channels/store/localcachelayer/user_layer_test.go @@ -10,11 +10,11 @@ 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/plugin/plugintest/mock" "github.com/mattermost/mattermost-server/server/v8/channels/store" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestUserStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/webhook_layer.go b/server/channels/store/localcachelayer/webhook_layer.go index 19c4617348..4f682dbe0b 100644 --- a/server/channels/store/localcachelayer/webhook_layer.go +++ b/server/channels/store/localcachelayer/webhook_layer.go @@ -6,8 +6,8 @@ package localcachelayer import ( "bytes" + "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" ) type LocalCacheWebhookStore struct { diff --git a/server/channels/store/localcachelayer/webhook_layer_test.go b/server/channels/store/localcachelayer/webhook_layer_test.go index b5a3ec4aca..6c796500f8 100644 --- a/server/channels/store/localcachelayer/webhook_layer_test.go +++ b/server/channels/store/localcachelayer/webhook_layer_test.go @@ -9,9 +9,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/storetest" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestWebhookStore(t *testing.T) { diff --git a/server/channels/store/opentracinglayer/opentracinglayer.go b/server/channels/store/opentracinglayer/opentracinglayer.go index f70d14eddc..45219cf4b6 100644 --- a/server/channels/store/opentracinglayer/opentracinglayer.go +++ b/server/channels/store/opentracinglayer/opentracinglayer.go @@ -10,8 +10,8 @@ import ( "context" "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/mattermost/mattermost-server/server/v8/platform/services/tracing" "github.com/opentracing/opentracing-go/ext" spanlog "github.com/opentracing/opentracing-go/log" diff --git a/server/channels/store/retrylayer/retrylayer.go b/server/channels/store/retrylayer/retrylayer.go index 37d71bd2d6..7c5b6aa526 100644 --- a/server/channels/store/retrylayer/retrylayer.go +++ b/server/channels/store/retrylayer/retrylayer.go @@ -13,8 +13,8 @@ import ( "github.com/go-sql-driver/mysql" "github.com/lib/pq" + "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/pkg/errors" ) diff --git a/server/channels/store/retrylayer/retrylayer_test.go b/server/channels/store/retrylayer/retrylayer_test.go index 511cd70a02..8c3a22f768 100644 --- a/server/channels/store/retrylayer/retrylayer_test.go +++ b/server/channels/store/retrylayer/retrylayer_test.go @@ -10,8 +10,8 @@ import ( "github.com/lib/pq" "github.com/pkg/errors" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" ) func genStore() *mocks.Store { diff --git a/server/channels/store/searchlayer/channel_layer.go b/server/channels/store/searchlayer/channel_layer.go index 01022bf9d7..0e894649e4 100644 --- a/server/channels/store/searchlayer/channel_layer.go +++ b/server/channels/store/searchlayer/channel_layer.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" + "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/store" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SearchChannelStore struct { diff --git a/server/channels/store/searchlayer/file_info_layer.go b/server/channels/store/searchlayer/file_info_layer.go index 81d25cc1c4..68a42f605c 100644 --- a/server/channels/store/searchlayer/file_info_layer.go +++ b/server/channels/store/searchlayer/file_info_layer.go @@ -4,10 +4,10 @@ package searchlayer import ( + "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/store" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SearchFileInfoStore struct { diff --git a/server/channels/store/searchlayer/layer.go b/server/channels/store/searchlayer/layer.go index a71cd011ac..3f703bdaed 100644 --- a/server/channels/store/searchlayer/layer.go +++ b/server/channels/store/searchlayer/layer.go @@ -7,10 +7,10 @@ import ( "context" "sync/atomic" + "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/store" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SearchStore struct { diff --git a/server/channels/store/searchlayer/layer_test.go b/server/channels/store/searchlayer/layer_test.go index b3e7f5a86b..512adeb788 100644 --- a/server/channels/store/searchlayer/layer_test.go +++ b/server/channels/store/searchlayer/layer_test.go @@ -8,11 +8,11 @@ import ( "sync" "testing" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/store/searchlayer" "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" "github.com/mattermost/mattermost-server/server/v8/channels/testlib" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" ) diff --git a/server/channels/store/searchlayer/post_layer.go b/server/channels/store/searchlayer/post_layer.go index a7ad58da30..7035d50bc9 100644 --- a/server/channels/store/searchlayer/post_layer.go +++ b/server/channels/store/searchlayer/post_layer.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" + "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/store" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SearchPostStore struct { diff --git a/server/channels/store/searchlayer/team_layer.go b/server/channels/store/searchlayer/team_layer.go index ed6e8bd124..a5f70eb36b 100644 --- a/server/channels/store/searchlayer/team_layer.go +++ b/server/channels/store/searchlayer/team_layer.go @@ -4,8 +4,8 @@ package searchlayer 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" ) type SearchTeamStore struct { diff --git a/server/channels/store/searchlayer/user_layer.go b/server/channels/store/searchlayer/user_layer.go index 6de44b4213..c28a6bb1a4 100644 --- a/server/channels/store/searchlayer/user_layer.go +++ b/server/channels/store/searchlayer/user_layer.go @@ -9,10 +9,10 @@ import ( "github.com/pkg/errors" + "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/store" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SearchUserStore struct { diff --git a/server/channels/store/searchtest/channel_layer.go b/server/channels/store/searchtest/channel_layer.go index f27c2ec2e6..8eca86d12e 100644 --- a/server/channels/store/searchtest/channel_layer.go +++ b/server/channels/store/searchtest/channel_layer.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" ) var searchChannelStoreTests = []searchTest{ diff --git a/server/channels/store/searchtest/file_info_layer.go b/server/channels/store/searchtest/file_info_layer.go index 09cab23b48..47e770374d 100644 --- a/server/channels/store/searchtest/file_info_layer.go +++ b/server/channels/store/searchtest/file_info_layer.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" ) var searchFileInfoStoreTests = []searchTest{ diff --git a/server/channels/store/searchtest/helper.go b/server/channels/store/searchtest/helper.go index ff7cec449c..3050aead5b 100644 --- a/server/channels/store/searchtest/helper.go +++ b/server/channels/store/searchtest/helper.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" ) type SearchTestHelper struct { diff --git a/server/channels/store/searchtest/post_layer.go b/server/channels/store/searchtest/post_layer.go index 8201666dc8..76a63e4f75 100644 --- a/server/channels/store/searchtest/post_layer.go +++ b/server/channels/store/searchtest/post_layer.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" ) var searchPostStoreTests = []searchTest{ diff --git a/server/channels/store/searchtest/user_layer.go b/server/channels/store/searchtest/user_layer.go index 7247a9200b..a66cf85028 100644 --- a/server/channels/store/searchtest/user_layer.go +++ b/server/channels/store/searchtest/user_layer.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" ) var searchUserStoreTests = []searchTest{ diff --git a/server/channels/store/sqlstore/adapters.go b/server/channels/store/sqlstore/adapters.go index de7d55c787..9875a27d2c 100644 --- a/server/channels/store/sqlstore/adapters.go +++ b/server/channels/store/sqlstore/adapters.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) type jsonArray []string diff --git a/server/channels/store/sqlstore/audit_store.go b/server/channels/store/sqlstore/audit_store.go index 9e39499646..c56ee8b69e 100644 --- a/server/channels/store/sqlstore/audit_store.go +++ b/server/channels/store/sqlstore/audit_store.go @@ -7,8 +7,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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" ) type SqlAuditStore struct { diff --git a/server/channels/store/sqlstore/bot_store.go b/server/channels/store/sqlstore/bot_store.go index 8066d90d27..1f4f88d8a4 100644 --- a/server/channels/store/sqlstore/bot_store.go +++ b/server/channels/store/sqlstore/bot_store.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/mattermost/mattermost-server/server/v8/einterfaces" ) // bot is a subset of the model.Bot type, omitting the model.User fields. diff --git a/server/channels/store/sqlstore/channel_member_history_store.go b/server/channels/store/sqlstore/channel_member_history_store.go index 23e3b7ca26..8851fa2090 100644 --- a/server/channels/store/sqlstore/channel_member_history_store.go +++ b/server/channels/store/sqlstore/channel_member_history_store.go @@ -10,9 +10,9 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SqlChannelMemberHistoryStore struct { diff --git a/server/channels/store/sqlstore/channel_store.go b/server/channels/store/sqlstore/channel_store.go index 73787b6d98..d8b05c976b 100644 --- a/server/channels/store/sqlstore/channel_store.go +++ b/server/channels/store/sqlstore/channel_store.go @@ -15,11 +15,11 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/store" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/channels/store/sqlstore/channel_store_categories.go b/server/channels/store/sqlstore/channel_store_categories.go index 1481ae0b1b..b75e2099dd 100644 --- a/server/channels/store/sqlstore/channel_store_categories.go +++ b/server/channels/store/sqlstore/channel_store_categories.go @@ -10,8 +10,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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" ) // dbSelecter is an interface used to enable some internal store methods diff --git a/server/channels/store/sqlstore/channel_store_test.go b/server/channels/store/sqlstore/channel_store_test.go index d692b636ad..efcf02ee22 100644 --- a/server/channels/store/sqlstore/channel_store_test.go +++ b/server/channels/store/sqlstore/channel_store_test.go @@ -10,10 +10,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/v8/channels/store" "github.com/mattermost/mattermost-server/server/v8/channels/store/searchtest" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestChannelStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/cluster_discovery_store.go b/server/channels/store/sqlstore/cluster_discovery_store.go index ade94f3da2..f8a4195e48 100644 --- a/server/channels/store/sqlstore/cluster_discovery_store.go +++ b/server/channels/store/sqlstore/cluster_discovery_store.go @@ -7,8 +7,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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" ) type sqlClusterDiscoveryStore struct { diff --git a/server/channels/store/sqlstore/command_store.go b/server/channels/store/sqlstore/command_store.go index aa77b6fece..bb9ae5b1cf 100644 --- a/server/channels/store/sqlstore/command_store.go +++ b/server/channels/store/sqlstore/command_store.go @@ -10,8 +10,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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" ) type SqlCommandStore struct { diff --git a/server/channels/store/sqlstore/command_webhook_store.go b/server/channels/store/sqlstore/command_webhook_store.go index fd58b8ccf5..d9bc6219e3 100644 --- a/server/channels/store/sqlstore/command_webhook_store.go +++ b/server/channels/store/sqlstore/command_webhook_store.go @@ -9,9 +9,9 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SqlCommandWebhookStore struct { diff --git a/server/channels/store/sqlstore/compliance_store.go b/server/channels/store/sqlstore/compliance_store.go index f9a997296c..8f66e7cea3 100644 --- a/server/channels/store/sqlstore/compliance_store.go +++ b/server/channels/store/sqlstore/compliance_store.go @@ -12,8 +12,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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" ) type SqlComplianceStore struct { diff --git a/server/channels/store/sqlstore/draft_store.go b/server/channels/store/sqlstore/draft_store.go index 2e9c86ebfd..7031486916 100644 --- a/server/channels/store/sqlstore/draft_store.go +++ b/server/channels/store/sqlstore/draft_store.go @@ -10,10 +10,10 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/store" - "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/einterfaces" ) type SqlDraftStore struct { diff --git a/server/channels/store/sqlstore/emoji_store.go b/server/channels/store/sqlstore/emoji_store.go index 7586ee8edc..11c7dd5572 100644 --- a/server/channels/store/sqlstore/emoji_store.go +++ b/server/channels/store/sqlstore/emoji_store.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/mattermost/mattermost-server/server/v8/einterfaces" ) type SqlEmojiStore struct { diff --git a/server/channels/store/sqlstore/file_info_store.go b/server/channels/store/sqlstore/file_info_store.go index 52c5164136..2a90fab52d 100644 --- a/server/channels/store/sqlstore/file_info_store.go +++ b/server/channels/store/sqlstore/file_info_store.go @@ -14,10 +14,10 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/store" - "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/einterfaces" ) type fileInfoWithChannelID struct { diff --git a/server/channels/store/sqlstore/group_store.go b/server/channels/store/sqlstore/group_store.go index 09f4bb464f..b0415cbdda 100644 --- a/server/channels/store/sqlstore/group_store.go +++ b/server/channels/store/sqlstore/group_store.go @@ -11,8 +11,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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" ) type selectType int diff --git a/server/channels/store/sqlstore/integrity.go b/server/channels/store/sqlstore/integrity.go index 71c89d27f5..965adab012 100644 --- a/server/channels/store/sqlstore/integrity.go +++ b/server/channels/store/sqlstore/integrity.go @@ -6,8 +6,8 @@ package sqlstore import ( sq "github.com/mattermost/squirrel" - "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 relationalCheckConfig struct { diff --git a/server/channels/store/sqlstore/integrity_test.go b/server/channels/store/sqlstore/integrity_test.go index 896c2911e8..e0b24c073d 100644 --- a/server/channels/store/sqlstore/integrity_test.go +++ b/server/channels/store/sqlstore/integrity_test.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 createAudit(ss store.Store, userId, sessionId string) *model.Audit { diff --git a/server/channels/store/sqlstore/job_store.go b/server/channels/store/sqlstore/job_store.go index 0543fc5f6e..ac7eecc3fe 100644 --- a/server/channels/store/sqlstore/job_store.go +++ b/server/channels/store/sqlstore/job_store.go @@ -13,8 +13,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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 ( diff --git a/server/channels/store/sqlstore/license_store.go b/server/channels/store/sqlstore/license_store.go index 5b8308311e..88c97154d3 100644 --- a/server/channels/store/sqlstore/license_store.go +++ b/server/channels/store/sqlstore/license_store.go @@ -7,8 +7,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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" ) // SqlLicenseStore encapsulates the database writes and reads for diff --git a/server/channels/store/sqlstore/link_metadata_store.go b/server/channels/store/sqlstore/link_metadata_store.go index 1ffdcd118b..b6f22d1ed3 100644 --- a/server/channels/store/sqlstore/link_metadata_store.go +++ b/server/channels/store/sqlstore/link_metadata_store.go @@ -10,8 +10,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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" ) type SqlLinkMetadataStore struct { diff --git a/server/channels/store/sqlstore/notify_admin_store.go b/server/channels/store/sqlstore/notify_admin_store.go index b9b15757c1..2e246dd376 100644 --- a/server/channels/store/sqlstore/notify_admin_store.go +++ b/server/channels/store/sqlstore/notify_admin_store.go @@ -11,8 +11,8 @@ import ( sq "github.com/mattermost/squirrel" + "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" ) type SqlNotifyAdminStore struct { diff --git a/server/channels/store/sqlstore/oauth_store.go b/server/channels/store/sqlstore/oauth_store.go index 7dc35d66b3..7f88783667 100644 --- a/server/channels/store/sqlstore/oauth_store.go +++ b/server/channels/store/sqlstore/oauth_store.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" + "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" ) type SqlOAuthStore struct { diff --git a/server/channels/store/sqlstore/plugin_store.go b/server/channels/store/sqlstore/plugin_store.go index 01afa87455..d76efd334a 100644 --- a/server/channels/store/sqlstore/plugin_store.go +++ b/server/channels/store/sqlstore/plugin_store.go @@ -11,8 +11,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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 ( diff --git a/server/channels/store/sqlstore/post_acknowledgements_store.go b/server/channels/store/sqlstore/post_acknowledgements_store.go index 6041109d9e..b7d9646004 100644 --- a/server/channels/store/sqlstore/post_acknowledgements_store.go +++ b/server/channels/store/sqlstore/post_acknowledgements_store.go @@ -9,8 +9,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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" ) type SqlPostAcknowledgementStore struct { diff --git a/server/channels/store/sqlstore/post_priority_store.go b/server/channels/store/sqlstore/post_priority_store.go index 9ac4ca3d0d..50bf8e236a 100644 --- a/server/channels/store/sqlstore/post_priority_store.go +++ b/server/channels/store/sqlstore/post_priority_store.go @@ -6,8 +6,8 @@ package sqlstore import ( sq "github.com/mattermost/squirrel" + "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" ) type SqlPostPriorityStore struct { diff --git a/server/channels/store/sqlstore/post_store.go b/server/channels/store/sqlstore/post_store.go index ad95fce3a9..00efb995e9 100644 --- a/server/channels/store/sqlstore/post_store.go +++ b/server/channels/store/sqlstore/post_store.go @@ -17,12 +17,12 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/store" "github.com/mattermost/mattermost-server/server/v8/channels/store/searchlayer" "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/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" ) type SqlPostStore struct { diff --git a/server/channels/store/sqlstore/preference_store.go b/server/channels/store/sqlstore/preference_store.go index e68f4a3801..8be241ac97 100644 --- a/server/channels/store/sqlstore/preference_store.go +++ b/server/channels/store/sqlstore/preference_store.go @@ -7,9 +7,9 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SqlPreferenceStore struct { diff --git a/server/channels/store/sqlstore/preference_store_test.go b/server/channels/store/sqlstore/preference_store_test.go index 34e7f5fc1c..1eba7430c8 100644 --- a/server/channels/store/sqlstore/preference_store_test.go +++ b/server/channels/store/sqlstore/preference_store_test.go @@ -8,9 +8,9 @@ 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/channels/store/storetest" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestPreferenceStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/product_notices_store.go b/server/channels/store/sqlstore/product_notices_store.go index d1f3d2efab..3f84a0660d 100644 --- a/server/channels/store/sqlstore/product_notices_store.go +++ b/server/channels/store/sqlstore/product_notices_store.go @@ -9,8 +9,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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" ) type SqlProductNoticesStore struct { diff --git a/server/channels/store/sqlstore/reaction_store.go b/server/channels/store/sqlstore/reaction_store.go index 220a1d33f7..bd7136c7ce 100644 --- a/server/channels/store/sqlstore/reaction_store.go +++ b/server/channels/store/sqlstore/reaction_store.go @@ -6,9 +6,9 @@ package sqlstore import ( sq "github.com/mattermost/squirrel" + "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/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/pkg/errors" ) diff --git a/server/channels/store/sqlstore/remote_cluster_store.go b/server/channels/store/sqlstore/remote_cluster_store.go index 11c7a8c138..5c3ae258d8 100644 --- a/server/channels/store/sqlstore/remote_cluster_store.go +++ b/server/channels/store/sqlstore/remote_cluster_store.go @@ -10,8 +10,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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" ) type sqlRemoteClusterStore struct { diff --git a/server/channels/store/sqlstore/retention_policy_store.go b/server/channels/store/sqlstore/retention_policy_store.go index cc8b6280ff..bb68cd2d40 100644 --- a/server/channels/store/sqlstore/retention_policy_store.go +++ b/server/channels/store/sqlstore/retention_policy_store.go @@ -14,9 +14,9 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/mattermost/mattermost-server/server/v8/einterfaces" ) type SqlRetentionPolicyStore struct { diff --git a/server/channels/store/sqlstore/role_store.go b/server/channels/store/sqlstore/role_store.go index df6095a40c..f73a30aa65 100644 --- a/server/channels/store/sqlstore/role_store.go +++ b/server/channels/store/sqlstore/role_store.go @@ -12,8 +12,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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" ) type SqlRoleStore struct { diff --git a/server/channels/store/sqlstore/scheme_store.go b/server/channels/store/sqlstore/scheme_store.go index 3a4541688f..00be81f184 100644 --- a/server/channels/store/sqlstore/scheme_store.go +++ b/server/channels/store/sqlstore/scheme_store.go @@ -10,8 +10,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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 ( diff --git a/server/channels/store/sqlstore/session_store.go b/server/channels/store/sqlstore/session_store.go index 474742feb8..35301e9273 100644 --- a/server/channels/store/sqlstore/session_store.go +++ b/server/channels/store/sqlstore/session_store.go @@ -12,8 +12,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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 ( diff --git a/server/channels/store/sqlstore/shared_channel_store.go b/server/channels/store/sqlstore/shared_channel_store.go index 85a6583fa4..27545a73ee 100644 --- a/server/channels/store/sqlstore/shared_channel_store.go +++ b/server/channels/store/sqlstore/shared_channel_store.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" + "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" sq "github.com/mattermost/squirrel" "github.com/pkg/errors" diff --git a/server/channels/store/sqlstore/sqlx_wrapper.go b/server/channels/store/sqlstore/sqlx_wrapper.go index e8d771cada..8a6d9f65cd 100644 --- a/server/channels/store/sqlstore/sqlx_wrapper.go +++ b/server/channels/store/sqlstore/sqlx_wrapper.go @@ -17,9 +17,9 @@ import ( "github.com/jmoiron/sqlx" + "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/store/storetest" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type StoreTestWrapper struct { diff --git a/server/channels/store/sqlstore/sqlx_wrapper_test.go b/server/channels/store/sqlstore/sqlx_wrapper_test.go index c03d228935..388c23421c 100644 --- a/server/channels/store/sqlstore/sqlx_wrapper_test.go +++ b/server/channels/store/sqlstore/sqlx_wrapper_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestSqlX(t *testing.T) { diff --git a/server/channels/store/sqlstore/status_store.go b/server/channels/store/sqlstore/status_store.go index 5791a6816a..b8300ee1b5 100644 --- a/server/channels/store/sqlstore/status_store.go +++ b/server/channels/store/sqlstore/status_store.go @@ -11,8 +11,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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" ) type SqlStatusStore struct { diff --git a/server/channels/store/sqlstore/store.go b/server/channels/store/sqlstore/store.go index 2a0e5d9477..affb003766 100644 --- a/server/channels/store/sqlstore/store.go +++ b/server/channels/store/sqlstore/store.go @@ -30,11 +30,11 @@ import ( mbindata "github.com/mattermost/morph/sources/embedded" "github.com/pkg/errors" + "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/db" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "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/einterfaces" ) type migrationDirection string diff --git a/server/channels/store/sqlstore/store_test.go b/server/channels/store/sqlstore/store_test.go index de5335a24c..5f2ce542d8 100644 --- a/server/channels/store/sqlstore/store_test.go +++ b/server/channels/store/sqlstore/store_test.go @@ -21,13 +21,13 @@ 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/plugin/plugintest/mock" "github.com/mattermost/mattermost-server/server/v8/channels/db" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/store" "github.com/mattermost/mattermost-server/server/v8/channels/store/searchtest" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" ) type storeType struct { diff --git a/server/channels/store/sqlstore/system_store.go b/server/channels/store/sqlstore/system_store.go index c3006f13d6..8cfe219530 100644 --- a/server/channels/store/sqlstore/system_store.go +++ b/server/channels/store/sqlstore/system_store.go @@ -13,9 +13,9 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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" ) type SqlSystemStore struct { diff --git a/server/channels/store/sqlstore/team_store.go b/server/channels/store/sqlstore/team_store.go index ace7c4a7f5..92e7539143 100644 --- a/server/channels/store/sqlstore/team_store.go +++ b/server/channels/store/sqlstore/team_store.go @@ -12,9 +12,9 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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" ) const ( diff --git a/server/channels/store/sqlstore/team_store_test.go b/server/channels/store/sqlstore/team_store_test.go index 639c57b43b..4167e136d3 100644 --- a/server/channels/store/sqlstore/team_store_test.go +++ b/server/channels/store/sqlstore/team_store_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/v8/channels/store/storetest" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestTeamStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/terms_of_service_store.go b/server/channels/store/sqlstore/terms_of_service_store.go index 41ebc7c86b..0fc1f4c070 100644 --- a/server/channels/store/sqlstore/terms_of_service_store.go +++ b/server/channels/store/sqlstore/terms_of_service_store.go @@ -8,9 +8,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/mattermost/mattermost-server/server/v8/einterfaces" ) type SqlTermsOfServiceStore struct { diff --git a/server/channels/store/sqlstore/thread_store.go b/server/channels/store/sqlstore/thread_store.go index 66ce1f42a1..7ca6b6fe42 100644 --- a/server/channels/store/sqlstore/thread_store.go +++ b/server/channels/store/sqlstore/thread_store.go @@ -13,9 +13,9 @@ import ( "github.com/pkg/errors" "golang.org/x/sync/errgroup" + "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" ) // JoinedThread allows querying the Threads + Posts table in a single query, before looking up diff --git a/server/channels/store/sqlstore/tokens_store.go b/server/channels/store/sqlstore/tokens_store.go index d96d1ab44c..5720321f0c 100644 --- a/server/channels/store/sqlstore/tokens_store.go +++ b/server/channels/store/sqlstore/tokens_store.go @@ -10,9 +10,9 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type SqlTokenStore struct { diff --git a/server/channels/store/sqlstore/true_up_review_store.go b/server/channels/store/sqlstore/true_up_review_store.go index cc11fee86d..484d8c3538 100644 --- a/server/channels/store/sqlstore/true_up_review_store.go +++ b/server/channels/store/sqlstore/true_up_review_store.go @@ -10,8 +10,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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" ) // SqlLicenseStore encapsulates the database writes and reads for diff --git a/server/channels/store/sqlstore/upload_session_store.go b/server/channels/store/sqlstore/upload_session_store.go index 5ee8eda235..f0aadd5ddd 100644 --- a/server/channels/store/sqlstore/upload_session_store.go +++ b/server/channels/store/sqlstore/upload_session_store.go @@ -10,8 +10,8 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" + "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" ) type SqlUploadSessionStore struct { diff --git a/server/channels/store/sqlstore/user_access_token_store.go b/server/channels/store/sqlstore/user_access_token_store.go index 04dac62367..132e43e5a7 100644 --- a/server/channels/store/sqlstore/user_access_token_store.go +++ b/server/channels/store/sqlstore/user_access_token_store.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" + "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" ) type SqlUserAccessTokenStore struct { diff --git a/server/channels/store/sqlstore/user_store.go b/server/channels/store/sqlstore/user_store.go index f6792d187a..94e2a434cd 100644 --- a/server/channels/store/sqlstore/user_store.go +++ b/server/channels/store/sqlstore/user_store.go @@ -16,10 +16,10 @@ import ( "github.com/pkg/errors" "golang.org/x/sync/errgroup" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/store" - "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/einterfaces" ) const ( diff --git a/server/channels/store/sqlstore/user_terms_of_service.go b/server/channels/store/sqlstore/user_terms_of_service.go index 7c0a5b584f..30bf0e4f92 100644 --- a/server/channels/store/sqlstore/user_terms_of_service.go +++ b/server/channels/store/sqlstore/user_terms_of_service.go @@ -8,8 +8,8 @@ import ( "github.com/pkg/errors" + "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" ) type SqlUserTermsOfServiceStore struct { diff --git a/server/channels/store/sqlstore/utils.go b/server/channels/store/sqlstore/utils.go index 753d5d3933..5dd83bad99 100644 --- a/server/channels/store/sqlstore/utils.go +++ b/server/channels/store/sqlstore/utils.go @@ -14,8 +14,8 @@ import ( "github.com/wiggin77/merror" - "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" "github.com/go-sql-driver/mysql" ) diff --git a/server/channels/store/sqlstore/utils_test.go b/server/channels/store/sqlstore/utils_test.go index 61e11e0cf5..109f27dc35 100644 --- a/server/channels/store/sqlstore/utils_test.go +++ b/server/channels/store/sqlstore/utils_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/channels/store/sqlstore/webhook_store.go b/server/channels/store/sqlstore/webhook_store.go index e2d0ed18da..39debbd92c 100644 --- a/server/channels/store/sqlstore/webhook_store.go +++ b/server/channels/store/sqlstore/webhook_store.go @@ -9,9 +9,9 @@ import ( sq "github.com/mattermost/squirrel" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/mattermost/mattermost-server/server/v8/einterfaces" ) type SqlWebhookStore struct { diff --git a/server/channels/store/store.go b/server/channels/store/store.go index f9738bcf44..2cb52d064d 100644 --- a/server/channels/store/store.go +++ b/server/channels/store/store.go @@ -10,8 +10,8 @@ import ( "database/sql" "time" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/product" - "github.com/mattermost/mattermost-server/server/v8/model" ) type StoreResult struct { diff --git a/server/channels/store/storetest/audit_store.go b/server/channels/store/storetest/audit_store.go index f7e2fe3a10..2bd7807356 100644 --- a/server/channels/store/storetest/audit_store.go +++ b/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) { diff --git a/server/channels/store/storetest/bot_store.go b/server/channels/store/storetest/bot_store.go index cea0d1dd3f..6e842afe5d 100644 --- a/server/channels/store/storetest/bot_store.go +++ b/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) { diff --git a/server/channels/store/storetest/channel_member_history_store.go b/server/channels/store/storetest/channel_member_history_store.go index e4092dbe58..a244539e21 100644 --- a/server/channels/store/storetest/channel_member_history_store.go +++ b/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) { diff --git a/server/channels/store/storetest/channel_store.go b/server/channels/store/storetest/channel_store.go index baffe97abd..5dc0be429d 100644 --- a/server/channels/store/storetest/channel_store.go +++ b/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 { diff --git a/server/channels/store/storetest/channel_store_categories.go b/server/channels/store/storetest/channel_store_categories.go index 6ba934f45b..abc75219f3 100644 --- a/server/channels/store/storetest/channel_store_categories.go +++ b/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) { diff --git a/server/channels/store/storetest/channel_store_categories_with_apps_category.go b/server/channels/store/storetest/channel_store_categories_with_apps_category.go index 550085f8f7..a930f3731f 100644 --- a/server/channels/store/storetest/channel_store_categories_with_apps_category.go +++ b/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) { diff --git a/server/channels/store/storetest/cluster_discovery_store.go b/server/channels/store/storetest/cluster_discovery_store.go index 559c156dce..603f0cd07d 100644 --- a/server/channels/store/storetest/cluster_discovery_store.go +++ b/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) { diff --git a/server/channels/store/storetest/command_store.go b/server/channels/store/storetest/command_store.go index 1b73543853..b6cde7d977 100644 --- a/server/channels/store/storetest/command_store.go +++ b/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) { diff --git a/server/channels/store/storetest/command_webhook_store.go b/server/channels/store/storetest/command_webhook_store.go index 88a1b6240a..929fcc4bb0 100644 --- a/server/channels/store/storetest/command_webhook_store.go +++ b/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) { diff --git a/server/channels/store/storetest/compliance_store.go b/server/channels/store/storetest/compliance_store.go index 2840c39d89..aa977e2d0c 100644 --- a/server/channels/store/storetest/compliance_store.go +++ b/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) { diff --git a/server/channels/store/storetest/draft_store.go b/server/channels/store/storetest/draft_store.go index 57a8d5654f..74ee426cc2 100644 --- a/server/channels/store/storetest/draft_store.go +++ b/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) { diff --git a/server/channels/store/storetest/emoji_store.go b/server/channels/store/storetest/emoji_store.go index 6d0c6d44b2..17dc79fb95 100644 --- a/server/channels/store/storetest/emoji_store.go +++ b/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" diff --git a/server/channels/store/storetest/file_info_store.go b/server/channels/store/storetest/file_info_store.go index c5ba12acf6..3906f8a566 100644 --- a/server/channels/store/storetest/file_info_store.go +++ b/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" diff --git a/server/channels/store/storetest/group_store.go b/server/channels/store/storetest/group_store.go index 0bbb39b494..2c57007679 100644 --- a/server/channels/store/storetest/group_store.go +++ b/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) { diff --git a/server/channels/store/storetest/job_store.go b/server/channels/store/storetest/job_store.go index 22f91f098e..94ce665401 100644 --- a/server/channels/store/storetest/job_store.go +++ b/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) { diff --git a/server/channels/store/storetest/license_store.go b/server/channels/store/storetest/license_store.go index f2e1d54bf5..089d05c7c8 100644 --- a/server/channels/store/storetest/license_store.go +++ b/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) { diff --git a/server/channels/store/storetest/link_metadata_store.go b/server/channels/store/storetest/link_metadata_store.go index d6abe09a96..67a6d6be07 100644 --- a/server/channels/store/storetest/link_metadata_store.go +++ b/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 diff --git a/server/channels/store/storetest/mocks/AuditStore.go b/server/channels/store/storetest/mocks/AuditStore.go index f254e47f75..35b0a7aceb 100644 --- a/server/channels/store/storetest/mocks/AuditStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/BotStore.go b/server/channels/store/storetest/mocks/BotStore.go index 2ee3f78efa..dffe0c6569 100644 --- a/server/channels/store/storetest/mocks/BotStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/ChannelMemberHistoryStore.go b/server/channels/store/storetest/mocks/ChannelMemberHistoryStore.go index 6c2fe00f98..687e76a15c 100644 --- a/server/channels/store/storetest/mocks/ChannelMemberHistoryStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/ChannelStore.go b/server/channels/store/storetest/mocks/ChannelStore.go index 4725785785..f9e9c798ae 100644 --- a/server/channels/store/storetest/mocks/ChannelStore.go +++ b/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" diff --git a/server/channels/store/storetest/mocks/ClusterDiscoveryStore.go b/server/channels/store/storetest/mocks/ClusterDiscoveryStore.go index d637ca27e4..4cda05e3db 100644 --- a/server/channels/store/storetest/mocks/ClusterDiscoveryStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/CommandStore.go b/server/channels/store/storetest/mocks/CommandStore.go index fd323ae70c..1e3b2c9d10 100644 --- a/server/channels/store/storetest/mocks/CommandStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/CommandWebhookStore.go b/server/channels/store/storetest/mocks/CommandWebhookStore.go index 70e7055fc1..ab2160ca9e 100644 --- a/server/channels/store/storetest/mocks/CommandWebhookStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/ComplianceStore.go b/server/channels/store/storetest/mocks/ComplianceStore.go index 1dd0e774b2..98dd1cc2be 100644 --- a/server/channels/store/storetest/mocks/ComplianceStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/DraftStore.go b/server/channels/store/storetest/mocks/DraftStore.go index ff1c915bbc..a06af3944c 100644 --- a/server/channels/store/storetest/mocks/DraftStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/EmojiStore.go b/server/channels/store/storetest/mocks/EmojiStore.go index 6058ee3a17..256abbd111 100644 --- a/server/channels/store/storetest/mocks/EmojiStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/FileInfoStore.go b/server/channels/store/storetest/mocks/FileInfoStore.go index b514fe2e31..dfc6214ae8 100644 --- a/server/channels/store/storetest/mocks/FileInfoStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/GroupStore.go b/server/channels/store/storetest/mocks/GroupStore.go index c29e8a6a0f..0263339056 100644 --- a/server/channels/store/storetest/mocks/GroupStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/JobStore.go b/server/channels/store/storetest/mocks/JobStore.go index 3b927281b3..ad9d51882a 100644 --- a/server/channels/store/storetest/mocks/JobStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/LicenseStore.go b/server/channels/store/storetest/mocks/LicenseStore.go index e0bb342cd6..6b208cc341 100644 --- a/server/channels/store/storetest/mocks/LicenseStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/LinkMetadataStore.go b/server/channels/store/storetest/mocks/LinkMetadataStore.go index be97f3003a..00e096508e 100644 --- a/server/channels/store/storetest/mocks/LinkMetadataStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/NotifyAdminStore.go b/server/channels/store/storetest/mocks/NotifyAdminStore.go index e2f98f9ce2..5575bb3e4d 100644 --- a/server/channels/store/storetest/mocks/NotifyAdminStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/OAuthStore.go b/server/channels/store/storetest/mocks/OAuthStore.go index d333b42a8f..cfefc25bab 100644 --- a/server/channels/store/storetest/mocks/OAuthStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/PluginStore.go b/server/channels/store/storetest/mocks/PluginStore.go index 72229eba60..134339a393 100644 --- a/server/channels/store/storetest/mocks/PluginStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/PostAcknowledgementStore.go b/server/channels/store/storetest/mocks/PostAcknowledgementStore.go index 5bff12cfab..3d02e535fe 100644 --- a/server/channels/store/storetest/mocks/PostAcknowledgementStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/PostPriorityStore.go b/server/channels/store/storetest/mocks/PostPriorityStore.go index 2697dbad92..d0fd789010 100644 --- a/server/channels/store/storetest/mocks/PostPriorityStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/PostStore.go b/server/channels/store/storetest/mocks/PostStore.go index 434fd864e9..796e6040af 100644 --- a/server/channels/store/storetest/mocks/PostStore.go +++ b/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" diff --git a/server/channels/store/storetest/mocks/PreferenceStore.go b/server/channels/store/storetest/mocks/PreferenceStore.go index ed5db59dc4..49fc748462 100644 --- a/server/channels/store/storetest/mocks/PreferenceStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/ProductNoticesStore.go b/server/channels/store/storetest/mocks/ProductNoticesStore.go index 4563f48379..76ba28e32b 100644 --- a/server/channels/store/storetest/mocks/ProductNoticesStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/ReactionStore.go b/server/channels/store/storetest/mocks/ReactionStore.go index f295676495..5e4cdc8797 100644 --- a/server/channels/store/storetest/mocks/ReactionStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/RemoteClusterStore.go b/server/channels/store/storetest/mocks/RemoteClusterStore.go index caacd9a062..9d79cbaca6 100644 --- a/server/channels/store/storetest/mocks/RemoteClusterStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/RetentionPolicyStore.go b/server/channels/store/storetest/mocks/RetentionPolicyStore.go index 46a68cb49a..26e528636f 100644 --- a/server/channels/store/storetest/mocks/RetentionPolicyStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/RoleStore.go b/server/channels/store/storetest/mocks/RoleStore.go index fd4ca2232d..593152acd3 100644 --- a/server/channels/store/storetest/mocks/RoleStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/SchemeStore.go b/server/channels/store/storetest/mocks/SchemeStore.go index e6a7e35b84..7eaf6556c1 100644 --- a/server/channels/store/storetest/mocks/SchemeStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/SessionStore.go b/server/channels/store/storetest/mocks/SessionStore.go index acb486fe7c..0869dbd841 100644 --- a/server/channels/store/storetest/mocks/SessionStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/SharedChannelStore.go b/server/channels/store/storetest/mocks/SharedChannelStore.go index c8e39da2c6..26688f01ef 100644 --- a/server/channels/store/storetest/mocks/SharedChannelStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/StatusStore.go b/server/channels/store/storetest/mocks/StatusStore.go index 5f7deb0441..5213740bbe 100644 --- a/server/channels/store/storetest/mocks/StatusStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/Store.go b/server/channels/store/storetest/mocks/Store.go index bca15c95e0..4e5cc834db 100644 --- a/server/channels/store/storetest/mocks/Store.go +++ b/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" diff --git a/server/channels/store/storetest/mocks/SystemStore.go b/server/channels/store/storetest/mocks/SystemStore.go index ff41ada483..04b253682b 100644 --- a/server/channels/store/storetest/mocks/SystemStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/TeamStore.go b/server/channels/store/storetest/mocks/TeamStore.go index 7c8f038a0e..6323434f13 100644 --- a/server/channels/store/storetest/mocks/TeamStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/TermsOfServiceStore.go b/server/channels/store/storetest/mocks/TermsOfServiceStore.go index 2de7fbe85c..ba4912247b 100644 --- a/server/channels/store/storetest/mocks/TermsOfServiceStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/ThreadStore.go b/server/channels/store/storetest/mocks/ThreadStore.go index 661194a935..b56e627838 100644 --- a/server/channels/store/storetest/mocks/ThreadStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/TokenStore.go b/server/channels/store/storetest/mocks/TokenStore.go index 11d97ef20f..6485025e65 100644 --- a/server/channels/store/storetest/mocks/TokenStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/TrueUpReviewStore.go b/server/channels/store/storetest/mocks/TrueUpReviewStore.go index 153d12c9f0..5d978fdf4b 100644 --- a/server/channels/store/storetest/mocks/TrueUpReviewStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/UploadSessionStore.go b/server/channels/store/storetest/mocks/UploadSessionStore.go index 43000d811b..374467ada0 100644 --- a/server/channels/store/storetest/mocks/UploadSessionStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/UserAccessTokenStore.go b/server/channels/store/storetest/mocks/UserAccessTokenStore.go index 685582502e..65fa30e2f1 100644 --- a/server/channels/store/storetest/mocks/UserAccessTokenStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/UserStore.go b/server/channels/store/storetest/mocks/UserStore.go index dd1e851456..77493f4ed3 100644 --- a/server/channels/store/storetest/mocks/UserStore.go +++ b/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" diff --git a/server/channels/store/storetest/mocks/UserTermsOfServiceStore.go b/server/channels/store/storetest/mocks/UserTermsOfServiceStore.go index 6280d63e35..088ddcaeeb 100644 --- a/server/channels/store/storetest/mocks/UserTermsOfServiceStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/mocks/WebhookStore.go b/server/channels/store/storetest/mocks/WebhookStore.go index 3bbee2ff5c..27a444d59e 100644 --- a/server/channels/store/storetest/mocks/WebhookStore.go +++ b/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" ) diff --git a/server/channels/store/storetest/notify_admin_store.go b/server/channels/store/storetest/notify_admin_store.go index 3951fb0955..fa035d7182 100644 --- a/server/channels/store/storetest/notify_admin_store.go +++ b/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" diff --git a/server/channels/store/storetest/oauth_store.go b/server/channels/store/storetest/oauth_store.go index 9893d436fb..7060fc3b25 100644 --- a/server/channels/store/storetest/oauth_store.go +++ b/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) { diff --git a/server/channels/store/storetest/plugin_store.go b/server/channels/store/storetest/plugin_store.go index c3cc614cb6..585d4ec0dd 100644 --- a/server/channels/store/storetest/plugin_store.go +++ b/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) { diff --git a/server/channels/store/storetest/post_acknowledgements_store.go b/server/channels/store/storetest/post_acknowledgements_store.go index 8e9ef9f2e7..ba03f11bf9 100644 --- a/server/channels/store/storetest/post_acknowledgements_store.go +++ b/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) { diff --git a/server/channels/store/storetest/post_priority_store.go b/server/channels/store/storetest/post_priority_store.go index 0fd5f87071..9ac572d0e1 100644 --- a/server/channels/store/storetest/post_priority_store.go +++ b/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) { diff --git a/server/channels/store/storetest/post_store.go b/server/channels/store/storetest/post_store.go index 8de594072a..ed4715d562 100644 --- a/server/channels/store/storetest/post_store.go +++ b/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) { diff --git a/server/channels/store/storetest/preference_store.go b/server/channels/store/storetest/preference_store.go index 7816b0b7ae..af9d9ec391 100644 --- a/server/channels/store/storetest/preference_store.go +++ b/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) { diff --git a/server/channels/store/storetest/product_notices_store.go b/server/channels/store/storetest/product_notices_store.go index 9dbf43f011..6dbf464d69 100644 --- a/server/channels/store/storetest/product_notices_store.go +++ b/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) { diff --git a/server/channels/store/storetest/reaction_store.go b/server/channels/store/storetest/reaction_store.go index f52ee6ac4a..9c5241901b 100644 --- a/server/channels/store/storetest/reaction_store.go +++ b/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) { diff --git a/server/channels/store/storetest/remote_cluster_store.go b/server/channels/store/storetest/remote_cluster_store.go index b1d53f8611..d787d1aea8 100644 --- a/server/channels/store/storetest/remote_cluster_store.go +++ b/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" diff --git a/server/channels/store/storetest/retention_policy_store.go b/server/channels/store/storetest/retention_policy_store.go index 2ccb13916f..5be50d51db 100644 --- a/server/channels/store/storetest/retention_policy_store.go +++ b/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) { diff --git a/server/channels/store/storetest/role_store.go b/server/channels/store/storetest/role_store.go index 70fb09b422..f1ef0c5ac5 100644 --- a/server/channels/store/storetest/role_store.go +++ b/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) { diff --git a/server/channels/store/storetest/scheme_store.go b/server/channels/store/storetest/scheme_store.go index 4d0607740a..4b3478f340 100644 --- a/server/channels/store/storetest/scheme_store.go +++ b/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) { diff --git a/server/channels/store/storetest/session_store.go b/server/channels/store/storetest/session_store.go index 8275d1e57c..4fca204d64 100644 --- a/server/channels/store/storetest/session_store.go +++ b/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 ( diff --git a/server/channels/store/storetest/settings.go b/server/channels/store/storetest/settings.go index 0104b950bb..f5eeda8f93 100644 --- a/server/channels/store/storetest/settings.go +++ b/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 ( diff --git a/server/channels/store/storetest/shared_channel_store.go b/server/channels/store/storetest/shared_channel_store.go index 58d82bba48..8fb5c7be73 100644 --- a/server/channels/store/storetest/shared_channel_store.go +++ b/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) { diff --git a/server/channels/store/storetest/status_store.go b/server/channels/store/storetest/status_store.go index ac14cc196f..e676c851bd 100644 --- a/server/channels/store/storetest/status_store.go +++ b/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) { diff --git a/server/channels/store/storetest/store.go b/server/channels/store/storetest/store.go index 3883f7344b..0bea010ba6 100644 --- a/server/channels/store/storetest/store.go +++ b/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. diff --git a/server/channels/store/storetest/storetestlib.go b/server/channels/store/storetest/storetestlib.go index f72115732e..71d945184a 100644 --- a/server/channels/store/storetest/storetestlib.go +++ b/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 { diff --git a/server/channels/store/storetest/system_store.go b/server/channels/store/storetest/system_store.go index 7b8a06a5b5..3ed49b29ff 100644 --- a/server/channels/store/storetest/system_store.go +++ b/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) { diff --git a/server/channels/store/storetest/team_store.go b/server/channels/store/storetest/team_store.go index b7eef90aa5..78ea7939b4 100644 --- a/server/channels/store/storetest/team_store.go +++ b/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) { diff --git a/server/channels/store/storetest/terms_of_service_store.go b/server/channels/store/storetest/terms_of_service_store.go index 4977e47125..ea294ad6df 100644 --- a/server/channels/store/storetest/terms_of_service_store.go +++ b/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) { diff --git a/server/channels/store/storetest/thread_store.go b/server/channels/store/storetest/thread_store.go index efbc74d3ac..8480884a46 100644 --- a/server/channels/store/storetest/thread_store.go +++ b/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) { diff --git a/server/channels/store/storetest/tokens_store.go b/server/channels/store/storetest/tokens_store.go index 78b026ba70..3fffd09c46 100644 --- a/server/channels/store/storetest/tokens_store.go +++ b/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) { diff --git a/server/channels/store/storetest/true_up_review_store.go b/server/channels/store/storetest/true_up_review_store.go index 62491fb8b3..cee20ece3a 100644 --- a/server/channels/store/storetest/true_up_review_store.go +++ b/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) { diff --git a/server/channels/store/storetest/upload_session_store.go b/server/channels/store/storetest/upload_session_store.go index 979b7036f1..e2dfac7eb7 100644 --- a/server/channels/store/storetest/upload_session_store.go +++ b/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) { diff --git a/server/channels/store/storetest/user_access_token_store.go b/server/channels/store/storetest/user_access_token_store.go index 5dc8d3e120..6a8309c020 100644 --- a/server/channels/store/storetest/user_access_token_store.go +++ b/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) { diff --git a/server/channels/store/storetest/user_store.go b/server/channels/store/storetest/user_store.go index 06069591a8..1b325ebd74 100644 --- a/server/channels/store/storetest/user_store.go +++ b/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 ( diff --git a/server/channels/store/storetest/user_terms_of_service.go b/server/channels/store/storetest/user_terms_of_service.go index 0aaaf32b46..cee19ca4ed 100644 --- a/server/channels/store/storetest/user_terms_of_service.go +++ b/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) { diff --git a/server/channels/store/storetest/utils.go b/server/channels/store/storetest/utils.go index 60704b0f52..f6d4f78724 100644 --- a/server/channels/store/storetest/utils.go +++ b/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 diff --git a/server/channels/store/storetest/webhook_store.go b/server/channels/store/storetest/webhook_store.go index 7c25472302..df12162574 100644 --- a/server/channels/store/storetest/webhook_store.go +++ b/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) { diff --git a/server/channels/store/timerlayer/timerlayer.go b/server/channels/store/timerlayer/timerlayer.go index 815b215305..c213415986 100644 --- a/server/channels/store/timerlayer/timerlayer.go +++ b/server/channels/store/timerlayer/timerlayer.go @@ -10,9 +10,9 @@ import ( "context" "time" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/mattermost/mattermost-server/server/v8/einterfaces" ) type TimerLayer struct { diff --git a/server/channels/testlib/cluster.go b/server/channels/testlib/cluster.go index 76cf134d13..2b3a58f395 100644 --- a/server/channels/testlib/cluster.go +++ b/server/channels/testlib/cluster.go @@ -6,8 +6,8 @@ package testlib import ( "sync" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" ) type FakeClusterInterface struct { diff --git a/server/channels/testlib/helper.go b/server/channels/testlib/helper.go index f4e5d2bed6..ff61dc0f0a 100644 --- a/server/channels/testlib/helper.go +++ b/server/channels/testlib/helper.go @@ -13,12 +13,12 @@ import ( "github.com/pkg/errors" + "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/searchlayer" "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" "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/searchengine" ) diff --git a/server/channels/testlib/resources.go b/server/channels/testlib/resources.go index c69aec9598..5f20f18dd5 100644 --- a/server/channels/testlib/resources.go +++ b/server/channels/testlib/resources.go @@ -12,9 +12,9 @@ import ( "github.com/pkg/errors" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/utils" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/model/utils" "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" ) diff --git a/server/channels/testlib/store.go b/server/channels/testlib/store.go index c8c9067562..77bcded7d9 100644 --- a/server/channels/testlib/store.go +++ b/server/channels/testlib/store.go @@ -7,10 +7,10 @@ import ( "net/http" "strconv" + "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/channels/store" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) type TestStore struct { diff --git a/server/channels/utils/api.go b/server/channels/utils/api.go index 5b9684b5c9..9ffbd4b213 100644 --- a/server/channels/utils/api.go +++ b/server/channels/utils/api.go @@ -14,8 +14,8 @@ import ( "path" "strings" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" ) func CheckOrigin(r *http.Request, allowedOrigins string) bool { diff --git a/server/channels/utils/api_test.go b/server/channels/utils/api_test.go index 8624da2fd0..c817c810c7 100644 --- a/server/channels/utils/api_test.go +++ b/server/channels/utils/api_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestRenderWebError(t *testing.T) { diff --git a/server/channels/utils/i18n.go b/server/channels/utils/i18n.go index 5e75445ec6..41f9ff6881 100644 --- a/server/channels/utils/i18n.go +++ b/server/channels/utils/i18n.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) // this functions loads translations from filesystem if they are not diff --git a/server/channels/utils/license.go b/server/channels/utils/license.go index 43f1f8a0ba..aeefabc35f 100644 --- a/server/channels/utils/license.go +++ b/server/channels/utils/license.go @@ -17,9 +17,9 @@ import ( "path/filepath" "strconv" + "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/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var LicenseValidator LicenseValidatorIface diff --git a/server/channels/utils/mocks/LicenseValidatorIface.go b/server/channels/utils/mocks/LicenseValidatorIface.go index 9abb3e9302..c9d3ae5daf 100644 --- a/server/channels/utils/mocks/LicenseValidatorIface.go +++ b/server/channels/utils/mocks/LicenseValidatorIface.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" ) diff --git a/server/channels/utils/subpath.go b/server/channels/utils/subpath.go index e254a05991..880de68de0 100644 --- a/server/channels/utils/subpath.go +++ b/server/channels/utils/subpath.go @@ -16,9 +16,9 @@ import ( "github.com/pkg/errors" + "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/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // getSubpathScript renders the inline script that defines window.publicPath to change how webpack loads assets. diff --git a/server/channels/utils/subpath_test.go b/server/channels/utils/subpath_test.go index 28cc23ea0c..25319550fe 100644 --- a/server/channels/utils/subpath_test.go +++ b/server/channels/utils/subpath_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/utils" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestUpdateAssetsSubpathFromConfig(t *testing.T) { diff --git a/server/channels/utils/testutils/static_config_service.go b/server/channels/utils/testutils/static_config_service.go index c6ea8b7bba..91121ddf1c 100644 --- a/server/channels/utils/testutils/static_config_service.go +++ b/server/channels/utils/testutils/static_config_service.go @@ -6,7 +6,7 @@ package testutils import ( "crypto/ecdsa" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type StaticConfigService struct { diff --git a/server/channels/utils/utils.go b/server/channels/utils/utils.go index cc98e5dadb..ac210f9d21 100644 --- a/server/channels/utils/utils.go +++ b/server/channels/utils/utils.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func StringInSlice(a string, slice []string) bool { diff --git a/server/channels/web/context.go b/server/channels/web/context.go index 1fbf57bb33..feec45fc4c 100644 --- a/server/channels/web/context.go +++ b/server/channels/web/context.go @@ -9,13 +9,13 @@ import ( "regexp" "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/audit" "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/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type Context struct { diff --git a/server/channels/web/context_test.go b/server/channels/web/context_test.go index 60a9ef0579..c4dbc6c886 100644 --- a/server/channels/web/context_test.go +++ b/server/channels/web/context_test.go @@ -11,9 +11,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/public/plugin/plugintest/mock" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestRequireHookId(t *testing.T) { diff --git a/server/channels/web/handlers.go b/server/channels/web/handlers.go index d10c085021..802f5eb81c 100644 --- a/server/channels/web/handlers.go +++ b/server/channels/web/handlers.go @@ -20,15 +20,15 @@ import ( "github.com/opentracing/opentracing-go/ext" spanlog "github.com/opentracing/opentracing-go/log" + "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" app_opentracing "github.com/mattermost/mattermost-server/server/v8/channels/app/opentracing" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" "github.com/mattermost/mattermost-server/server/v8/channels/store/opentracinglayer" "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/tracing" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func GetHandlerName(h func(*Context, http.ResponseWriter, *http.Request)) string { diff --git a/server/channels/web/handlers_test.go b/server/channels/web/handlers_test.go index 842e062151..3c0c9c4200 100644 --- a/server/channels/web/handlers_test.go +++ b/server/channels/web/handlers_test.go @@ -11,11 +11,11 @@ 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/plugin/plugintest/mock" + "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/store/storetest/mocks" - "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/plugintest/mock" ) func handlerForHTTPErrors(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/server/channels/web/oauth.go b/server/channels/web/oauth.go index fe6e4ece8e..d5dd8731cb 100644 --- a/server/channels/web/oauth.go +++ b/server/channels/web/oauth.go @@ -11,13 +11,13 @@ import ( "path/filepath" "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/audit" "github.com/mattermost/mattermost-server/server/v8/channels/utils" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (w *Web) InitOAuth() { diff --git a/server/channels/web/oauth_test.go b/server/channels/web/oauth_test.go index 03838789fd..ec0550cea9 100644 --- a/server/channels/web/oauth_test.go +++ b/server/channels/web/oauth_test.go @@ -17,11 +17,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/utils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" ) func TestOAuthComplete_AccessDenied(t *testing.T) { diff --git a/server/channels/web/params.go b/server/channels/web/params.go index 7dd205dc93..16b6e17ef8 100644 --- a/server/channels/web/params.go +++ b/server/channels/web/params.go @@ -11,7 +11,7 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) const ( diff --git a/server/channels/web/params_test.go b/server/channels/web/params_test.go index 010714e252..d1c4eb7db2 100644 --- a/server/channels/web/params_test.go +++ b/server/channels/web/params_test.go @@ -10,7 +10,7 @@ import ( "github.com/gorilla/mux" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetPerPageFromQuery(t *testing.T) { diff --git a/server/channels/web/saml.go b/server/channels/web/saml.go index 55bcfdfee0..4df1e8fab1 100644 --- a/server/channels/web/saml.go +++ b/server/channels/web/saml.go @@ -10,10 +10,10 @@ import ( "strconv" "strings" + "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/audit" "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/shared/mlog" ) const maxSAMLResponseSize = 2 * 1024 * 1024 // 2MB diff --git a/server/channels/web/static.go b/server/channels/web/static.go index e8e111dbb5..af7d78cabe 100644 --- a/server/channels/web/static.go +++ b/server/channels/web/static.go @@ -15,10 +15,10 @@ import ( "github.com/mattermost/gziphandler" + "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/utils" "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" - "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/platform/shared/templates" ) diff --git a/server/channels/web/web.go b/server/channels/web/web.go index 1bae301a83..4b6b5ba0bb 100644 --- a/server/channels/web/web.go +++ b/server/channels/web/web.go @@ -11,10 +11,10 @@ import ( "github.com/avct/uasurfer" "github.com/gorilla/mux" + "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/utils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type Web struct { diff --git a/server/channels/web/web_test.go b/server/channels/web/web_test.go index e0a57ce000..f8db91f917 100644 --- a/server/channels/web/web_test.go +++ b/server/channels/web/web_test.go @@ -17,15 +17,15 @@ 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/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin/utils" + "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/localcachelayer" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" "github.com/mattermost/mattermost-server/server/v8/config" - "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" - "github.com/mattermost/mattermost-server/server/v8/plugin/utils" ) var apiClient *model.Client4 @@ -205,7 +205,7 @@ func TestStaticFilesRequest(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { @@ -292,7 +292,7 @@ func TestPublicFilesRequest(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { diff --git a/server/channels/web/webhook.go b/server/channels/web/webhook.go index d75c98e94b..2f845511ab 100644 --- a/server/channels/web/webhook.go +++ b/server/channels/web/webhook.go @@ -13,8 +13,8 @@ import ( "github.com/gorilla/mux" "github.com/gorilla/schema" - "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 (w *Web) InitWebhooks() { diff --git a/server/channels/web/webhook_test.go b/server/channels/web/webhook_test.go index 17f5dbe718..3e02efa4da 100644 --- a/server/channels/web/webhook_test.go +++ b/server/channels/web/webhook_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestIncomingWebhook(t *testing.T) { diff --git a/server/channels/wsapi/status.go b/server/channels/wsapi/status.go index db52eb50dd..8e81eaa04c 100644 --- a/server/channels/wsapi/status.go +++ b/server/channels/wsapi/status.go @@ -4,8 +4,8 @@ package wsapi import ( - "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 (api *API) InitStatus() { diff --git a/server/channels/wsapi/system.go b/server/channels/wsapi/system.go index 634df691b7..16cfbd23e2 100644 --- a/server/channels/wsapi/system.go +++ b/server/channels/wsapi/system.go @@ -4,7 +4,7 @@ package wsapi import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func (api *API) InitSystem() { diff --git a/server/channels/wsapi/user.go b/server/channels/wsapi/user.go index 940c2ae64a..99a5338446 100644 --- a/server/channels/wsapi/user.go +++ b/server/channels/wsapi/user.go @@ -4,8 +4,8 @@ package wsapi import ( + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - "github.com/mattermost/mattermost-server/server/v8/model" ) func (api *API) InitUser() { diff --git a/server/channels/wsapi/websocket_handler.go b/server/channels/wsapi/websocket_handler.go index 4cd7d68bec..891989e18d 100644 --- a/server/channels/wsapi/websocket_handler.go +++ b/server/channels/wsapi/websocket_handler.go @@ -6,11 +6,11 @@ package wsapi import ( "net/http" + "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/platform" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (api *API) APIWebSocketHandler(wh func(*model.WebSocketRequest) (map[string]any, *model.AppError)) webSocketHandler { diff --git a/server/cmd/mattermost/commands/cmdtestlib.go b/server/cmd/mattermost/commands/cmdtestlib.go index 1d57b71367..10cf30b46e 100644 --- a/server/cmd/mattermost/commands/cmdtestlib.go +++ b/server/cmd/mattermost/commands/cmdtestlib.go @@ -17,10 +17,10 @@ import ( "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/api4" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" "github.com/mattermost/mattermost-server/server/v8/channels/testlib" - "github.com/mattermost/mattermost-server/server/v8/model" ) var coverprofileCounters map[string]int = make(map[string]int) diff --git a/server/cmd/mattermost/commands/export.go b/server/cmd/mattermost/commands/export.go index 70593379b2..ba4eb9ebec 100644 --- a/server/cmd/mattermost/commands/export.go +++ b/server/cmd/mattermost/commands/export.go @@ -10,10 +10,10 @@ import ( "path/filepath" "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/server/cmd/mattermost/commands/export_test.go b/server/cmd/mattermost/commands/export_test.go index b2456d60cd..4baaad3f1f 100644 --- a/server/cmd/mattermost/commands/export_test.go +++ b/server/cmd/mattermost/commands/export_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // There are no tests that actually run the Message Export job, because it can take a long time to complete depending diff --git a/server/cmd/mattermost/commands/import.go b/server/cmd/mattermost/commands/import.go index ecfcca5781..96016a7658 100644 --- a/server/cmd/mattermost/commands/import.go +++ b/server/cmd/mattermost/commands/import.go @@ -10,10 +10,10 @@ import ( "github.com/spf13/cobra" + "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/audit" - "github.com/mattermost/mattermost-server/server/v8/model" ) var ImportCmd = &cobra.Command{ diff --git a/server/cmd/mattermost/commands/init.go b/server/cmd/mattermost/commands/init.go index bae1181fa2..0faf65c3a5 100644 --- a/server/cmd/mattermost/commands/init.go +++ b/server/cmd/mattermost/commands/init.go @@ -6,12 +6,12 @@ package commands import ( "github.com/spf13/cobra" + "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/server/v8/channels/utils" "github.com/mattermost/mattermost-server/server/v8/config" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) func initDBCommandContextCobra(command *cobra.Command, readOnlyConfigStore bool, options ...app.Option) (*app.App, error) { diff --git a/server/cmd/mattermost/commands/jobserver.go b/server/cmd/mattermost/commands/jobserver.go index 206b660a9f..9e42728a8e 100644 --- a/server/cmd/mattermost/commands/jobserver.go +++ b/server/cmd/mattermost/commands/jobserver.go @@ -10,10 +10,10 @@ import ( "github.com/spf13/cobra" + "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/audit" "github.com/mattermost/mattermost-server/server/v8/config" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var JobserverCmd = &cobra.Command{ diff --git a/server/cmd/mattermost/commands/main_test.go b/server/cmd/mattermost/commands/main_test.go index ace5a637db..897e05e48e 100644 --- a/server/cmd/mattermost/commands/main_test.go +++ b/server/cmd/mattermost/commands/main_test.go @@ -8,9 +8,9 @@ import ( "os" "testing" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/api4" "github.com/mattermost/mattermost-server/server/v8/channels/testlib" - "github.com/mattermost/mattermost-server/server/v8/model" ) // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. diff --git a/server/cmd/mattermost/commands/server.go b/server/cmd/mattermost/commands/server.go index 3501047332..3c5030efb7 100644 --- a/server/cmd/mattermost/commands/server.go +++ b/server/cmd/mattermost/commands/server.go @@ -15,6 +15,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/api4" "github.com/mattermost/mattermost-server/server/v8/channels/app" "github.com/mattermost/mattermost-server/server/v8/channels/manualtesting" @@ -22,7 +23,6 @@ import ( "github.com/mattermost/mattermost-server/server/v8/channels/web" "github.com/mattermost/mattermost-server/server/v8/channels/wsapi" "github.com/mattermost/mattermost-server/server/v8/config" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var serverCmd = &cobra.Command{ diff --git a/server/cmd/mattermost/commands/test.go b/server/cmd/mattermost/commands/test.go index a525f2bbdc..5e6d5e80c0 100644 --- a/server/cmd/mattermost/commands/test.go +++ b/server/cmd/mattermost/commands/test.go @@ -13,11 +13,11 @@ import ( "github.com/spf13/cobra" + "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/api4" "github.com/mattermost/mattermost-server/server/v8/channels/app" "github.com/mattermost/mattermost-server/server/v8/channels/wsapi" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" ) var TestCmd = &cobra.Command{ diff --git a/server/cmd/mattermost/commands/utils.go b/server/cmd/mattermost/commands/utils.go index d09def41fc..7062558b5f 100644 --- a/server/cmd/mattermost/commands/utils.go +++ b/server/cmd/mattermost/commands/utils.go @@ -14,7 +14,7 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) const CustomDefaultsEnvVar = "MM_CUSTOM_DEFAULTS_PATH" diff --git a/server/cmd/mattermost/commands/version.go b/server/cmd/mattermost/commands/version.go index daea544066..807ce59caa 100644 --- a/server/cmd/mattermost/commands/version.go +++ b/server/cmd/mattermost/commands/version.go @@ -6,7 +6,7 @@ package commands import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) var VersionCmd = &cobra.Command{ diff --git a/server/config/client.go b/server/config/client.go index b05be8d82e..f341e61b9a 100644 --- a/server/config/client.go +++ b/server/config/client.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // GenerateClientConfig renders the given configuration for a client. diff --git a/server/config/client_test.go b/server/config/client_test.go index 4c3d3c9968..465396ecb4 100644 --- a/server/config/client_test.go +++ b/server/config/client_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestGetClientConfig(t *testing.T) { diff --git a/server/config/common_test.go b/server/config/common_test.go index e601e63352..2663a21408 100644 --- a/server/config/common_test.go +++ b/server/config/common_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) var emptyConfig, readOnlyConfig, minimalConfig, minimalConfigNoFF, invalidConfig, fixesRequiredConfig, ldapConfig, testConfig, customConfigDefaults *model.Config diff --git a/server/config/database.go b/server/config/database.go index 58966e9d9e..8991dd0df4 100644 --- a/server/config/database.go +++ b/server/config/database.go @@ -25,9 +25,9 @@ import ( "github.com/mattermost/morph" + "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/store/sqlstore" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" "github.com/mattermost/morph/drivers" ms "github.com/mattermost/morph/drivers/mysql" diff --git a/server/config/database_test.go b/server/config/database_test.go index d1fb8e18c4..72f9ed4bd5 100644 --- a/server/config/database_test.go +++ b/server/config/database_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func getDsn(driver string, source string) string { diff --git a/server/config/diff.go b/server/config/diff.go index d10025d4bd..095cf677c1 100644 --- a/server/config/diff.go +++ b/server/config/diff.go @@ -7,7 +7,7 @@ import ( "fmt" "reflect" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type ConfigDiffs []ConfigDiff diff --git a/server/config/diff_test.go b/server/config/diff_test.go index 36e3b2402b..047c515131 100644 --- a/server/config/diff_test.go +++ b/server/config/diff_test.go @@ -6,7 +6,7 @@ package config import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/stretchr/testify/require" ) diff --git a/server/config/emitter.go b/server/config/emitter.go index bd5b36d794..11d1ff6aca 100644 --- a/server/config/emitter.go +++ b/server/config/emitter.go @@ -6,8 +6,8 @@ package config import ( "sync" - "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" ) // Listener is a callback function invoked when the configuration changes. diff --git a/server/config/emitter_test.go b/server/config/emitter_test.go index 417a168be2..41a0483933 100644 --- a/server/config/emitter_test.go +++ b/server/config/emitter_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "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 TestEmitter(t *testing.T) { diff --git a/server/config/environment.go b/server/config/environment.go index 17ad38f34e..14b3edf56e 100644 --- a/server/config/environment.go +++ b/server/config/environment.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func GetEnvironment() map[string]string { diff --git a/server/config/environment_test.go b/server/config/environment_test.go index b45107ad39..1973aa0eef 100644 --- a/server/config/environment_test.go +++ b/server/config/environment_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func modifiedDefault(modify func(*model.Config)) *model.Config { diff --git a/server/config/file.go b/server/config/file.go index 082d77c9f9..f293406323 100644 --- a/server/config/file.go +++ b/server/config/file.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" + "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/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var ( diff --git a/server/config/file_test.go b/server/config/file_test.go index 51df708992..64c888e0ac 100644 --- a/server/config/file_test.go +++ b/server/config/file_test.go @@ -15,8 +15,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/utils" - "github.com/mattermost/mattermost-server/server/v8/model" ) func setupConfigFile(t *testing.T, cfg *model.Config) (string, func()) { diff --git a/server/config/logconfigsrc.go b/server/config/logconfigsrc.go index dce35f6f24..c98e85f0f0 100644 --- a/server/config/logconfigsrc.go +++ b/server/config/logconfigsrc.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) type LogSrcListener func(old, new mlog.LoggerConfiguration) diff --git a/server/config/logger.go b/server/config/logger.go index ec64b98dc8..09e53c70cd 100644 --- a/server/config/logger.go +++ b/server/config/logger.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" + "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/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/config/logger_test.go b/server/config/logger_test.go index acd7fefe1e..fc8474edf2 100644 --- a/server/config/logger_test.go +++ b/server/config/logger_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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 TestMloggerConfigFromAuditConfig(t *testing.T) { diff --git a/server/config/main_test.go b/server/config/main_test.go index 9a0979589b..ddbbd0e9cb 100644 --- a/server/config/main_test.go +++ b/server/config/main_test.go @@ -11,8 +11,8 @@ import ( "github.com/lib/pq" "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/testlib" - "github.com/mattermost/mattermost-server/server/v8/model" ) var mainHelper *testlib.MainHelper diff --git a/server/config/memory.go b/server/config/memory.go index 7067f3bd55..bfc5a92610 100644 --- a/server/config/memory.go +++ b/server/config/memory.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // MemoryStore implements the Store interface. It is meant primarily for testing. diff --git a/server/config/migrate_test.go b/server/config/migrate_test.go index a8f3565811..bf7d5d353b 100644 --- a/server/config/migrate_test.go +++ b/server/config/migrate_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type cleanUpFn func(store *Store) diff --git a/server/config/store.go b/server/config/store.go index 00b9ce3fef..b56e5c251c 100644 --- a/server/config/store.go +++ b/server/config/store.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/model/utils" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" + "github.com/mattermost/mattermost-server/server/public/utils" ) var ( diff --git a/server/config/utils.go b/server/config/utils.go index d76fe55d52..d47e393274 100644 --- a/server/config/utils.go +++ b/server/config/utils.go @@ -10,10 +10,10 @@ import ( "reflect" "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/utils" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // marshalConfig converts the given configuration into JSON bytes for persistence. diff --git a/server/config/utils_test.go b/server/config/utils_test.go index 50585eb550..07be9bd92d 100644 --- a/server/config/utils_test.go +++ b/server/config/utils_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/utils" - "github.com/mattermost/mattermost-server/server/v8/model" ) func TestDesanitize(t *testing.T) { diff --git a/server/channels/einterfaces/account_migration.go b/server/einterfaces/account_migration.go similarity index 86% rename from server/channels/einterfaces/account_migration.go rename to server/einterfaces/account_migration.go index 54c87458cf..6fc8390181 100644 --- a/server/channels/einterfaces/account_migration.go +++ b/server/einterfaces/account_migration.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type AccountMigrationInterface interface { diff --git a/server/channels/einterfaces/cloud.go b/server/einterfaces/cloud.go similarity index 97% rename from server/channels/einterfaces/cloud.go rename to server/einterfaces/cloud.go index 1c0878f6ef..15e4a5bb0d 100644 --- a/server/channels/einterfaces/cloud.go +++ b/server/einterfaces/cloud.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type CloudInterface interface { diff --git a/server/channels/einterfaces/cluster.go b/server/einterfaces/cluster.go similarity index 95% rename from server/channels/einterfaces/cluster.go rename to server/einterfaces/cluster.go index 1bea4f521b..71beb8adab 100644 --- a/server/channels/einterfaces/cluster.go +++ b/server/einterfaces/cluster.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type ClusterMessageHandler func(msg *model.ClusterMessage) diff --git a/server/channels/einterfaces/compliance.go b/server/einterfaces/compliance.go similarity index 81% rename from server/channels/einterfaces/compliance.go rename to server/einterfaces/compliance.go index 5e895ab878..02e28c4e25 100644 --- a/server/channels/einterfaces/compliance.go +++ b/server/einterfaces/compliance.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type ComplianceInterface interface { diff --git a/server/channels/einterfaces/data_retention.go b/server/einterfaces/data_retention.go similarity index 96% rename from server/channels/einterfaces/data_retention.go rename to server/einterfaces/data_retention.go index e64083b9fc..2ba81e635b 100644 --- a/server/channels/einterfaces/data_retention.go +++ b/server/einterfaces/data_retention.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type DataRetentionInterface interface { diff --git a/server/channels/einterfaces/jobs/cloud_interface.go b/server/einterfaces/jobs/cloud_interface.go similarity index 78% rename from server/channels/einterfaces/jobs/cloud_interface.go rename to server/einterfaces/jobs/cloud_interface.go index 5f5e762c80..731c91a462 100644 --- a/server/channels/einterfaces/jobs/cloud_interface.go +++ b/server/einterfaces/jobs/cloud_interface.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type CloudJobInterface interface { diff --git a/server/channels/einterfaces/jobs/data_retention.go b/server/einterfaces/jobs/data_retention.go similarity index 79% rename from server/channels/einterfaces/jobs/data_retention.go rename to server/einterfaces/jobs/data_retention.go index aebc121bd1..8952e86ea0 100644 --- a/server/channels/einterfaces/jobs/data_retention.go +++ b/server/einterfaces/jobs/data_retention.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type DataRetentionJobInterface interface { diff --git a/server/channels/einterfaces/jobs/elasticsearch.go b/server/einterfaces/jobs/elasticsearch.go similarity index 86% rename from server/channels/einterfaces/jobs/elasticsearch.go rename to server/einterfaces/jobs/elasticsearch.go index 32ad94ff76..dd78e90170 100644 --- a/server/channels/einterfaces/jobs/elasticsearch.go +++ b/server/einterfaces/jobs/elasticsearch.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type ElasticsearchIndexerInterface interface { diff --git a/server/channels/einterfaces/jobs/indexer_interface.go b/server/einterfaces/jobs/indexer_interface.go similarity index 76% rename from server/channels/einterfaces/jobs/indexer_interface.go rename to server/einterfaces/jobs/indexer_interface.go index 5fa9f1ed06..bfa6a14707 100644 --- a/server/channels/einterfaces/jobs/indexer_interface.go +++ b/server/einterfaces/jobs/indexer_interface.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type IndexerJobInterface interface { diff --git a/server/channels/einterfaces/jobs/ldap_sync.go b/server/einterfaces/jobs/ldap_sync.go similarity index 78% rename from server/channels/einterfaces/jobs/ldap_sync.go rename to server/einterfaces/jobs/ldap_sync.go index e38824680f..331e257d0c 100644 --- a/server/channels/einterfaces/jobs/ldap_sync.go +++ b/server/einterfaces/jobs/ldap_sync.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type LdapSyncInterface interface { diff --git a/server/channels/einterfaces/jobs/message_export.go b/server/einterfaces/jobs/message_export.go similarity index 79% rename from server/channels/einterfaces/jobs/message_export.go rename to server/einterfaces/jobs/message_export.go index bfd9bd5d9c..470cd2fce2 100644 --- a/server/channels/einterfaces/jobs/message_export.go +++ b/server/einterfaces/jobs/message_export.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type MessageExportJobInterface interface { diff --git a/server/channels/einterfaces/ldap.go b/server/einterfaces/ldap.go similarity index 95% rename from server/channels/einterfaces/ldap.go rename to server/einterfaces/ldap.go index ba04eacccd..da225a77bc 100644 --- a/server/channels/einterfaces/ldap.go +++ b/server/einterfaces/ldap.go @@ -4,8 +4,8 @@ package einterfaces import ( + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - "github.com/mattermost/mattermost-server/server/v8/model" ) type LdapInterface interface { diff --git a/server/channels/einterfaces/license.go b/server/einterfaces/license.go similarity index 77% rename from server/channels/einterfaces/license.go rename to server/einterfaces/license.go index 864050577f..87fa2fc6c8 100644 --- a/server/channels/einterfaces/license.go +++ b/server/einterfaces/license.go @@ -3,7 +3,7 @@ package einterfaces -import "github.com/mattermost/mattermost-server/server/v8/model" +import "github.com/mattermost/mattermost-server/server/public/model" type LicenseInterface interface { CanStartTrial() (bool, error) diff --git a/server/channels/einterfaces/message_export.go b/server/einterfaces/message_export.go similarity index 85% rename from server/channels/einterfaces/message_export.go rename to server/einterfaces/message_export.go index d06f3f26c2..34efe3342e 100644 --- a/server/channels/einterfaces/message_export.go +++ b/server/einterfaces/message_export.go @@ -6,7 +6,7 @@ package einterfaces import ( "context" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type MessageExportInterface interface { diff --git a/server/channels/einterfaces/metrics.go b/server/einterfaces/metrics.go similarity index 95% rename from server/channels/einterfaces/metrics.go rename to server/einterfaces/metrics.go index c44af2a3c5..6612418526 100644 --- a/server/channels/einterfaces/metrics.go +++ b/server/einterfaces/metrics.go @@ -6,8 +6,8 @@ package einterfaces import ( "database/sql" - "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 MetricsInterface interface { diff --git a/server/channels/einterfaces/mfa.go b/server/einterfaces/mfa.go similarity index 86% rename from server/channels/einterfaces/mfa.go rename to server/einterfaces/mfa.go index b3315970e2..204c907c68 100644 --- a/server/channels/einterfaces/mfa.go +++ b/server/einterfaces/mfa.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type MfaInterface interface { diff --git a/server/channels/einterfaces/mocks/AccountMigrationInterface.go b/server/einterfaces/mocks/AccountMigrationInterface.go similarity index 96% rename from server/channels/einterfaces/mocks/AccountMigrationInterface.go rename to server/einterfaces/mocks/AccountMigrationInterface.go index edaafe5e76..41f24d4fe6 100644 --- a/server/channels/einterfaces/mocks/AccountMigrationInterface.go +++ b/server/einterfaces/mocks/AccountMigrationInterface.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" ) diff --git a/server/channels/einterfaces/mocks/AppContextInterface.go b/server/einterfaces/mocks/AppContextInterface.go similarity index 97% rename from server/channels/einterfaces/mocks/AppContextInterface.go rename to server/einterfaces/mocks/AppContextInterface.go index 6780bc23c2..f115420752 100644 --- a/server/channels/einterfaces/mocks/AppContextInterface.go +++ b/server/einterfaces/mocks/AppContextInterface.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" ) diff --git a/server/channels/einterfaces/mocks/CloudInterface.go b/server/einterfaces/mocks/CloudInterface.go similarity index 99% rename from server/channels/einterfaces/mocks/CloudInterface.go rename to server/einterfaces/mocks/CloudInterface.go index 66d8bc3c9e..ea58d0ad1d 100644 --- a/server/channels/einterfaces/mocks/CloudInterface.go +++ b/server/einterfaces/mocks/CloudInterface.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" ) diff --git a/server/channels/einterfaces/mocks/CloudJobInterface.go b/server/einterfaces/mocks/CloudJobInterface.go similarity index 95% rename from server/channels/einterfaces/mocks/CloudJobInterface.go rename to server/einterfaces/mocks/CloudJobInterface.go index ff5c7377c8..64554964eb 100644 --- a/server/channels/einterfaces/mocks/CloudJobInterface.go +++ b/server/einterfaces/mocks/CloudJobInterface.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" ) diff --git a/server/channels/einterfaces/mocks/ClusterInterface.go b/server/einterfaces/mocks/ClusterInterface.go similarity index 98% rename from server/channels/einterfaces/mocks/ClusterInterface.go rename to server/einterfaces/mocks/ClusterInterface.go index 4e4b0134f5..14017fb186 100644 --- a/server/channels/einterfaces/mocks/ClusterInterface.go +++ b/server/einterfaces/mocks/ClusterInterface.go @@ -5,10 +5,10 @@ package mocks import ( - einterfaces "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + einterfaces "github.com/mattermost/mattermost-server/server/v8/einterfaces" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/server/v8/model" + model "github.com/mattermost/mattermost-server/server/public/model" ) // ClusterInterface is an autogenerated mock type for the ClusterInterface type diff --git a/server/channels/einterfaces/mocks/ClusterMessageHandler.go b/server/einterfaces/mocks/ClusterMessageHandler.go similarity index 93% rename from server/channels/einterfaces/mocks/ClusterMessageHandler.go rename to server/einterfaces/mocks/ClusterMessageHandler.go index f280d52a0b..3e01adcefa 100644 --- a/server/channels/einterfaces/mocks/ClusterMessageHandler.go +++ b/server/einterfaces/mocks/ClusterMessageHandler.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" ) diff --git a/server/channels/einterfaces/mocks/ComplianceInterface.go b/server/einterfaces/mocks/ComplianceInterface.go similarity index 95% rename from server/channels/einterfaces/mocks/ComplianceInterface.go rename to server/einterfaces/mocks/ComplianceInterface.go index 2cc9c75ccd..8558c76ff1 100644 --- a/server/channels/einterfaces/mocks/ComplianceInterface.go +++ b/server/einterfaces/mocks/ComplianceInterface.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" ) diff --git a/server/channels/einterfaces/mocks/DataRetentionInterface.go b/server/einterfaces/mocks/DataRetentionInterface.go similarity index 99% rename from server/channels/einterfaces/mocks/DataRetentionInterface.go rename to server/einterfaces/mocks/DataRetentionInterface.go index ff7f344445..f7ac4b2b4c 100644 --- a/server/channels/einterfaces/mocks/DataRetentionInterface.go +++ b/server/einterfaces/mocks/DataRetentionInterface.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" ) diff --git a/server/channels/einterfaces/mocks/DataRetentionJobInterface.go b/server/einterfaces/mocks/DataRetentionJobInterface.go similarity index 95% rename from server/channels/einterfaces/mocks/DataRetentionJobInterface.go rename to server/einterfaces/mocks/DataRetentionJobInterface.go index b18fd3e5d1..a734fa2346 100644 --- a/server/channels/einterfaces/mocks/DataRetentionJobInterface.go +++ b/server/einterfaces/mocks/DataRetentionJobInterface.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" ) diff --git a/server/channels/einterfaces/mocks/ElasticsearchAggregatorInterface.go b/server/einterfaces/mocks/ElasticsearchAggregatorInterface.go similarity index 95% rename from server/channels/einterfaces/mocks/ElasticsearchAggregatorInterface.go rename to server/einterfaces/mocks/ElasticsearchAggregatorInterface.go index 722d2b7ed5..6d838946d3 100644 --- a/server/channels/einterfaces/mocks/ElasticsearchAggregatorInterface.go +++ b/server/einterfaces/mocks/ElasticsearchAggregatorInterface.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" ) diff --git a/server/channels/einterfaces/mocks/ElasticsearchFixChannelIndexInterface.go b/server/einterfaces/mocks/ElasticsearchFixChannelIndexInterface.go similarity index 95% rename from server/channels/einterfaces/mocks/ElasticsearchFixChannelIndexInterface.go rename to server/einterfaces/mocks/ElasticsearchFixChannelIndexInterface.go index 08100b3cc4..42ee06a610 100644 --- a/server/channels/einterfaces/mocks/ElasticsearchFixChannelIndexInterface.go +++ b/server/einterfaces/mocks/ElasticsearchFixChannelIndexInterface.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" ) diff --git a/server/channels/einterfaces/mocks/ElasticsearchIndexerInterface.go b/server/einterfaces/mocks/ElasticsearchIndexerInterface.go similarity index 94% rename from server/channels/einterfaces/mocks/ElasticsearchIndexerInterface.go rename to server/einterfaces/mocks/ElasticsearchIndexerInterface.go index c68daf5c15..49ab7b1d2a 100644 --- a/server/channels/einterfaces/mocks/ElasticsearchIndexerInterface.go +++ b/server/einterfaces/mocks/ElasticsearchIndexerInterface.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" ) diff --git a/server/channels/einterfaces/mocks/IndexerJobInterface.go b/server/einterfaces/mocks/IndexerJobInterface.go similarity index 94% rename from server/channels/einterfaces/mocks/IndexerJobInterface.go rename to server/einterfaces/mocks/IndexerJobInterface.go index 639c245c3b..19b0f469f7 100644 --- a/server/channels/einterfaces/mocks/IndexerJobInterface.go +++ b/server/einterfaces/mocks/IndexerJobInterface.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" ) diff --git a/server/channels/einterfaces/mocks/LdapInterface.go b/server/einterfaces/mocks/LdapInterface.go similarity index 99% rename from server/channels/einterfaces/mocks/LdapInterface.go rename to server/einterfaces/mocks/LdapInterface.go index dd4d187884..7c6bdc8f31 100644 --- a/server/channels/einterfaces/mocks/LdapInterface.go +++ b/server/einterfaces/mocks/LdapInterface.go @@ -5,8 +5,8 @@ package mocks import ( + model "github.com/mattermost/mattermost-server/server/public/model" request "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/LdapSyncInterface.go b/server/einterfaces/mocks/LdapSyncInterface.go similarity index 95% rename from server/channels/einterfaces/mocks/LdapSyncInterface.go rename to server/einterfaces/mocks/LdapSyncInterface.go index 4ded7caa1d..8edcc94265 100644 --- a/server/channels/einterfaces/mocks/LdapSyncInterface.go +++ b/server/einterfaces/mocks/LdapSyncInterface.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" ) diff --git a/server/channels/einterfaces/mocks/LicenseInterface.go b/server/einterfaces/mocks/LicenseInterface.go similarity index 96% rename from server/channels/einterfaces/mocks/LicenseInterface.go rename to server/einterfaces/mocks/LicenseInterface.go index 29595d46f5..ad84699bcc 100644 --- a/server/channels/einterfaces/mocks/LicenseInterface.go +++ b/server/einterfaces/mocks/LicenseInterface.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" ) diff --git a/server/channels/einterfaces/mocks/MessageExportInterface.go b/server/einterfaces/mocks/MessageExportInterface.go similarity index 97% rename from server/channels/einterfaces/mocks/MessageExportInterface.go rename to server/einterfaces/mocks/MessageExportInterface.go index 770330ff89..ff64cce685 100644 --- a/server/channels/einterfaces/mocks/MessageExportInterface.go +++ b/server/einterfaces/mocks/MessageExportInterface.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/server/v8/model" + model "github.com/mattermost/mattermost-server/server/public/model" ) // MessageExportInterface is an autogenerated mock type for the MessageExportInterface type diff --git a/server/channels/einterfaces/mocks/MessageExportJobInterface.go b/server/einterfaces/mocks/MessageExportJobInterface.go similarity index 95% rename from server/channels/einterfaces/mocks/MessageExportJobInterface.go rename to server/einterfaces/mocks/MessageExportJobInterface.go index 9bad367308..f9beca7333 100644 --- a/server/channels/einterfaces/mocks/MessageExportJobInterface.go +++ b/server/einterfaces/mocks/MessageExportJobInterface.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" ) diff --git a/server/channels/einterfaces/mocks/MetricsInterface.go b/server/einterfaces/mocks/MetricsInterface.go similarity index 99% rename from server/channels/einterfaces/mocks/MetricsInterface.go rename to server/einterfaces/mocks/MetricsInterface.go index 06f568546a..f1b802aa34 100644 --- a/server/channels/einterfaces/mocks/MetricsInterface.go +++ b/server/einterfaces/mocks/MetricsInterface.go @@ -8,7 +8,7 @@ import ( logr "github.com/mattermost/logr/v2" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/server/v8/model" + model "github.com/mattermost/mattermost-server/server/public/model" sql "database/sql" ) diff --git a/server/channels/einterfaces/mocks/MfaInterface.go b/server/einterfaces/mocks/MfaInterface.go similarity index 97% rename from server/channels/einterfaces/mocks/MfaInterface.go rename to server/einterfaces/mocks/MfaInterface.go index 737da86700..da43bdac5a 100644 --- a/server/channels/einterfaces/mocks/MfaInterface.go +++ b/server/einterfaces/mocks/MfaInterface.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" ) diff --git a/server/channels/einterfaces/mocks/NotificationInterface.go b/server/einterfaces/mocks/NotificationInterface.go similarity index 96% rename from server/channels/einterfaces/mocks/NotificationInterface.go rename to server/einterfaces/mocks/NotificationInterface.go index 06a155c285..0376f10e8f 100644 --- a/server/channels/einterfaces/mocks/NotificationInterface.go +++ b/server/einterfaces/mocks/NotificationInterface.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" ) diff --git a/server/channels/einterfaces/mocks/OAuthProvider.go b/server/einterfaces/mocks/OAuthProvider.go similarity index 97% rename from server/channels/einterfaces/mocks/OAuthProvider.go rename to server/einterfaces/mocks/OAuthProvider.go index 3a8a563398..9d9dc543d4 100644 --- a/server/channels/einterfaces/mocks/OAuthProvider.go +++ b/server/einterfaces/mocks/OAuthProvider.go @@ -7,7 +7,7 @@ package mocks import ( io "io" - model "github.com/mattermost/mattermost-server/server/v8/model" + model "github.com/mattermost/mattermost-server/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/mocks/ResendInvitationEmailJobInterface.go b/server/einterfaces/mocks/ResendInvitationEmailJobInterface.go similarity index 93% rename from server/channels/einterfaces/mocks/ResendInvitationEmailJobInterface.go rename to server/einterfaces/mocks/ResendInvitationEmailJobInterface.go index 20853c78eb..969e2485fe 100644 --- a/server/channels/einterfaces/mocks/ResendInvitationEmailJobInterface.go +++ b/server/einterfaces/mocks/ResendInvitationEmailJobInterface.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" ) diff --git a/server/channels/einterfaces/mocks/SamlInterface.go b/server/einterfaces/mocks/SamlInterface.go similarity index 98% rename from server/channels/einterfaces/mocks/SamlInterface.go rename to server/einterfaces/mocks/SamlInterface.go index e7200b4ccf..6fe5d2a30a 100644 --- a/server/channels/einterfaces/mocks/SamlInterface.go +++ b/server/einterfaces/mocks/SamlInterface.go @@ -5,8 +5,8 @@ package mocks import ( + model "github.com/mattermost/mattermost-server/server/public/model" request "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - model "github.com/mattermost/mattermost-server/server/v8/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/einterfaces/notification.go b/server/einterfaces/notification.go similarity index 84% rename from server/channels/einterfaces/notification.go rename to server/einterfaces/notification.go index 65d933d2dd..0759b8ea3f 100644 --- a/server/channels/einterfaces/notification.go +++ b/server/einterfaces/notification.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type NotificationInterface interface { diff --git a/server/channels/einterfaces/oauthproviders.go b/server/einterfaces/oauthproviders.go similarity index 92% rename from server/channels/einterfaces/oauthproviders.go rename to server/einterfaces/oauthproviders.go index a095921e5b..bf58d71f98 100644 --- a/server/channels/einterfaces/oauthproviders.go +++ b/server/einterfaces/oauthproviders.go @@ -6,7 +6,7 @@ package einterfaces import ( "io" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type OAuthProvider interface { diff --git a/server/channels/einterfaces/saml.go b/server/einterfaces/saml.go similarity index 90% rename from server/channels/einterfaces/saml.go rename to server/einterfaces/saml.go index 81fab6b17b..72404b8257 100644 --- a/server/channels/einterfaces/saml.go +++ b/server/einterfaces/saml.go @@ -4,8 +4,8 @@ package einterfaces import ( + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - "github.com/mattermost/mattermost-server/server/v8/model" ) type SamlInterface interface { diff --git a/server/go.mod b/server/go.mod index 20e82eb78b..7880c15e20 100644 --- a/server/go.mod +++ b/server/go.mod @@ -15,7 +15,6 @@ require ( github.com/dgryski/dgoogauth v0.0.0-20190221195224-5a805980a5f3 github.com/disintegration/imaging v1.6.2 github.com/dyatlov/go-opengraph/opengraph v0.0.0-20220524092352-606d7b1e5f8a - github.com/francoispqt/gojay v1.2.13 github.com/fsnotify/fsnotify v1.6.0 github.com/getsentry/sentry-go v0.20.0 github.com/go-sql-driver/mysql v1.7.0 @@ -31,8 +30,6 @@ require ( github.com/graph-gophers/dataloader/v7 v7.1.0 github.com/graph-gophers/graphql-go v1.5.1-0.20230110080634-edea822f558a github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c - github.com/hashicorp/go-hclog v1.5.0 - github.com/hashicorp/go-plugin v1.4.9 github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056 github.com/jmoiron/sqlx v1.3.5 github.com/krolaw/zipstream v0.0.0-20180621105154-0a2661891f94 @@ -40,8 +37,8 @@ require ( github.com/lib/pq v1.10.7 github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404 github.com/mattermost/gziphandler v0.0.1 - github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d github.com/mattermost/logr/v2 v2.0.16 + github.com/mattermost/mattermost-server/server/public v0.0.0-00010101000000-000000000000 github.com/mattermost/morph v1.0.5-0.20221115094356-4c18a75b1f5e github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0 github.com/mattermost/squirrel v0.2.0 @@ -53,7 +50,6 @@ require ( github.com/oklog/run v1.1.0 github.com/oov/psd v0.0.0-20220121172623-5db5eafcecbb github.com/opentracing/opentracing-go v1.2.0 - github.com/pborman/uuid v1.2.1 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.14.0 github.com/reflog/dateconstraints v0.2.1 @@ -81,7 +77,6 @@ require ( golang.org/x/net v0.9.0 golang.org/x/oauth2 v0.7.0 golang.org/x/sync v0.1.0 - golang.org/x/text v0.9.0 golang.org/x/tools v0.8.0 gopkg.in/guregu/null.v4 v4.0.0 gopkg.in/mail.v2 v2.3.1 @@ -124,6 +119,7 @@ require ( github.com/fatih/color v1.15.0 // indirect github.com/fatih/set v0.2.1 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect + github.com/francoispqt/gojay v1.2.13 // indirect github.com/gigawattio/window v0.0.0-20180317192513-0f5467e35573 // indirect github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect github.com/go-resty/resty/v2 v2.7.0 // indirect @@ -134,6 +130,8 @@ require ( github.com/google/uuid v1.3.0 // indirect github.com/gopherjs/gopherjs v1.17.2 // indirect github.com/gorilla/css v1.0.0 // indirect + github.com/hashicorp/go-hclog v1.5.0 // indirect + github.com/hashicorp/go-plugin v1.4.9 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/yamux v0.1.1 // indirect @@ -148,6 +146,7 @@ require ( github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect github.com/levigross/exp-html v0.0.0-20120902181939-8df60c69a8f5 // indirect github.com/magiconair/properties v1.8.7 // indirect + github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.18 // indirect github.com/mattn/go-runewidth v0.0.14 // indirect @@ -161,6 +160,7 @@ require ( github.com/nwaples/rardecode v1.1.3 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/otiai10/gosseract/v2 v2.4.0 // indirect + github.com/pborman/uuid v1.2.1 // indirect github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.7 // indirect github.com/philhofer/fwd v1.1.2 // indirect @@ -195,6 +195,7 @@ require ( go.uber.org/atomic v1.10.0 // indirect golang.org/x/mod v0.10.0 // indirect golang.org/x/sys v0.7.0 // indirect + golang.org/x/text v0.9.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect google.golang.org/grpc v1.54.0 // indirect @@ -224,3 +225,5 @@ exclude ( github.com/dyatlov/go-opengraph v0.0.0-20210112100619-dae8665a5b09 github.com/willf/bitset v1.2.0 ) + +replace github.com/mattermost/mattermost-server/server/public => ./public diff --git a/server/platform/services/awsmeter/awsmeter.go b/server/platform/services/awsmeter/awsmeter.go index 7d506ba183..784adf0546 100644 --- a/server/platform/services/awsmeter/awsmeter.go +++ b/server/platform/services/awsmeter/awsmeter.go @@ -17,9 +17,9 @@ import ( "github.com/aws/aws-sdk-go/service/marketplacemetering/marketplacemeteringiface" "github.com/pkg/errors" + "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/store" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type AwsMeter struct { diff --git a/server/platform/services/awsmeter/awsmeter_test.go b/server/platform/services/awsmeter/awsmeter_test.go index 2fbbdc8284..a68d120c2c 100644 --- a/server/platform/services/awsmeter/awsmeter_test.go +++ b/server/platform/services/awsmeter/awsmeter_test.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/public/plugin/plugintest/mock" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) type mockMarketplaceMeteringClient struct { diff --git a/server/platform/services/cache/cache.go b/server/platform/services/cache/cache.go index 60d003e93b..771825b7a4 100644 --- a/server/platform/services/cache/cache.go +++ b/server/platform/services/cache/cache.go @@ -7,7 +7,7 @@ import ( "errors" "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // ErrKeyNotFound is the error when the given key is not found diff --git a/server/platform/services/cache/lru.go b/server/platform/services/cache/lru.go index ba7d6f98f2..1bebedc16b 100644 --- a/server/platform/services/cache/lru.go +++ b/server/platform/services/cache/lru.go @@ -11,7 +11,7 @@ import ( "github.com/tinylib/msgp/msgp" "github.com/vmihailenco/msgpack/v5" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // LRU is a thread-safe fixed size LRU cache. diff --git a/server/platform/services/cache/lru_striped.go b/server/platform/services/cache/lru_striped.go index aecd89ffa7..030878c9e9 100644 --- a/server/platform/services/cache/lru_striped.go +++ b/server/platform/services/cache/lru_striped.go @@ -10,7 +10,7 @@ import ( "github.com/cespare/xxhash/v2" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // LRUStriped keeps LRU caches in buckets in order to lower mutex contention. diff --git a/server/platform/services/cache/lru_striped_test.go b/server/platform/services/cache/lru_striped_test.go index 030b010e55..0aeeb4f99b 100644 --- a/server/platform/services/cache/lru_striped_test.go +++ b/server/platform/services/cache/lru_striped_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func makeLRUPredictableTestData(num int) [][2]string { diff --git a/server/platform/services/cache/lru_test.go b/server/platform/services/cache/lru_test.go index ecf03e1446..4d536153b9 100644 --- a/server/platform/services/cache/lru_test.go +++ b/server/platform/services/cache/lru_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestLRU(t *testing.T) { diff --git a/server/platform/services/cache/provider.go b/server/platform/services/cache/provider.go index 586a1265d8..d6767b5e91 100644 --- a/server/platform/services/cache/provider.go +++ b/server/platform/services/cache/provider.go @@ -6,7 +6,7 @@ package cache import ( "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // CacheOptions contains options for initializing a cache diff --git a/server/platform/services/cache/provider_test.go b/server/platform/services/cache/provider_test.go index af5f86cbeb..4dd3ddca78 100644 --- a/server/platform/services/cache/provider_test.go +++ b/server/platform/services/cache/provider_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestNewCache(t *testing.T) { diff --git a/server/platform/services/configservice/configservice.go b/server/platform/services/configservice/configservice.go index 82a4cc106b..c9eabab5f8 100644 --- a/server/platform/services/configservice/configservice.go +++ b/server/platform/services/configservice/configservice.go @@ -4,7 +4,7 @@ package configservice import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // An interface representing something that contains a Config, such as the app.App struct diff --git a/server/platform/services/docextractor/combine.go b/server/platform/services/docextractor/combine.go index 209e36cbba..02677b18f7 100644 --- a/server/platform/services/docextractor/combine.go +++ b/server/platform/services/docextractor/combine.go @@ -6,7 +6,7 @@ package docextractor import ( "io" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) type combineExtractor struct { diff --git a/server/platform/services/imageproxy/atmos_camo_test.go b/server/platform/services/imageproxy/atmos_camo_test.go index aefd882a02..6a6f4dd4a3 100644 --- a/server/platform/services/imageproxy/atmos_camo_test.go +++ b/server/platform/services/imageproxy/atmos_camo_test.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/utils/testutils" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" ) diff --git a/server/platform/services/imageproxy/imageproxy.go b/server/platform/services/imageproxy/imageproxy.go index 87a7f2a6d4..834f70444c 100644 --- a/server/platform/services/imageproxy/imageproxy.go +++ b/server/platform/services/imageproxy/imageproxy.go @@ -11,10 +11,10 @@ import ( "strings" "sync" - "github.com/mattermost/mattermost-server/server/v8/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/services/configservice" "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) var ErrNotEnabled = Error{errors.New("imageproxy.ImageProxy: image proxy not enabled")} diff --git a/server/platform/services/imageproxy/local.go b/server/platform/services/imageproxy/local.go index 4a45079260..78f73c691c 100644 --- a/server/platform/services/imageproxy/local.go +++ b/server/platform/services/imageproxy/local.go @@ -19,7 +19,7 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) var imageContentTypes = []string{ diff --git a/server/platform/services/imageproxy/local_test.go b/server/platform/services/imageproxy/local_test.go index e97bad1bcd..48b6a32582 100644 --- a/server/platform/services/imageproxy/local_test.go +++ b/server/platform/services/imageproxy/local_test.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/utils/testutils" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" ) diff --git a/server/platform/services/marketplace/client.go b/server/platform/services/marketplace/client.go index 3003952792..c1158c4589 100644 --- a/server/platform/services/marketplace/client.go +++ b/server/platform/services/marketplace/client.go @@ -12,7 +12,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" ) diff --git a/server/platform/services/remotecluster/invitation.go b/server/platform/services/remotecluster/invitation.go index 3667470038..4621eea8d8 100644 --- a/server/platform/services/remotecluster/invitation.go +++ b/server/platform/services/remotecluster/invitation.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // AcceptInvitation is called when accepting an invitation to connect with a remote cluster. diff --git a/server/platform/services/remotecluster/mocks_test.go b/server/platform/services/remotecluster/mocks_test.go index 83896b343b..5a8c6fe076 100644 --- a/server/platform/services/remotecluster/mocks_test.go +++ b/server/platform/services/remotecluster/mocks_test.go @@ -6,12 +6,12 @@ package remotecluster import ( "context" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "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" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/server/v8/einterfaces" ) type mockServer struct { diff --git a/server/platform/services/remotecluster/ping.go b/server/platform/services/remotecluster/ping.go index 18d3f6f196..f5f9d32198 100644 --- a/server/platform/services/remotecluster/ping.go +++ b/server/platform/services/remotecluster/ping.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "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" ) // pingLoop periodically sends a ping to all remote clusters. diff --git a/server/platform/services/remotecluster/ping_test.go b/server/platform/services/remotecluster/ping_test.go index 8e60cc98f0..57c2db30dd 100644 --- a/server/platform/services/remotecluster/ping_test.go +++ b/server/platform/services/remotecluster/ping_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/require" "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) const ( diff --git a/server/platform/services/remotecluster/recv.go b/server/platform/services/remotecluster/recv.go index 39c30aab84..f2cff44c7d 100644 --- a/server/platform/services/remotecluster/recv.go +++ b/server/platform/services/remotecluster/recv.go @@ -6,8 +6,8 @@ package remotecluster import ( "fmt" - "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" ) // ReceiveIncomingMsg is called by the Rest API layer, or websocket layer (future), when a Remote Cluster diff --git a/server/platform/services/remotecluster/send_test.go b/server/platform/services/remotecluster/send_test.go index 489bef0a74..abfe3da343 100644 --- a/server/platform/services/remotecluster/send_test.go +++ b/server/platform/services/remotecluster/send_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/require" "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) const ( diff --git a/server/platform/services/remotecluster/sendfile.go b/server/platform/services/remotecluster/sendfile.go index dec27083d7..c5d1a7ca0f 100644 --- a/server/platform/services/remotecluster/sendfile.go +++ b/server/platform/services/remotecluster/sendfile.go @@ -13,9 +13,9 @@ import ( "path" "time" - "github.com/mattermost/mattermost-server/server/v8/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" ) type SendFileResultFunc func(us *model.UploadSession, rc *model.RemoteCluster, resp *Response, err error) diff --git a/server/platform/services/remotecluster/sendmsg.go b/server/platform/services/remotecluster/sendmsg.go index d31f172d28..fcad9e4303 100644 --- a/server/platform/services/remotecluster/sendmsg.go +++ b/server/platform/services/remotecluster/sendmsg.go @@ -17,8 +17,8 @@ import ( "github.com/wiggin77/merror" - "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 SendMsgResultFunc func(msg model.RemoteClusterMsg, rc *model.RemoteCluster, resp *Response, err error) diff --git a/server/platform/services/remotecluster/sendprofileImage.go b/server/platform/services/remotecluster/sendprofileImage.go index 6a852111ea..02fd90622f 100644 --- a/server/platform/services/remotecluster/sendprofileImage.go +++ b/server/platform/services/remotecluster/sendprofileImage.go @@ -14,8 +14,8 @@ import ( "path" "time" - "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 SendProfileImageResultFunc func(userId string, rc *model.RemoteCluster, resp *Response, err error) diff --git a/server/platform/services/remotecluster/sendprofileImage_test.go b/server/platform/services/remotecluster/sendprofileImage_test.go index 7c09570aac..c1770f1746 100644 --- a/server/platform/services/remotecluster/sendprofileImage_test.go +++ b/server/platform/services/remotecluster/sendprofileImage_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) const ( diff --git a/server/platform/services/remotecluster/service.go b/server/platform/services/remotecluster/service.go index ee6fb68ebe..4d44a94d2f 100644 --- a/server/platform/services/remotecluster/service.go +++ b/server/platform/services/remotecluster/service.go @@ -10,10 +10,10 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/server/v8/channels/einterfaces" + "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/store" - "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/einterfaces" ) const ( diff --git a/server/platform/services/remotecluster/service_test.go b/server/platform/services/remotecluster/service_test.go index 7b543757cc..26404f12e3 100644 --- a/server/platform/services/remotecluster/service_test.go +++ b/server/platform/services/remotecluster/service_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestService_AddTopicListener(t *testing.T) { diff --git a/server/platform/services/searchengine/bleveengine/bleve.go b/server/platform/services/searchengine/bleveengine/bleve.go index 1b2efc7944..5a422baa1b 100644 --- a/server/platform/services/searchengine/bleveengine/bleve.go +++ b/server/platform/services/searchengine/bleveengine/bleve.go @@ -17,8 +17,8 @@ import ( "github.com/blevesearch/bleve/v2/analysis/analyzer/standard" "github.com/blevesearch/bleve/v2/mapping" - "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 ( diff --git a/server/platform/services/searchengine/bleveengine/bleve_test.go b/server/platform/services/searchengine/bleveengine/bleve_test.go index 128db17e48..0f08707e9b 100644 --- a/server/platform/services/searchengine/bleveengine/bleve_test.go +++ b/server/platform/services/searchengine/bleveengine/bleve_test.go @@ -11,12 +11,12 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/store/searchlayer" "github.com/mattermost/mattermost-server/server/v8/channels/store/searchtest" "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" "github.com/mattermost/mattermost-server/server/v8/channels/testlib" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" ) diff --git a/server/platform/services/searchengine/bleveengine/common.go b/server/platform/services/searchengine/bleveengine/common.go index fed7992bc8..f99509fadf 100644 --- a/server/platform/services/searchengine/bleveengine/common.go +++ b/server/platform/services/searchengine/bleveengine/common.go @@ -6,7 +6,7 @@ package bleveengine import ( "strings" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" ) diff --git a/server/platform/services/searchengine/bleveengine/indexer/indexing_job.go b/server/platform/services/searchengine/bleveengine/indexer/indexing_job.go index 1dbdfc9a44..b2bcdaac12 100644 --- a/server/platform/services/searchengine/bleveengine/indexer/indexing_job.go +++ b/server/platform/services/searchengine/bleveengine/indexer/indexing_job.go @@ -10,10 +10,10 @@ import ( "sync/atomic" "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/jobs" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/bleveengine" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/platform/services/searchengine/bleveengine/indexer/indexing_job_test.go b/server/platform/services/searchengine/bleveengine/indexer/indexing_job_test.go index afe96b5283..9a053de0e7 100644 --- a/server/platform/services/searchengine/bleveengine/indexer/indexing_job_test.go +++ b/server/platform/services/searchengine/bleveengine/indexer/indexing_job_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/jobs" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/bleveengine" ) diff --git a/server/platform/services/searchengine/bleveengine/search.go b/server/platform/services/searchengine/bleveengine/search.go index 5c993c7fde..95c9209c6c 100644 --- a/server/platform/services/searchengine/bleveengine/search.go +++ b/server/platform/services/searchengine/bleveengine/search.go @@ -10,8 +10,8 @@ import ( "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/search/query" - "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 DeletePostsBatchSize = 500 diff --git a/server/platform/services/searchengine/bleveengine/testlib.go b/server/platform/services/searchengine/bleveengine/testlib.go index 73b98b0d62..8cae337b13 100644 --- a/server/platform/services/searchengine/bleveengine/testlib.go +++ b/server/platform/services/searchengine/bleveengine/testlib.go @@ -6,7 +6,7 @@ package bleveengine import ( "fmt" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func createPost(userId string, channelId string) *model.Post { diff --git a/server/platform/services/searchengine/interface.go b/server/platform/services/searchengine/interface.go index 2c2cf3f726..449b29033d 100644 --- a/server/platform/services/searchengine/interface.go +++ b/server/platform/services/searchengine/interface.go @@ -6,7 +6,7 @@ package searchengine import ( "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type SearchEngineInterface interface { diff --git a/server/platform/services/searchengine/mocks/SearchEngineInterface.go b/server/platform/services/searchengine/mocks/SearchEngineInterface.go index bed0ef16f2..bb83e573a5 100644 --- a/server/platform/services/searchengine/mocks/SearchEngineInterface.go +++ b/server/platform/services/searchengine/mocks/SearchEngineInterface.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" time "time" diff --git a/server/platform/services/searchengine/searchengine.go b/server/platform/services/searchengine/searchengine.go index a80defd6f3..1fd77dec19 100644 --- a/server/platform/services/searchengine/searchengine.go +++ b/server/platform/services/searchengine/searchengine.go @@ -4,7 +4,7 @@ package searchengine import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func NewBroker(cfg *model.Config) *Broker { diff --git a/server/platform/services/searchengine/searchengine_test.go b/server/platform/services/searchengine/searchengine_test.go index 6672b7c575..7139ff408e 100644 --- a/server/platform/services/searchengine/searchengine_test.go +++ b/server/platform/services/searchengine/searchengine_test.go @@ -6,7 +6,7 @@ package searchengine import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/mocks" "github.com/stretchr/testify/assert" ) diff --git a/server/platform/services/sharedchannel/attachment.go b/server/platform/services/sharedchannel/attachment.go index 951a821f8a..ee365afdde 100644 --- a/server/platform/services/sharedchannel/attachment.go +++ b/server/platform/services/sharedchannel/attachment.go @@ -10,10 +10,10 @@ import ( "fmt" "sync" + "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" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // postsToAttachments returns the file attachments for a slice of posts that need to be synchronized. diff --git a/server/platform/services/sharedchannel/channelinvite.go b/server/platform/services/sharedchannel/channelinvite.go index 041434ba4e..74e458b2ae 100644 --- a/server/platform/services/sharedchannel/channelinvite.go +++ b/server/platform/services/sharedchannel/channelinvite.go @@ -9,10 +9,10 @@ import ( "fmt" "strings" + "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" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) // channelInviteMsg represents an invitation for a remote cluster to start sharing a channel. diff --git a/server/platform/services/sharedchannel/channelinvite_test.go b/server/platform/services/sharedchannel/channelinvite_test.go index 74e55d68e7..20abcaa15e 100644 --- a/server/platform/services/sharedchannel/channelinvite_test.go +++ b/server/platform/services/sharedchannel/channelinvite_test.go @@ -13,10 +13,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/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "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/plugintest/mock" ) func TestOnReceiveChannelInvite(t *testing.T) { diff --git a/server/platform/services/sharedchannel/mock_AppIface_test.go b/server/platform/services/sharedchannel/mock_AppIface_test.go index a6f67f82ac..a81cef48fe 100644 --- a/server/platform/services/sharedchannel/mock_AppIface_test.go +++ b/server/platform/services/sharedchannel/mock_AppIface_test.go @@ -8,7 +8,7 @@ import ( filestore "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/server/v8/model" + model "github.com/mattermost/mattermost-server/server/public/model" request "github.com/mattermost/mattermost-server/server/v8/channels/app/request" ) diff --git a/server/platform/services/sharedchannel/mock_ServerIface_test.go b/server/platform/services/sharedchannel/mock_ServerIface_test.go index 214943a098..5a30e16d66 100644 --- a/server/platform/services/sharedchannel/mock_ServerIface_test.go +++ b/server/platform/services/sharedchannel/mock_ServerIface_test.go @@ -5,10 +5,10 @@ package sharedchannel import ( - mlog "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + mlog "github.com/mattermost/mattermost-server/server/public/shared/mlog" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/server/v8/model" + model "github.com/mattermost/mattermost-server/server/public/model" remotecluster "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" diff --git a/server/platform/services/sharedchannel/msg.go b/server/platform/services/sharedchannel/msg.go index a7f3b46665..1d38d38b59 100644 --- a/server/platform/services/sharedchannel/msg.go +++ b/server/platform/services/sharedchannel/msg.go @@ -6,7 +6,7 @@ package sharedchannel import ( "encoding/json" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // syncMsg represents a change in content (post add/edit/delete, reaction add/remove, users). diff --git a/server/platform/services/sharedchannel/permalink.go b/server/platform/services/sharedchannel/permalink.go index 5e4cfd5fcd..f491e81c4a 100644 --- a/server/platform/services/sharedchannel/permalink.go +++ b/server/platform/services/sharedchannel/permalink.go @@ -9,9 +9,9 @@ import ( "regexp" "strings" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "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/i18n" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) var ( diff --git a/server/platform/services/sharedchannel/permalink_test.go b/server/platform/services/sharedchannel/permalink_test.go index 4728d79daf..e278b60901 100644 --- a/server/platform/services/sharedchannel/permalink_test.go +++ b/server/platform/services/sharedchannel/permalink_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/assert" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" "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/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestProcessPermalinkToRemote(t *testing.T) { diff --git a/server/platform/services/sharedchannel/service.go b/server/platform/services/sharedchannel/service.go index fdf0c7a9eb..bd1cce750e 100644 --- a/server/platform/services/sharedchannel/service.go +++ b/server/platform/services/sharedchannel/service.go @@ -10,12 +10,12 @@ import ( "sync" "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/request" "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) const ( diff --git a/server/platform/services/sharedchannel/sync_recv.go b/server/platform/services/sharedchannel/sync_recv.go index 0f5c493084..b0a79733cd 100644 --- a/server/platform/services/sharedchannel/sync_recv.go +++ b/server/platform/services/sharedchannel/sync_recv.go @@ -11,10 +11,10 @@ import ( "strconv" "strings" + "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" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func (scs *Service) onReceiveSyncMessage(msg model.RemoteClusterMsg, rc *model.RemoteCluster, response *remotecluster.Response) error { diff --git a/server/platform/services/sharedchannel/sync_send.go b/server/platform/services/sharedchannel/sync_send.go index 883a4c73d9..1a3e67c4bb 100644 --- a/server/platform/services/sharedchannel/sync_send.go +++ b/server/platform/services/sharedchannel/sync_send.go @@ -8,11 +8,11 @@ import ( "fmt" "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/request" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type syncTask struct { diff --git a/server/platform/services/sharedchannel/sync_send_remote.go b/server/platform/services/sharedchannel/sync_send_remote.go index d2886ab572..167c4a25b3 100644 --- a/server/platform/services/sharedchannel/sync_send_remote.go +++ b/server/platform/services/sharedchannel/sync_send_remote.go @@ -11,10 +11,10 @@ import ( "github.com/wiggin77/merror" + "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" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type sendSyncMsgResultFunc func(syncResp SyncResponse, err error) diff --git a/server/platform/services/sharedchannel/util.go b/server/platform/services/sharedchannel/util.go index e21abd5144..b4ccb07c32 100644 --- a/server/platform/services/sharedchannel/util.go +++ b/server/platform/services/sharedchannel/util.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // fixMention replaces any mentions in a post for the user with the user's real username. diff --git a/server/platform/services/slackimport/converters.go b/server/platform/services/slackimport/converters.go index 041759f778..f3b1c66e8c 100644 --- a/server/platform/services/slackimport/converters.go +++ b/server/platform/services/slackimport/converters.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) func slackConvertTimeStamp(ts string) int64 { diff --git a/server/platform/services/slackimport/parsers.go b/server/platform/services/slackimport/parsers.go index fa3b49bd32..66689420fe 100644 --- a/server/platform/services/slackimport/parsers.go +++ b/server/platform/services/slackimport/parsers.go @@ -7,8 +7,8 @@ import ( "encoding/json" "io" - "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 slackParseChannels(data io.Reader, channelType model.ChannelType) ([]slackChannel, error) { diff --git a/server/platform/services/slackimport/slackimport.go b/server/platform/services/slackimport/slackimport.go index bddadb7db6..fd29c82990 100644 --- a/server/platform/services/slackimport/slackimport.go +++ b/server/platform/services/slackimport/slackimport.go @@ -18,12 +18,12 @@ import ( "time" "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/request" "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/shared/i18n" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) type slackChannel struct { diff --git a/server/platform/services/slackimport/slackimport_test.go b/server/platform/services/slackimport/slackimport_test.go index fd4ef1e4ea..8611a6e2fb 100644 --- a/server/platform/services/slackimport/slackimport_test.go +++ b/server/platform/services/slackimport/slackimport_test.go @@ -12,10 +12,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/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" ) func TestSlackConvertTimeStamp(t *testing.T) { diff --git a/server/platform/services/telemetry/mocks/ServerIface.go b/server/platform/services/telemetry/mocks/ServerIface.go index dcc8dfc19b..f480a8fe27 100644 --- a/server/platform/services/telemetry/mocks/ServerIface.go +++ b/server/platform/services/telemetry/mocks/ServerIface.go @@ -10,9 +10,9 @@ import ( httpservice "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/server/v8/model" + model "github.com/mattermost/mattermost-server/server/public/model" - plugin "github.com/mattermost/mattermost-server/server/v8/plugin" + plugin "github.com/mattermost/mattermost-server/server/public/plugin" product "github.com/mattermost/mattermost-server/server/v8/channels/product" ) diff --git a/server/platform/services/telemetry/telemetry.go b/server/platform/services/telemetry/telemetry.go index e260cdfa90..6504c423b4 100644 --- a/server/platform/services/telemetry/telemetry.go +++ b/server/platform/services/telemetry/telemetry.go @@ -14,15 +14,15 @@ import ( rudder "github.com/rudderlabs/analytics-go" + "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" "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/httpservice" "github.com/mattermost/mattermost-server/server/v8/platform/services/marketplace" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin" ) const ( diff --git a/server/platform/services/telemetry/telemetry_test.go b/server/platform/services/telemetry/telemetry_test.go index 52ab021bda..a17f10e996 100644 --- a/server/platform/services/telemetry/telemetry_test.go +++ b/server/platform/services/telemetry/telemetry_test.go @@ -21,16 +21,16 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin/plugintest" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "github.com/mattermost/mattermost-server/server/v8/channels/product" storeMocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" "github.com/mattermost/mattermost-server/server/v8/config" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" "github.com/mattermost/mattermost-server/server/v8/platform/services/telemetry/mocks" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest" ) type FakeConfigService struct { diff --git a/server/platform/services/tracing/tracing.go b/server/platform/services/tracing/tracing.go index f65c5d43f5..27269d551d 100644 --- a/server/platform/services/tracing/tracing.go +++ b/server/platform/services/tracing/tracing.go @@ -14,7 +14,7 @@ import ( "github.com/uber/jaeger-client-go/zipkin" "github.com/uber/jaeger-lib/metrics" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) // Tracer is a wrapper around Jaeger OpenTracing client, used to properly de-initialize jaeger on exit diff --git a/server/platform/services/upgrader/upgrader_linux.go b/server/platform/services/upgrader/upgrader_linux.go index df51c6321c..e164e46bc1 100644 --- a/server/platform/services/upgrader/upgrader_linux.go +++ b/server/platform/services/upgrader/upgrader_linux.go @@ -24,8 +24,8 @@ import ( "github.com/pkg/errors" "golang.org/x/crypto/openpgp" //nolint:staticcheck - "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" ) //go:embed pubkey.gpg diff --git a/server/platform/services/upgrader/upgrader_linux_test.go b/server/platform/services/upgrader/upgrader_linux_test.go index 49b5d48365..1ac2797c13 100644 --- a/server/platform/services/upgrader/upgrader_linux_test.go +++ b/server/platform/services/upgrader/upgrader_linux_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestCanIUpgradeToE0(t *testing.T) { diff --git a/server/platform/shared/driver/conn.go b/server/platform/shared/driver/conn.go index 2a567c19db..cbbe86d04c 100644 --- a/server/platform/shared/driver/conn.go +++ b/server/platform/shared/driver/conn.go @@ -7,7 +7,7 @@ import ( "context" "database/sql/driver" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) // Conn is a DB driver conn implementation diff --git a/server/platform/shared/driver/driver.go b/server/platform/shared/driver/driver.go index a76903ba22..982321d793 100644 --- a/server/platform/shared/driver/driver.go +++ b/server/platform/shared/driver/driver.go @@ -12,7 +12,7 @@ import ( "context" "database/sql/driver" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) var ( diff --git a/server/platform/shared/driver/objects.go b/server/platform/shared/driver/objects.go index c07c8f7ad6..5827e8900e 100644 --- a/server/platform/shared/driver/objects.go +++ b/server/platform/shared/driver/objects.go @@ -7,7 +7,7 @@ import ( "context" "database/sql/driver" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type wrapperTx struct { diff --git a/server/platform/shared/filestore/filesstore.go b/server/platform/shared/filestore/filesstore.go index cc6ce7c8bd..4578e77688 100644 --- a/server/platform/shared/filestore/filesstore.go +++ b/server/platform/shared/filestore/filesstore.go @@ -8,7 +8,7 @@ import ( "io" "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/pkg/errors" ) diff --git a/server/platform/shared/filestore/filesstore_test.go b/server/platform/shared/filestore/filesstore_test.go index 0c2358e1bf..6f7bfe1c0a 100644 --- a/server/platform/shared/filestore/filesstore_test.go +++ b/server/platform/shared/filestore/filesstore_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/xtgo/uuid" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) func randomString() string { diff --git a/server/platform/shared/filestore/localstore.go b/server/platform/shared/filestore/localstore.go index 7c607bdab3..2c181c5413 100644 --- a/server/platform/shared/filestore/localstore.go +++ b/server/platform/shared/filestore/localstore.go @@ -12,7 +12,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) const ( diff --git a/server/platform/shared/filestore/s3store.go b/server/platform/shared/filestore/s3store.go index 9d2eacfffa..f382932f79 100644 --- a/server/platform/shared/filestore/s3store.go +++ b/server/platform/shared/filestore/s3store.go @@ -19,7 +19,7 @@ import ( "github.com/minio/minio-go/v7/pkg/encrypt" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) // S3FileBackend contains all necessary information to communicate with diff --git a/server/platform/shared/filestore/s3store_test.go b/server/platform/shared/filestore/s3store_test.go index f71dfb6572..b780f8e61e 100644 --- a/server/platform/shared/filestore/s3store_test.go +++ b/server/platform/shared/filestore/s3store_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" s3 "github.com/minio/minio-go/v7" "github.com/stretchr/testify/require" ) diff --git a/server/platform/shared/mail/mail.go b/server/platform/shared/mail/mail.go index 02944684e4..317e043251 100644 --- a/server/platform/shared/mail/mail.go +++ b/server/platform/shared/mail/mail.go @@ -18,8 +18,8 @@ import ( "github.com/pkg/errors" gomail "gopkg.in/mail.v2" - "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 ( diff --git a/server/platform/shared/mfa/mfa_test.go b/server/platform/shared/mfa/mfa_test.go index e90c370569..cd031532b3 100644 --- a/server/platform/shared/mfa/mfa_test.go +++ b/server/platform/shared/mfa/mfa_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/plugin/plugintest/mock" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock" ) func TestGenerateSecret(t *testing.T) { diff --git a/server/playbooks/client/client.go b/server/playbooks/client/client.go index e095c13323..e86b84573e 100644 --- a/server/playbooks/client/client.go +++ b/server/playbooks/client/client.go @@ -16,7 +16,7 @@ import ( "strconv" "github.com/google/go-querystring/query" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/pkg/errors" "golang.org/x/oauth2" ) diff --git a/server/playbooks/client/doc_test.go b/server/playbooks/client/doc_test.go index ab876bbebd..5da0e6e9f1 100644 --- a/server/playbooks/client/doc_test.go +++ b/server/playbooks/client/doc_test.go @@ -8,7 +8,7 @@ import ( "fmt" "log" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/client" ) diff --git a/server/playbooks/client/playbook_runs_test.go b/server/playbooks/client/playbook_runs_test.go index 8f3489c866..c865769cb3 100644 --- a/server/playbooks/client/playbook_runs_test.go +++ b/server/playbooks/client/playbook_runs_test.go @@ -8,7 +8,7 @@ import ( "fmt" "log" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/client" ) diff --git a/server/playbooks/client/playbooks_test.go b/server/playbooks/client/playbooks_test.go index 863b2ff652..8c5a060f15 100644 --- a/server/playbooks/client/playbooks_test.go +++ b/server/playbooks/client/playbooks_test.go @@ -8,7 +8,7 @@ import ( "fmt" "log" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/client" ) diff --git a/server/playbooks/product/api_adapter.go b/server/playbooks/product/api_adapter.go index 7a91df438e..ca8664a031 100644 --- a/server/playbooks/product/api_adapter.go +++ b/server/playbooks/product/api_adapter.go @@ -14,10 +14,10 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" + "github.com/mattermost/mattermost-server/server/public/model" + mm_model "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/request" - "github.com/mattermost/mattermost-server/server/v8/model" - mm_model "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" ) diff --git a/server/playbooks/product/logrus.go b/server/playbooks/product/logrus.go index 0090d979c2..71f6ed72bf 100644 --- a/server/playbooks/product/logrus.go +++ b/server/playbooks/product/logrus.go @@ -8,7 +8,7 @@ import ( "io" "github.com/mattermost/logr/v2" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/product/playbooks_product.go b/server/playbooks/product/playbooks_product.go index 96ee88333a..14018a4418 100644 --- a/server/playbooks/product/playbooks_product.go +++ b/server/playbooks/product/playbooks_product.go @@ -10,10 +10,11 @@ import ( "strings" "time" + "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" mmapp "github.com/mattermost/mattermost-server/server/v8/channels/app" "github.com/mattermost/mattermost-server/server/v8/channels/product" - "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/playbooks/product/pluginapi/cluster" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/api" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" @@ -26,7 +27,6 @@ import ( "github.com/mattermost/mattermost-server/server/v8/playbooks/server/scheduler" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/telemetry" - "github.com/mattermost/mattermost-server/server/v8/plugin" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/product/pluginapi/cluster/job.go b/server/playbooks/product/pluginapi/cluster/job.go index 96c8385a79..7d8f69bea2 100644 --- a/server/playbooks/product/pluginapi/cluster/job.go +++ b/server/playbooks/product/pluginapi/cluster/job.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/product/pluginapi/cluster/job_once.go b/server/playbooks/product/pluginapi/cluster/job_once.go index 2599962546..7f7dca33ae 100644 --- a/server/playbooks/product/pluginapi/cluster/job_once.go +++ b/server/playbooks/product/pluginapi/cluster/job_once.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/pkg/errors" ) diff --git a/server/playbooks/product/pluginapi/cluster/mutex.go b/server/playbooks/product/pluginapi/cluster/mutex.go index 1f95ff3d4e..854a31fd3e 100644 --- a/server/playbooks/product/pluginapi/cluster/mutex.go +++ b/server/playbooks/product/pluginapi/cluster/mutex.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/product/pluginapi/license.go b/server/playbooks/product/pluginapi/license.go index cac67f4da3..ea7d12c96b 100644 --- a/server/playbooks/product/pluginapi/license.go +++ b/server/playbooks/product/pluginapi/license.go @@ -4,7 +4,7 @@ package pluginapi import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) const ( diff --git a/server/playbooks/server/api/bot.go b/server/playbooks/server/api/bot.go index 8bc80a9ec2..1d66b27b1d 100644 --- a/server/playbooks/server/api/bot.go +++ b/server/playbooks/server/api/bot.go @@ -13,7 +13,7 @@ import ( "github.com/sirupsen/logrus" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" diff --git a/server/playbooks/server/api/categories.go b/server/playbooks/server/api/categories.go index cb2a205c62..1dcf5903b7 100644 --- a/server/playbooks/server/api/categories.go +++ b/server/playbooks/server/api/categories.go @@ -9,7 +9,7 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" diff --git a/server/playbooks/server/api/graphql_root_playbook.go b/server/playbooks/server/api/graphql_root_playbook.go index 7933bde0f3..eae81eaab2 100644 --- a/server/playbooks/server/api/graphql_root_playbook.go +++ b/server/playbooks/server/api/graphql_root_playbook.go @@ -7,7 +7,7 @@ import ( "context" "encoding/json" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" "gopkg.in/guregu/null.v4" diff --git a/server/playbooks/server/api/graphql_root_run.go b/server/playbooks/server/api/graphql_root_run.go index a8c9274511..34bdd95055 100644 --- a/server/playbooks/server/api/graphql_root_run.go +++ b/server/playbooks/server/api/graphql_root_run.go @@ -6,7 +6,7 @@ package api import ( "context" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/client" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" diff --git a/server/playbooks/server/api/logger.go b/server/playbooks/server/api/logger.go index bdccd4958a..94cd779365 100644 --- a/server/playbooks/server/api/logger.go +++ b/server/playbooks/server/api/logger.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/api/playbook_runs.go b/server/playbooks/server/api/playbook_runs.go index bd688c76ac..ee245dee7a 100644 --- a/server/playbooks/server/api/playbook_runs.go +++ b/server/playbooks/server/api/playbook_runs.go @@ -14,7 +14,7 @@ import ( "time" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/client" "github.com/pkg/errors" diff --git a/server/playbooks/server/api/playbooks.go b/server/playbooks/server/api/playbooks.go index 6a87d5a74c..aa282e3c72 100644 --- a/server/playbooks/server/api/playbooks.go +++ b/server/playbooks/server/api/playbooks.go @@ -12,7 +12,7 @@ import ( "strings" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" diff --git a/server/playbooks/server/api/signal.go b/server/playbooks/server/api/signal.go index f78a090e2e..17c20b571e 100644 --- a/server/playbooks/server/api/signal.go +++ b/server/playbooks/server/api/signal.go @@ -9,7 +9,7 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" diff --git a/server/playbooks/server/api/stats.go b/server/playbooks/server/api/stats.go index 8c0c6acc07..76bfd546ee 100644 --- a/server/playbooks/server/api/stats.go +++ b/server/playbooks/server/api/stats.go @@ -8,7 +8,7 @@ import ( "net/http" "net/url" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" "gopkg.in/guregu/null.v4" diff --git a/server/playbooks/server/api/urls.go b/server/playbooks/server/api/urls.go index ae4ccce881..4260230f6d 100644 --- a/server/playbooks/server/api/urls.go +++ b/server/playbooks/server/api/urls.go @@ -8,7 +8,7 @@ import ( "net/url" "path" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/server/playbooks/server/api_actions_test.go b/server/playbooks/server/api_actions_test.go index d91747a765..7f45c06ae8 100644 --- a/server/playbooks/server/api_actions_test.go +++ b/server/playbooks/server/api_actions_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/client" "github.com/mitchellh/mapstructure" "github.com/stretchr/testify/assert" diff --git a/server/playbooks/server/api_bot_test.go b/server/playbooks/server/api_bot_test.go index 9dcc2baa45..965810c7e3 100644 --- a/server/playbooks/server/api_bot_test.go +++ b/server/playbooks/server/api_bot_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/stretchr/testify/assert" ) diff --git a/server/playbooks/server/api_graphql_runs_test.go b/server/playbooks/server/api_graphql_runs_test.go index 953ea2caff..62b7166e2a 100644 --- a/server/playbooks/server/api_graphql_runs_test.go +++ b/server/playbooks/server/api_graphql_runs_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/graph-gophers/graphql-go" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/client" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/stretchr/testify/assert" diff --git a/server/playbooks/server/api_playbooks_test.go b/server/playbooks/server/api_playbooks_test.go index eedf819272..98a18b6445 100644 --- a/server/playbooks/server/api_playbooks_test.go +++ b/server/playbooks/server/api_playbooks_test.go @@ -13,7 +13,7 @@ import ( "strings" "testing" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/client" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" diff --git a/server/playbooks/server/api_runs_test.go b/server/playbooks/server/api_runs_test.go index 4319e78a95..53ec120692 100644 --- a/server/playbooks/server/api_runs_test.go +++ b/server/playbooks/server/api_runs_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/client" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/stretchr/testify/assert" diff --git a/server/playbooks/server/app/action.go b/server/playbooks/server/app/action.go index ed62a71c41..c5692dff13 100644 --- a/server/playbooks/server/app/action.go +++ b/server/playbooks/server/app/action.go @@ -3,7 +3,7 @@ package app -import "github.com/mattermost/mattermost-server/server/v8/model" +import "github.com/mattermost/mattermost-server/server/public/model" type GenericChannelActionWithoutPayload struct { ID string `json:"id"` diff --git a/server/playbooks/server/app/actions_service.go b/server/playbooks/server/app/actions_service.go index 56fb1b16f1..01ddee4eb3 100644 --- a/server/playbooks/server/app/actions_service.go +++ b/server/playbooks/server/app/actions_service.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" diff --git a/server/playbooks/server/app/category_service.go b/server/playbooks/server/app/category_service.go index f213a760e2..2f9acb7fca 100644 --- a/server/playbooks/server/app/category_service.go +++ b/server/playbooks/server/app/category_service.go @@ -6,7 +6,7 @@ package app import ( "database/sql" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/app/permissions_service.go b/server/playbooks/server/app/permissions_service.go index 9a663cb91f..bf0dee72a1 100644 --- a/server/playbooks/server/app/permissions_service.go +++ b/server/playbooks/server/app/permissions_service.go @@ -7,7 +7,7 @@ import ( "reflect" "strings" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" diff --git a/server/playbooks/server/app/playbook.go b/server/playbooks/server/app/playbook.go index 086be5a5a7..a85d1983be 100644 --- a/server/playbooks/server/app/playbook.go +++ b/server/playbooks/server/app/playbook.go @@ -10,7 +10,7 @@ import ( "net/url" "strings" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "gopkg.in/guregu/null.v4" "github.com/pkg/errors" diff --git a/server/playbooks/server/app/playbook_run.go b/server/playbooks/server/app/playbook_run.go index 276a54cc1f..0032df4e13 100644 --- a/server/playbooks/server/app/playbook_run.go +++ b/server/playbooks/server/app/playbook_run.go @@ -10,7 +10,7 @@ import ( "gopkg.in/guregu/null.v4" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/pkg/errors" "github.com/mattermost/mattermost-server/server/v8/playbooks/product/pluginapi/cluster" diff --git a/server/playbooks/server/app/playbook_run_service.go b/server/playbooks/server/app/playbook_run_service.go index 6a736df24c..ae69ebb776 100644 --- a/server/playbooks/server/app/playbook_run_service.go +++ b/server/playbooks/server/app/playbook_run_service.go @@ -16,8 +16,8 @@ import ( "github.com/sirupsen/logrus" stripmd "github.com/writeas/go-strip-markdown" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/httptools" diff --git a/server/playbooks/server/app/playbook_run_test.go b/server/playbooks/server/app/playbook_run_test.go index 160dec7cc0..03698269ce 100644 --- a/server/playbooks/server/app/playbook_run_test.go +++ b/server/playbooks/server/app/playbook_run_test.go @@ -7,7 +7,7 @@ import ( "encoding/json" "testing" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/stretchr/testify/require" ) diff --git a/server/playbooks/server/app/playbook_service.go b/server/playbooks/server/app/playbook_service.go index a4cce88812..6dfcaa5dd5 100644 --- a/server/playbooks/server/app/playbook_service.go +++ b/server/playbooks/server/app/playbook_service.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/server/playbooks/server/app/reminder.go b/server/playbooks/server/app/reminder.go index 9436c055ae..282d6807fa 100644 --- a/server/playbooks/server/app/reminder.go +++ b/server/playbooks/server/app/reminder.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/app/task_actions.go b/server/playbooks/server/app/task_actions.go index 8eba78404a..eeaa5cf946 100644 --- a/server/playbooks/server/app/task_actions.go +++ b/server/playbooks/server/app/task_actions.go @@ -7,7 +7,7 @@ import ( "encoding/json" "strings" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/app/task_actions_test.go b/server/playbooks/server/app/task_actions_test.go index e19479daf9..fb79b7bb55 100644 --- a/server/playbooks/server/app/task_actions_test.go +++ b/server/playbooks/server/app/task_actions_test.go @@ -6,7 +6,7 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/stretchr/testify/require" ) diff --git a/server/playbooks/server/bot/bot.go b/server/playbooks/server/bot/bot.go index b35912a253..8f40dd5ede 100644 --- a/server/playbooks/server/bot/bot.go +++ b/server/playbooks/server/bot/bot.go @@ -4,7 +4,7 @@ package bot import ( - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" ) diff --git a/server/playbooks/server/bot/mocks/mock_poster.go b/server/playbooks/server/bot/mocks/mock_poster.go index a6c78d9a04..4b365dbf0a 100644 --- a/server/playbooks/server/bot/mocks/mock_poster.go +++ b/server/playbooks/server/bot/mocks/mock_poster.go @@ -11,7 +11,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/server/v8/model" + model "github.com/mattermost/mattermost-server/server/public/model" ) // MockPoster is a mock of Poster interface. diff --git a/server/playbooks/server/bot/poster.go b/server/playbooks/server/bot/poster.go index a720dec395..b3b8c6021f 100644 --- a/server/playbooks/server/bot/poster.go +++ b/server/playbooks/server/bot/poster.go @@ -7,7 +7,7 @@ import ( "encoding/json" "fmt" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/command/command.go b/server/playbooks/server/command/command.go index 6188588b8a..1ed267dc61 100644 --- a/server/playbooks/server/command/command.go +++ b/server/playbooks/server/command/command.go @@ -10,13 +10,13 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/timeutils" - "github.com/mattermost/mattermost-server/server/v8/plugin" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/config/service.go b/server/playbooks/server/config/service.go index 320b450427..a333a22b1f 100644 --- a/server/playbooks/server/config/service.go +++ b/server/playbooks/server/config/service.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" ) diff --git a/server/playbooks/server/main_test.go b/server/playbooks/server/main_test.go index 5590ea392c..53279bdb5b 100644 --- a/server/playbooks/server/main_test.go +++ b/server/playbooks/server/main_test.go @@ -10,14 +10,14 @@ import ( "os" "testing" + "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/api4" sapp "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/storetest" "github.com/mattermost/mattermost-server/server/v8/channels/utils" "github.com/mattermost/mattermost-server/server/v8/config" - "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/playbooks/client" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" diff --git a/server/playbooks/server/playbooks/service_api.go b/server/playbooks/server/playbooks/service_api.go index e148581fdc..3135040079 100644 --- a/server/playbooks/server/playbooks/service_api.go +++ b/server/playbooks/server/playbooks/service_api.go @@ -10,7 +10,7 @@ import ( "github.com/gorilla/mux" - mm_model "github.com/mattermost/mattermost-server/server/v8/model" + mm_model "github.com/mattermost/mattermost-server/server/public/model" ) const ( diff --git a/server/playbooks/server/sqlstore/actions.go b/server/playbooks/server/sqlstore/actions.go index 93d6589f3e..31b3aa2523 100644 --- a/server/playbooks/server/sqlstore/actions.go +++ b/server/playbooks/server/sqlstore/actions.go @@ -11,7 +11,7 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/go-sql-driver/mysql" "github.com/lib/pq" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/sqlstore/actions_test.go b/server/playbooks/server/sqlstore/actions_test.go index 92db488041..2e17e8c239 100644 --- a/server/playbooks/server/sqlstore/actions_test.go +++ b/server/playbooks/server/sqlstore/actions_test.go @@ -10,7 +10,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" mock_sqlstore "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore/mocks" ) diff --git a/server/playbooks/server/sqlstore/category.go b/server/playbooks/server/sqlstore/category.go index 4e8eab5742..c5957cb8c7 100644 --- a/server/playbooks/server/sqlstore/category.go +++ b/server/playbooks/server/sqlstore/category.go @@ -7,7 +7,7 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/sqlstore/category_test.go b/server/playbooks/server/sqlstore/category_test.go index 0e271ea9d5..628e5d532f 100644 --- a/server/playbooks/server/sqlstore/category_test.go +++ b/server/playbooks/server/sqlstore/category_test.go @@ -10,7 +10,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" mock_sqlstore "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore/mocks" ) diff --git a/server/playbooks/server/sqlstore/migrate.go b/server/playbooks/server/sqlstore/migrate.go index b4b08e0cf0..6482380ebf 100644 --- a/server/playbooks/server/sqlstore/migrate.go +++ b/server/playbooks/server/sqlstore/migrate.go @@ -11,7 +11,7 @@ import ( "github.com/blang/semver" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/morph" "github.com/mattermost/morph/drivers" "github.com/mattermost/morph/sources" diff --git a/server/playbooks/server/sqlstore/migrations.go b/server/playbooks/server/sqlstore/migrations.go index d965c46743..ae34a2a61a 100644 --- a/server/playbooks/server/sqlstore/migrations.go +++ b/server/playbooks/server/sqlstore/migrations.go @@ -13,7 +13,7 @@ import ( "github.com/blang/semver" "github.com/go-sql-driver/mysql" "github.com/jmoiron/sqlx" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/server/playbooks/server/sqlstore/migrations_test.go b/server/playbooks/server/sqlstore/migrations_test.go index 913e6e8632..99df21d948 100644 --- a/server/playbooks/server/sqlstore/migrations_test.go +++ b/server/playbooks/server/sqlstore/migrations_test.go @@ -11,7 +11,7 @@ import ( "github.com/mattermost/morph" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type MigrationMapping struct { diff --git a/server/playbooks/server/sqlstore/migrations_utils.go b/server/playbooks/server/sqlstore/migrations_utils.go index 61ae236ffa..9c431b87e2 100644 --- a/server/playbooks/server/sqlstore/migrations_utils.go +++ b/server/playbooks/server/sqlstore/migrations_utils.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/pkg/errors" "github.com/jmoiron/sqlx" diff --git a/server/playbooks/server/sqlstore/mocks/mock_configurationapi.go b/server/playbooks/server/sqlstore/mocks/mock_configurationapi.go index 50ffc09958..5a30bb782f 100644 --- a/server/playbooks/server/sqlstore/mocks/mock_configurationapi.go +++ b/server/playbooks/server/sqlstore/mocks/mock_configurationapi.go @@ -11,7 +11,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/server/v8/model" + model "github.com/mattermost/mattermost-server/server/public/model" ) // MockConfigurationAPI is a mock of ConfigurationAPI interface. diff --git a/server/playbooks/server/sqlstore/playbook.go b/server/playbooks/server/sqlstore/playbook.go index dcb06a98fe..2ddd0c3831 100644 --- a/server/playbooks/server/sqlstore/playbook.go +++ b/server/playbooks/server/sqlstore/playbook.go @@ -11,7 +11,7 @@ import ( "strings" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/sqlstore/playbook_run.go b/server/playbooks/server/sqlstore/playbook_run.go index 061699d018..0388964701 100644 --- a/server/playbooks/server/sqlstore/playbook_run.go +++ b/server/playbooks/server/sqlstore/playbook_run.go @@ -16,7 +16,7 @@ import ( "github.com/jmoiron/sqlx" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/sqlstore/playbook_run_test.go b/server/playbooks/server/sqlstore/playbook_run_test.go index d95b78fd0b..ac75f51446 100644 --- a/server/playbooks/server/sqlstore/playbook_run_test.go +++ b/server/playbooks/server/sqlstore/playbook_run_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" mock_sqlstore "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore/mocks" ) diff --git a/server/playbooks/server/sqlstore/playbook_test.go b/server/playbooks/server/sqlstore/playbook_test.go index e61d7d62fa..ff54729fb3 100644 --- a/server/playbooks/server/sqlstore/playbook_test.go +++ b/server/playbooks/server/sqlstore/playbook_test.go @@ -16,7 +16,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" mock_sqlstore "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore/mocks" ) diff --git a/server/playbooks/server/sqlstore/pluginapi_client.go b/server/playbooks/server/sqlstore/pluginapi_client.go index 699fd10513..920083be56 100644 --- a/server/playbooks/server/sqlstore/pluginapi_client.go +++ b/server/playbooks/server/sqlstore/pluginapi_client.go @@ -8,7 +8,7 @@ import ( "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // StoreAPI is the interface exposing the underlying database, provided by pluginapi diff --git a/server/playbooks/server/sqlstore/stats.go b/server/playbooks/server/sqlstore/stats.go index 4c101e25d8..590e8f0ee9 100644 --- a/server/playbooks/server/sqlstore/stats.go +++ b/server/playbooks/server/sqlstore/stats.go @@ -15,7 +15,7 @@ import ( "gopkg.in/guregu/null.v4" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type StatsStore struct { diff --git a/server/playbooks/server/sqlstore/stats_test.go b/server/playbooks/server/sqlstore/stats_test.go index 5973f279bc..d92309f75f 100644 --- a/server/playbooks/server/sqlstore/stats_test.go +++ b/server/playbooks/server/sqlstore/stats_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/guregu/null.v4" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" mock_sqlstore "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore/mocks" ) diff --git a/server/playbooks/server/sqlstore/store.go b/server/playbooks/server/sqlstore/store.go index fae12dd6c7..a7c062fdcf 100644 --- a/server/playbooks/server/sqlstore/store.go +++ b/server/playbooks/server/sqlstore/store.go @@ -11,7 +11,7 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/jmoiron/sqlx" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/sqlstore/store_test.go b/server/playbooks/server/sqlstore/store_test.go index cb33394f7f..58219f0673 100644 --- a/server/playbooks/server/sqlstore/store_test.go +++ b/server/playbooks/server/sqlstore/store_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func TestMigrations(t *testing.T) { diff --git a/server/playbooks/server/sqlstore/support_for_test.go b/server/playbooks/server/sqlstore/support_for_test.go index 3035fe8dd5..38d838e24d 100644 --- a/server/playbooks/server/sqlstore/support_for_test.go +++ b/server/playbooks/server/sqlstore/support_for_test.go @@ -17,8 +17,8 @@ import ( "github.com/jmoiron/sqlx" "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" - "github.com/mattermost/mattermost-server/server/v8/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" ) diff --git a/server/playbooks/server/sqlstore/system.go b/server/playbooks/server/sqlstore/system.go index 7be08ffb26..e2e668402f 100644 --- a/server/playbooks/server/sqlstore/system.go +++ b/server/playbooks/server/sqlstore/system.go @@ -7,7 +7,7 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/sqlstore/timeline_event_test.go b/server/playbooks/server/sqlstore/timeline_event_test.go index 2a22ce2cc6..d16b08ac6e 100644 --- a/server/playbooks/server/sqlstore/timeline_event_test.go +++ b/server/playbooks/server/sqlstore/timeline_event_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" ) diff --git a/server/playbooks/server/sqlstore/user_info.go b/server/playbooks/server/sqlstore/user_info.go index 211fcc90d2..d33c02c6a6 100644 --- a/server/playbooks/server/sqlstore/user_info.go +++ b/server/playbooks/server/sqlstore/user_info.go @@ -7,7 +7,7 @@ import ( "database/sql" "encoding/json" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" sq "github.com/Masterminds/squirrel" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" diff --git a/server/playbooks/server/sqlstore/user_info_test.go b/server/playbooks/server/sqlstore/user_info_test.go index 3781d2f7a8..db89cbdb3f 100644 --- a/server/playbooks/server/sqlstore/user_info_test.go +++ b/server/playbooks/server/sqlstore/user_info_test.go @@ -16,7 +16,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" ) diff --git a/server/playbooks/server/timeutils/timeutils.go b/server/playbooks/server/timeutils/timeutils.go index efed974dd7..851ad16c9b 100644 --- a/server/playbooks/server/timeutils/timeutils.go +++ b/server/playbooks/server/timeutils/timeutils.go @@ -8,7 +8,7 @@ import ( "math" "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) func GetTimeForMillis(unixMillis int64) time.Time { diff --git a/server/public/go.mod b/server/public/go.mod new file mode 100644 index 0000000000..6b15c9afb2 --- /dev/null +++ b/server/public/go.mod @@ -0,0 +1,68 @@ +module github.com/mattermost/mattermost-server/server/public + +go 1.19 + +require ( + github.com/blang/semver v3.5.1+incompatible + github.com/dyatlov/go-opengraph/opengraph v0.0.0-20220524092352-606d7b1e5f8a + github.com/francoispqt/gojay v1.2.13 + github.com/go-sql-driver/mysql v1.7.0 + github.com/gorilla/websocket v1.5.0 + github.com/graph-gophers/graphql-go v1.5.1-0.20230110080634-edea822f558a + github.com/hashicorp/go-hclog v1.5.0 + github.com/hashicorp/go-plugin v1.4.9 + github.com/lib/pq v1.10.7 + github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404 + github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d + github.com/mattermost/logr/v2 v2.0.16 + github.com/pborman/uuid v1.2.1 + github.com/pkg/errors v0.9.1 + github.com/stretchr/testify v1.8.2 + github.com/tinylib/msgp v1.1.8 + github.com/vmihailenco/msgpack/v5 v5.3.5 + golang.org/x/crypto v0.8.0 + golang.org/x/text v0.9.0 + golang.org/x/tools v0.8.0 + gopkg.in/yaml.v2 v2.4.0 +) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/fatih/color v1.15.0 // indirect + github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/hashicorp/yamux v0.1.1 // indirect + github.com/kr/pretty v0.3.0 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.18 // indirect + github.com/mitchellh/go-testing-interface v1.14.1 // indirect + github.com/oklog/run v1.1.0 // indirect + github.com/pelletier/go-toml v1.9.5 // indirect + github.com/philhofer/fwd v1.1.2 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/stretchr/objx v0.5.0 // indirect + github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect + github.com/wiggin77/merror v1.0.4 // indirect + github.com/wiggin77/srslog v1.0.1 // indirect + golang.org/x/mod v0.10.0 // indirect + golang.org/x/net v0.9.0 // indirect + golang.org/x/sys v0.7.0 // indirect + google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect + google.golang.org/grpc v1.54.0 // indirect + google.golang.org/protobuf v1.30.0 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect + gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) + +// Hack to prevent the willf/bitset module from being upgraded to 1.2.0. +// They changed the module path from github.com/willf/bitset to +// github.com/bits-and-blooms/bitset and a couple of dependent repos are yet +// to update their module paths. +exclude ( + github.com/RoaringBitmap/roaring v0.7.0 + github.com/RoaringBitmap/roaring v0.7.1 + github.com/dyatlov/go-opengraph v0.0.0-20210112100619-dae8665a5b09 + github.com/willf/bitset v1.2.0 +) diff --git a/server/public/go.sum b/server/public/go.sum new file mode 100644 index 0000000000..9faee7fcb7 --- /dev/null +++ b/server/public/go.sum @@ -0,0 +1,331 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo= +dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU= +dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= +dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= +dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= +git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= +github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= +github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dyatlov/go-opengraph/opengraph v0.0.0-20220524092352-606d7b1e5f8a h1:etIrTD8BQqzColk9nKRusM9um5+1q0iOEJLqfBMIK64= +github.com/dyatlov/go-opengraph/opengraph v0.0.0-20220524092352-606d7b1e5f8a/go.mod h1:emQhSYTXqB0xxjLITTw4EaWZ+8IIQYw+kx9GqNUKdLg= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= +github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk= +github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/go-asn1-ber/asn1-ber v1.3.2-0.20191121212151-29be175fc3a3/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= +github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A= +github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= +github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= +github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= +github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/graph-gophers/graphql-go v1.5.1-0.20230110080634-edea822f558a h1:i0+Se9S+2zL5CBxJouqn2Ej6UQMwH1c57ZB6DVnqck4= +github.com/graph-gophers/graphql-go v1.5.1-0.20230110080634-edea822f558a/go.mod h1:YtmJZDLbF1YYNrlNAuiO5zAStUWc3XZT07iGsVqe1Os= +github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= +github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= +github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-plugin v1.4.9 h1:ESiK220/qE0aGxWdzKIvRH69iLiuN/PjoLTm69RoWtU= +github.com/hashicorp/go-plugin v1.4.9/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s= +github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= +github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= +github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= +github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= +github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= +github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404 h1:Khvh6waxG1cHc4Cz5ef9n3XVCxRWpAKUtqg9PJl5+y8= +github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404/go.mod h1:RyS7FDNQlzF1PsjbJWHRI35exqaKGSO9qD4iv8QjE34= +github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d h1:/RJ/UV7M5c7L2TQ0KNm4yZxxFvC1nvRz/gY/Daa35aI= +github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d/go.mod h1:HLbgMEI5K131jpxGazJ97AxfPDt31osq36YS1oxFQPQ= +github.com/mattermost/logr/v2 v2.0.16 h1:jnePX4cPskC3WDFvUardh/xZfxNdsFXbEERJQ1kUEDE= +github.com/mattermost/logr/v2 v2.0.16/go.mod h1:1dm/YhTpozsqANXxo5Pi5zYLBsal2xY0pX+JZNbzYJY= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= +github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= +github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= +github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= +github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= +github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= +github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= +github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= +github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= +github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw= +github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= +github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw= +github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY= +github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM= +github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0= +github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= +github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= +github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw= +github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod h1:8d3azKNyqcHP1GaQE/c6dDgjkgSx2BZ4IoEi4F1reUI= +github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU= +github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag= +github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod h1:+rgNQw2P9ARFAs37qieuu7ohDNQ3gds9msbT2yn85sg= +github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod h1:zPn1wHpTIePGnXSHpsVPWEktKXHr6+SS6x/IKRb7cpw= +github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod h1:aYMfkZ6DWSJPJ6c4Wwz3QtW22G7mf/PEgaB9k/ik5+Y= +github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= +github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q= +github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod h1:e2qWDig5bLteJ4fwvDAc2NHzqFEthkqn7aOZAOpj+PQ= +github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod h1:NPpHK2TI7iSaM0buivtFUc9offApnI0Alt/K8hcHy0I= +github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod h1:b5uSkrEVM1jQUspwbixRBhaIjIzL2xazXp6kntxYle0= +github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ= +github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk= +github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= +github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= +github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE= +github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= +github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0= +github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw= +github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= +github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= +github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= +github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= +github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= +github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= +github.com/wiggin77/merror v1.0.4 h1:XxFLEevmQQfgJW2AxhapuMG7C1fQqfbim/XyUmYv/ZM= +github.com/wiggin77/merror v1.0.4/go.mod h1:H2ETSu7/bPE0Ymf4bEwdUoo73OOEkdClnoRisfw0Nm0= +github.com/wiggin77/srslog v1.0.1 h1:gA2XjSMy3DrRdX9UqLuDtuVAAshb8bE1NhX1YK0Qe+8= +github.com/wiggin77/srslog v1.0.1/go.mod h1:fehkyYDq1QfuYn60TDPu9YdY2bB85VUW2mvN1WynEls= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= +go.opentelemetry.io/otel v1.6.3/go.mod h1:7BgNga5fNlF/iZjG06hM3yofffp0ofKCDwSXx1GC4dI= +go.opentelemetry.io/otel/trace v1.6.3/go.mod h1:GNJQusJlUgZl9/TQBPKU/Y/ty+0iVB5fjhKeJGZPGFs= +go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= +golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= +golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ= +golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= +golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= +golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= +golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= +golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= +golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y= +golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= +google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= +google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= +google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= +gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= +sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= diff --git a/server/model/access.go b/server/public/model/access.go similarity index 100% rename from server/model/access.go rename to server/public/model/access.go diff --git a/server/model/access_test.go b/server/public/model/access_test.go similarity index 100% rename from server/model/access_test.go rename to server/public/model/access_test.go diff --git a/server/model/analytics_row.go b/server/public/model/analytics_row.go similarity index 100% rename from server/model/analytics_row.go rename to server/public/model/analytics_row.go diff --git a/server/model/audit.go b/server/public/model/audit.go similarity index 100% rename from server/model/audit.go rename to server/public/model/audit.go diff --git a/server/model/auditconv.go b/server/public/model/auditconv.go similarity index 100% rename from server/model/auditconv.go rename to server/public/model/auditconv.go diff --git a/server/model/auditconv_test.go b/server/public/model/auditconv_test.go similarity index 100% rename from server/model/auditconv_test.go rename to server/public/model/auditconv_test.go diff --git a/server/model/audits.go b/server/public/model/audits.go similarity index 100% rename from server/model/audits.go rename to server/public/model/audits.go diff --git a/server/model/authorize.go b/server/public/model/authorize.go similarity index 100% rename from server/model/authorize.go rename to server/public/model/authorize.go diff --git a/server/model/authorize_test.go b/server/public/model/authorize_test.go similarity index 100% rename from server/model/authorize_test.go rename to server/public/model/authorize_test.go diff --git a/server/model/bot.go b/server/public/model/bot.go similarity index 100% rename from server/model/bot.go rename to server/public/model/bot.go diff --git a/server/model/bot_test.go b/server/public/model/bot_test.go similarity index 100% rename from server/model/bot_test.go rename to server/public/model/bot_test.go diff --git a/server/model/builtin.go b/server/public/model/builtin.go similarity index 100% rename from server/model/builtin.go rename to server/public/model/builtin.go diff --git a/server/model/bulk_export.go b/server/public/model/bulk_export.go similarity index 100% rename from server/model/bulk_export.go rename to server/public/model/bulk_export.go diff --git a/server/model/bundle_info.go b/server/public/model/bundle_info.go similarity index 90% rename from server/model/bundle_info.go rename to server/public/model/bundle_info.go index cfac1c8eb3..99133953bb 100644 --- a/server/model/bundle_info.go +++ b/server/public/model/bundle_info.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" ) type BundleInfo struct { diff --git a/server/model/bundle_info_test.go b/server/public/model/bundle_info_test.go similarity index 100% rename from server/model/bundle_info_test.go rename to server/public/model/bundle_info_test.go diff --git a/server/model/channel.go b/server/public/model/channel.go similarity index 100% rename from server/model/channel.go rename to server/public/model/channel.go diff --git a/server/model/channel_count.go b/server/public/model/channel_count.go similarity index 100% rename from server/model/channel_count.go rename to server/public/model/channel_count.go diff --git a/server/model/channel_data.go b/server/public/model/channel_data.go similarity index 100% rename from server/model/channel_data.go rename to server/public/model/channel_data.go diff --git a/server/model/channel_list.go b/server/public/model/channel_list.go similarity index 100% rename from server/model/channel_list.go rename to server/public/model/channel_list.go diff --git a/server/model/channel_member.go b/server/public/model/channel_member.go similarity index 100% rename from server/model/channel_member.go rename to server/public/model/channel_member.go diff --git a/server/model/channel_member_history.go b/server/public/model/channel_member_history.go similarity index 100% rename from server/model/channel_member_history.go rename to server/public/model/channel_member_history.go diff --git a/server/model/channel_member_history_result.go b/server/public/model/channel_member_history_result.go similarity index 100% rename from server/model/channel_member_history_result.go rename to server/public/model/channel_member_history_result.go diff --git a/server/model/channel_member_test.go b/server/public/model/channel_member_test.go similarity index 100% rename from server/model/channel_member_test.go rename to server/public/model/channel_member_test.go diff --git a/server/model/channel_mentions.go b/server/public/model/channel_mentions.go similarity index 100% rename from server/model/channel_mentions.go rename to server/public/model/channel_mentions.go diff --git a/server/model/channel_search.go b/server/public/model/channel_search.go similarity index 100% rename from server/model/channel_search.go rename to server/public/model/channel_search.go diff --git a/server/model/channel_sidebar.go b/server/public/model/channel_sidebar.go similarity index 100% rename from server/model/channel_sidebar.go rename to server/public/model/channel_sidebar.go diff --git a/server/model/channel_sidebar_test.go b/server/public/model/channel_sidebar_test.go similarity index 100% rename from server/model/channel_sidebar_test.go rename to server/public/model/channel_sidebar_test.go diff --git a/server/model/channel_stats.go b/server/public/model/channel_stats.go similarity index 100% rename from server/model/channel_stats.go rename to server/public/model/channel_stats.go diff --git a/server/model/channel_test.go b/server/public/model/channel_test.go similarity index 100% rename from server/model/channel_test.go rename to server/public/model/channel_test.go diff --git a/server/model/channel_view.go b/server/public/model/channel_view.go similarity index 100% rename from server/model/channel_view.go rename to server/public/model/channel_view.go diff --git a/server/model/client4.go b/server/public/model/client4.go similarity index 100% rename from server/model/client4.go rename to server/public/model/client4.go diff --git a/server/model/client4_test.go b/server/public/model/client4_test.go similarity index 100% rename from server/model/client4_test.go rename to server/public/model/client4_test.go diff --git a/server/model/cloud.go b/server/public/model/cloud.go similarity index 100% rename from server/model/cloud.go rename to server/public/model/cloud.go diff --git a/server/model/cluster_discovery.go b/server/public/model/cluster_discovery.go similarity index 100% rename from server/model/cluster_discovery.go rename to server/public/model/cluster_discovery.go diff --git a/server/model/cluster_discovery_test.go b/server/public/model/cluster_discovery_test.go similarity index 100% rename from server/model/cluster_discovery_test.go rename to server/public/model/cluster_discovery_test.go diff --git a/server/model/cluster_info.go b/server/public/model/cluster_info.go similarity index 100% rename from server/model/cluster_info.go rename to server/public/model/cluster_info.go diff --git a/server/model/cluster_message.go b/server/public/model/cluster_message.go similarity index 100% rename from server/model/cluster_message.go rename to server/public/model/cluster_message.go diff --git a/server/model/cluster_stats.go b/server/public/model/cluster_stats.go similarity index 100% rename from server/model/cluster_stats.go rename to server/public/model/cluster_stats.go diff --git a/server/model/collection.go b/server/public/model/collection.go similarity index 100% rename from server/model/collection.go rename to server/public/model/collection.go diff --git a/server/model/command.go b/server/public/model/command.go similarity index 100% rename from server/model/command.go rename to server/public/model/command.go diff --git a/server/model/command_args.go b/server/public/model/command_args.go similarity index 95% rename from server/model/command_args.go rename to server/public/model/command_args.go index 6b147af0df..5ad13fd4c8 100644 --- a/server/model/command_args.go +++ b/server/public/model/command_args.go @@ -4,7 +4,7 @@ package model import ( - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" ) type CommandArgs struct { diff --git a/server/model/command_args_test.go b/server/public/model/command_args_test.go similarity index 100% rename from server/model/command_args_test.go rename to server/public/model/command_args_test.go diff --git a/server/model/command_autocomplete.go b/server/public/model/command_autocomplete.go similarity index 100% rename from server/model/command_autocomplete.go rename to server/public/model/command_autocomplete.go diff --git a/server/model/command_autocomplete_test.go b/server/public/model/command_autocomplete_test.go similarity index 100% rename from server/model/command_autocomplete_test.go rename to server/public/model/command_autocomplete_test.go diff --git a/server/model/command_request.go b/server/public/model/command_request.go similarity index 100% rename from server/model/command_request.go rename to server/public/model/command_request.go diff --git a/server/model/command_response.go b/server/public/model/command_response.go similarity index 96% rename from server/model/command_response.go rename to server/public/model/command_response.go index fb5c34ca87..6462012d14 100644 --- a/server/model/command_response.go +++ b/server/public/model/command_response.go @@ -8,7 +8,7 @@ import ( "io" "strings" - "github.com/mattermost/mattermost-server/server/v8/model/utils" + "github.com/mattermost/mattermost-server/server/public/utils" ) const ( diff --git a/server/model/command_response_test.go b/server/public/model/command_response_test.go similarity index 100% rename from server/model/command_response_test.go rename to server/public/model/command_response_test.go diff --git a/server/model/command_test.go b/server/public/model/command_test.go similarity index 100% rename from server/model/command_test.go rename to server/public/model/command_test.go diff --git a/server/model/command_webhook.go b/server/public/model/command_webhook.go similarity index 100% rename from server/model/command_webhook.go rename to server/public/model/command_webhook.go diff --git a/server/model/command_webhook_test.go b/server/public/model/command_webhook_test.go similarity index 100% rename from server/model/command_webhook_test.go rename to server/public/model/command_webhook_test.go diff --git a/server/model/compliance.go b/server/public/model/compliance.go similarity index 100% rename from server/model/compliance.go rename to server/public/model/compliance.go diff --git a/server/model/compliance_post.go b/server/public/model/compliance_post.go similarity index 100% rename from server/model/compliance_post.go rename to server/public/model/compliance_post.go diff --git a/server/model/compliance_post_test.go b/server/public/model/compliance_post_test.go similarity index 100% rename from server/model/compliance_post_test.go rename to server/public/model/compliance_post_test.go diff --git a/server/model/config.go b/server/public/model/config.go similarity index 99% rename from server/model/config.go rename to server/public/model/config.go index 57ec796119..5b0934f432 100644 --- a/server/model/config.go +++ b/server/public/model/config.go @@ -21,7 +21,7 @@ import ( "github.com/mattermost/ldap" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) const ( diff --git a/server/model/config_test.go b/server/public/model/config_test.go similarity index 100% rename from server/model/config_test.go rename to server/public/model/config_test.go diff --git a/server/model/custom_status.go b/server/public/model/custom_status.go similarity index 100% rename from server/model/custom_status.go rename to server/public/model/custom_status.go diff --git a/server/model/data_retention_policy.go b/server/public/model/data_retention_policy.go similarity index 100% rename from server/model/data_retention_policy.go rename to server/public/model/data_retention_policy.go diff --git a/server/model/draft.go b/server/public/model/draft.go similarity index 100% rename from server/model/draft.go rename to server/public/model/draft.go diff --git a/server/model/draft_test.go b/server/public/model/draft_test.go similarity index 100% rename from server/model/draft_test.go rename to server/public/model/draft_test.go diff --git a/server/model/emoji.go b/server/public/model/emoji.go similarity index 100% rename from server/model/emoji.go rename to server/public/model/emoji.go diff --git a/server/model/emoji_data.go b/server/public/model/emoji_data.go similarity index 100% rename from server/model/emoji_data.go rename to server/public/model/emoji_data.go diff --git a/server/model/emoji_search.go b/server/public/model/emoji_search.go similarity index 100% rename from server/model/emoji_search.go rename to server/public/model/emoji_search.go diff --git a/server/model/emoji_test.go b/server/public/model/emoji_test.go similarity index 100% rename from server/model/emoji_test.go rename to server/public/model/emoji_test.go diff --git a/server/model/feature_flags.go b/server/public/model/feature_flags.go similarity index 100% rename from server/model/feature_flags.go rename to server/public/model/feature_flags.go diff --git a/server/model/feature_flags_test.go b/server/public/model/feature_flags_test.go similarity index 100% rename from server/model/feature_flags_test.go rename to server/public/model/feature_flags_test.go diff --git a/server/model/file.go b/server/public/model/file.go similarity index 100% rename from server/model/file.go rename to server/public/model/file.go diff --git a/server/model/file_info.go b/server/public/model/file_info.go similarity index 100% rename from server/model/file_info.go rename to server/public/model/file_info.go diff --git a/server/model/file_info_list.go b/server/public/model/file_info_list.go similarity index 100% rename from server/model/file_info_list.go rename to server/public/model/file_info_list.go diff --git a/server/model/file_info_search_results.go b/server/public/model/file_info_search_results.go similarity index 100% rename from server/model/file_info_search_results.go rename to server/public/model/file_info_search_results.go diff --git a/server/model/file_info_test.go b/server/public/model/file_info_test.go similarity index 100% rename from server/model/file_info_test.go rename to server/public/model/file_info_test.go diff --git a/server/model/github_release.go b/server/public/model/github_release.go similarity index 100% rename from server/model/github_release.go rename to server/public/model/github_release.go diff --git a/server/model/gitlab.go b/server/public/model/gitlab.go similarity index 100% rename from server/model/gitlab.go rename to server/public/model/gitlab.go diff --git a/server/model/group.go b/server/public/model/group.go similarity index 100% rename from server/model/group.go rename to server/public/model/group.go diff --git a/server/model/group_member.go b/server/public/model/group_member.go similarity index 100% rename from server/model/group_member.go rename to server/public/model/group_member.go diff --git a/server/model/group_syncable.go b/server/public/model/group_syncable.go similarity index 100% rename from server/model/group_syncable.go rename to server/public/model/group_syncable.go diff --git a/server/model/group_syncable_test.go b/server/public/model/group_syncable_test.go similarity index 100% rename from server/model/group_syncable_test.go rename to server/public/model/group_syncable_test.go diff --git a/server/model/guest_invite.go b/server/public/model/guest_invite.go similarity index 100% rename from server/model/guest_invite.go rename to server/public/model/guest_invite.go diff --git a/server/model/hosted_customer.go b/server/public/model/hosted_customer.go similarity index 100% rename from server/model/hosted_customer.go rename to server/public/model/hosted_customer.go diff --git a/server/model/incoming_webhook.go b/server/public/model/incoming_webhook.go similarity index 100% rename from server/model/incoming_webhook.go rename to server/public/model/incoming_webhook.go diff --git a/server/model/incoming_webhook_test.go b/server/public/model/incoming_webhook_test.go similarity index 100% rename from server/model/incoming_webhook_test.go rename to server/public/model/incoming_webhook_test.go diff --git a/server/model/initial_load.go b/server/public/model/initial_load.go similarity index 100% rename from server/model/initial_load.go rename to server/public/model/initial_load.go diff --git a/server/model/insights.go b/server/public/model/insights.go similarity index 100% rename from server/model/insights.go rename to server/public/model/insights.go diff --git a/server/model/insights_test.go b/server/public/model/insights_test.go similarity index 100% rename from server/model/insights_test.go rename to server/public/model/insights_test.go diff --git a/server/model/integration_action.go b/server/public/model/integration_action.go similarity index 100% rename from server/model/integration_action.go rename to server/public/model/integration_action.go diff --git a/server/model/integration_action_test.go b/server/public/model/integration_action_test.go similarity index 100% rename from server/model/integration_action_test.go rename to server/public/model/integration_action_test.go diff --git a/server/model/integrity.go b/server/public/model/integrity.go similarity index 100% rename from server/model/integrity.go rename to server/public/model/integrity.go diff --git a/server/model/job.go b/server/public/model/job.go similarity index 100% rename from server/model/job.go rename to server/public/model/job.go diff --git a/server/model/job_test.go b/server/public/model/job_test.go similarity index 100% rename from server/model/job_test.go rename to server/public/model/job_test.go diff --git a/server/model/ldap.go b/server/public/model/ldap.go similarity index 100% rename from server/model/ldap.go rename to server/public/model/ldap.go diff --git a/server/model/license.go b/server/public/model/license.go similarity index 100% rename from server/model/license.go rename to server/public/model/license.go diff --git a/server/model/license_key.go b/server/public/model/license_key.go similarity index 100% rename from server/model/license_key.go rename to server/public/model/license_key.go diff --git a/server/model/license_key_test_env.go b/server/public/model/license_key_test_env.go similarity index 100% rename from server/model/license_key_test_env.go rename to server/public/model/license_key_test_env.go diff --git a/server/model/license_test.go b/server/public/model/license_test.go similarity index 100% rename from server/model/license_test.go rename to server/public/model/license_test.go diff --git a/server/model/link_metadata.go b/server/public/model/link_metadata.go similarity index 100% rename from server/model/link_metadata.go rename to server/public/model/link_metadata.go diff --git a/server/model/link_metadata_test.go b/server/public/model/link_metadata_test.go similarity index 100% rename from server/model/link_metadata_test.go rename to server/public/model/link_metadata_test.go diff --git a/server/model/manifest.go b/server/public/model/manifest.go similarity index 100% rename from server/model/manifest.go rename to server/public/model/manifest.go diff --git a/server/model/manifest_test.go b/server/public/model/manifest_test.go similarity index 100% rename from server/model/manifest_test.go rename to server/public/model/manifest_test.go diff --git a/server/model/marketplace_plugin.go b/server/public/model/marketplace_plugin.go similarity index 100% rename from server/model/marketplace_plugin.go rename to server/public/model/marketplace_plugin.go diff --git a/server/model/member_invite.go b/server/public/model/member_invite.go similarity index 100% rename from server/model/member_invite.go rename to server/public/model/member_invite.go diff --git a/server/model/mention_map.go b/server/public/model/mention_map.go similarity index 100% rename from server/model/mention_map.go rename to server/public/model/mention_map.go diff --git a/server/model/mention_map_test.go b/server/public/model/mention_map_test.go similarity index 100% rename from server/model/mention_map_test.go rename to server/public/model/mention_map_test.go diff --git a/server/model/message_export.go b/server/public/model/message_export.go similarity index 100% rename from server/model/message_export.go rename to server/public/model/message_export.go diff --git a/server/model/mfa_secret.go b/server/public/model/mfa_secret.go similarity index 100% rename from server/model/mfa_secret.go rename to server/public/model/mfa_secret.go diff --git a/server/model/migration.go b/server/public/model/migration.go similarity index 100% rename from server/model/migration.go rename to server/public/model/migration.go diff --git a/server/model/modeltestlib_test.go b/server/public/model/modeltestlib_test.go similarity index 100% rename from server/model/modeltestlib_test.go rename to server/public/model/modeltestlib_test.go diff --git a/server/model/notify_admin.go b/server/public/model/notify_admin.go similarity index 100% rename from server/model/notify_admin.go rename to server/public/model/notify_admin.go diff --git a/server/model/oauth.go b/server/public/model/oauth.go similarity index 100% rename from server/model/oauth.go rename to server/public/model/oauth.go diff --git a/server/model/oauth_test.go b/server/public/model/oauth_test.go similarity index 100% rename from server/model/oauth_test.go rename to server/public/model/oauth_test.go diff --git a/server/model/onboarding.go b/server/public/model/onboarding.go similarity index 100% rename from server/model/onboarding.go rename to server/public/model/onboarding.go diff --git a/server/model/outgoing_webhook.go b/server/public/model/outgoing_webhook.go similarity index 100% rename from server/model/outgoing_webhook.go rename to server/public/model/outgoing_webhook.go diff --git a/server/model/outgoing_webhook_test.go b/server/public/model/outgoing_webhook_test.go similarity index 100% rename from server/model/outgoing_webhook_test.go rename to server/public/model/outgoing_webhook_test.go diff --git a/server/model/permalink.go b/server/public/model/permalink.go similarity index 100% rename from server/model/permalink.go rename to server/public/model/permalink.go diff --git a/server/model/permission.go b/server/public/model/permission.go similarity index 100% rename from server/model/permission.go rename to server/public/model/permission.go diff --git a/server/model/plugin_cluster_event.go b/server/public/model/plugin_cluster_event.go similarity index 100% rename from server/model/plugin_cluster_event.go rename to server/public/model/plugin_cluster_event.go diff --git a/server/model/plugin_constants.go b/server/public/model/plugin_constants.go similarity index 100% rename from server/model/plugin_constants.go rename to server/public/model/plugin_constants.go diff --git a/server/model/plugin_event_data.go b/server/public/model/plugin_event_data.go similarity index 100% rename from server/model/plugin_event_data.go rename to server/public/model/plugin_event_data.go diff --git a/server/model/plugin_key_value.go b/server/public/model/plugin_key_value.go similarity index 100% rename from server/model/plugin_key_value.go rename to server/public/model/plugin_key_value.go diff --git a/server/model/plugin_key_value_test.go b/server/public/model/plugin_key_value_test.go similarity index 100% rename from server/model/plugin_key_value_test.go rename to server/public/model/plugin_key_value_test.go diff --git a/server/model/plugin_kvset_options.go b/server/public/model/plugin_kvset_options.go similarity index 100% rename from server/model/plugin_kvset_options.go rename to server/public/model/plugin_kvset_options.go diff --git a/server/model/plugin_on_install_event.go b/server/public/model/plugin_on_install_event.go similarity index 100% rename from server/model/plugin_on_install_event.go rename to server/public/model/plugin_on_install_event.go diff --git a/server/model/plugin_status.go b/server/public/model/plugin_status.go similarity index 100% rename from server/model/plugin_status.go rename to server/public/model/plugin_status.go diff --git a/server/model/plugin_valid.go b/server/public/model/plugin_valid.go similarity index 100% rename from server/model/plugin_valid.go rename to server/public/model/plugin_valid.go diff --git a/server/model/plugin_valid_test.go b/server/public/model/plugin_valid_test.go similarity index 100% rename from server/model/plugin_valid_test.go rename to server/public/model/plugin_valid_test.go diff --git a/server/model/plugins_response.go b/server/public/model/plugins_response.go similarity index 100% rename from server/model/plugins_response.go rename to server/public/model/plugins_response.go diff --git a/server/model/post.go b/server/public/model/post.go similarity index 99% rename from server/model/post.go rename to server/public/model/post.go index d047216735..3058318b41 100644 --- a/server/model/post.go +++ b/server/public/model/post.go @@ -15,7 +15,7 @@ import ( "sync" "unicode/utf8" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/markdown" + "github.com/mattermost/mattermost-server/server/public/shared/markdown" ) const ( diff --git a/server/model/post_acknowledgement.go b/server/public/model/post_acknowledgement.go similarity index 100% rename from server/model/post_acknowledgement.go rename to server/public/model/post_acknowledgement.go diff --git a/server/model/post_embed.go b/server/public/model/post_embed.go similarity index 100% rename from server/model/post_embed.go rename to server/public/model/post_embed.go diff --git a/server/model/post_info.go b/server/public/model/post_info.go similarity index 100% rename from server/model/post_info.go rename to server/public/model/post_info.go diff --git a/server/model/post_list.go b/server/public/model/post_list.go similarity index 100% rename from server/model/post_list.go rename to server/public/model/post_list.go diff --git a/server/model/post_list_test.go b/server/public/model/post_list_test.go similarity index 100% rename from server/model/post_list_test.go rename to server/public/model/post_list_test.go diff --git a/server/model/post_metadata.go b/server/public/model/post_metadata.go similarity index 100% rename from server/model/post_metadata.go rename to server/public/model/post_metadata.go diff --git a/server/model/post_search_results.go b/server/public/model/post_search_results.go similarity index 100% rename from server/model/post_search_results.go rename to server/public/model/post_search_results.go diff --git a/server/model/post_test.go b/server/public/model/post_test.go similarity index 100% rename from server/model/post_test.go rename to server/public/model/post_test.go diff --git a/server/model/preference.go b/server/public/model/preference.go similarity index 100% rename from server/model/preference.go rename to server/public/model/preference.go diff --git a/server/model/preference_test.go b/server/public/model/preference_test.go similarity index 100% rename from server/model/preference_test.go rename to server/public/model/preference_test.go diff --git a/server/model/product_notices.go b/server/public/model/product_notices.go similarity index 100% rename from server/model/product_notices.go rename to server/public/model/product_notices.go diff --git a/server/model/push_notification.go b/server/public/model/push_notification.go similarity index 100% rename from server/model/push_notification.go rename to server/public/model/push_notification.go diff --git a/server/model/push_notification_test.go b/server/public/model/push_notification_test.go similarity index 100% rename from server/model/push_notification_test.go rename to server/public/model/push_notification_test.go diff --git a/server/model/push_response.go b/server/public/model/push_response.go similarity index 100% rename from server/model/push_response.go rename to server/public/model/push_response.go diff --git a/server/model/push_response_test.go b/server/public/model/push_response_test.go similarity index 100% rename from server/model/push_response_test.go rename to server/public/model/push_response_test.go diff --git a/server/model/reaction.go b/server/public/model/reaction.go similarity index 100% rename from server/model/reaction.go rename to server/public/model/reaction.go diff --git a/server/model/reaction_test.go b/server/public/model/reaction_test.go similarity index 100% rename from server/model/reaction_test.go rename to server/public/model/reaction_test.go diff --git a/server/model/remote_cluster.go b/server/public/model/remote_cluster.go similarity index 100% rename from server/model/remote_cluster.go rename to server/public/model/remote_cluster.go diff --git a/server/model/remote_cluster_test.go b/server/public/model/remote_cluster_test.go similarity index 100% rename from server/model/remote_cluster_test.go rename to server/public/model/remote_cluster_test.go diff --git a/server/model/role.go b/server/public/model/role.go similarity index 100% rename from server/model/role.go rename to server/public/model/role.go diff --git a/server/model/role_test.go b/server/public/model/role_test.go similarity index 100% rename from server/model/role_test.go rename to server/public/model/role_test.go diff --git a/server/model/saml.go b/server/public/model/saml.go similarity index 100% rename from server/model/saml.go rename to server/public/model/saml.go diff --git a/server/model/scheduled_task.go b/server/public/model/scheduled_task.go similarity index 100% rename from server/model/scheduled_task.go rename to server/public/model/scheduled_task.go diff --git a/server/model/scheduled_task_test.go b/server/public/model/scheduled_task_test.go similarity index 100% rename from server/model/scheduled_task_test.go rename to server/public/model/scheduled_task_test.go diff --git a/server/model/scheme.go b/server/public/model/scheme.go similarity index 100% rename from server/model/scheme.go rename to server/public/model/scheme.go diff --git a/server/model/search_params.go b/server/public/model/search_params.go similarity index 100% rename from server/model/search_params.go rename to server/public/model/search_params.go diff --git a/server/model/search_params_test.go b/server/public/model/search_params_test.go similarity index 100% rename from server/model/search_params_test.go rename to server/public/model/search_params_test.go diff --git a/server/model/security_bulletin.go b/server/public/model/security_bulletin.go similarity index 100% rename from server/model/security_bulletin.go rename to server/public/model/security_bulletin.go diff --git a/server/model/session.go b/server/public/model/session.go similarity index 98% rename from server/model/session.go rename to server/public/model/session.go index a41a018bfe..61ef7e6562 100644 --- a/server/model/session.go +++ b/server/public/model/session.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) const ( diff --git a/server/model/session_serial_gen.go b/server/public/model/session_serial_gen.go similarity index 100% rename from server/model/session_serial_gen.go rename to server/public/model/session_serial_gen.go diff --git a/server/model/session_test.go b/server/public/model/session_test.go similarity index 100% rename from server/model/session_test.go rename to server/public/model/session_test.go diff --git a/server/model/shared_channel.go b/server/public/model/shared_channel.go similarity index 100% rename from server/model/shared_channel.go rename to server/public/model/shared_channel.go diff --git a/server/model/shared_channel_test.go b/server/public/model/shared_channel_test.go similarity index 100% rename from server/model/shared_channel_test.go rename to server/public/model/shared_channel_test.go diff --git a/server/model/slack_attachment.go b/server/public/model/slack_attachment.go similarity index 100% rename from server/model/slack_attachment.go rename to server/public/model/slack_attachment.go diff --git a/server/model/slack_attachment_test.go b/server/public/model/slack_attachment_test.go similarity index 100% rename from server/model/slack_attachment_test.go rename to server/public/model/slack_attachment_test.go diff --git a/server/model/slack_compatibility.go b/server/public/model/slack_compatibility.go similarity index 100% rename from server/model/slack_compatibility.go rename to server/public/model/slack_compatibility.go diff --git a/server/model/slack_compatibility_test.go b/server/public/model/slack_compatibility_test.go similarity index 100% rename from server/model/slack_compatibility_test.go rename to server/public/model/slack_compatibility_test.go diff --git a/server/model/status.go b/server/public/model/status.go similarity index 100% rename from server/model/status.go rename to server/public/model/status.go diff --git a/server/model/status_test.go b/server/public/model/status_test.go similarity index 100% rename from server/model/status_test.go rename to server/public/model/status_test.go diff --git a/server/model/suggest_command.go b/server/public/model/suggest_command.go similarity index 100% rename from server/model/suggest_command.go rename to server/public/model/suggest_command.go diff --git a/server/model/switch_request.go b/server/public/model/switch_request.go similarity index 100% rename from server/model/switch_request.go rename to server/public/model/switch_request.go diff --git a/server/model/system.go b/server/public/model/system.go similarity index 100% rename from server/model/system.go rename to server/public/model/system.go diff --git a/server/model/team.go b/server/public/model/team.go similarity index 100% rename from server/model/team.go rename to server/public/model/team.go diff --git a/server/model/team_member.go b/server/public/model/team_member.go similarity index 100% rename from server/model/team_member.go rename to server/public/model/team_member.go diff --git a/server/model/team_member_serial_gen.go b/server/public/model/team_member_serial_gen.go similarity index 100% rename from server/model/team_member_serial_gen.go rename to server/public/model/team_member_serial_gen.go diff --git a/server/model/team_member_test.go b/server/public/model/team_member_test.go similarity index 100% rename from server/model/team_member_test.go rename to server/public/model/team_member_test.go diff --git a/server/model/team_search.go b/server/public/model/team_search.go similarity index 100% rename from server/model/team_search.go rename to server/public/model/team_search.go diff --git a/server/model/team_stats.go b/server/public/model/team_stats.go similarity index 100% rename from server/model/team_stats.go rename to server/public/model/team_stats.go diff --git a/server/model/team_test.go b/server/public/model/team_test.go similarity index 100% rename from server/model/team_test.go rename to server/public/model/team_test.go diff --git a/server/model/terms_of_service.go b/server/public/model/terms_of_service.go similarity index 100% rename from server/model/terms_of_service.go rename to server/public/model/terms_of_service.go diff --git a/server/model/terms_of_service_test.go b/server/public/model/terms_of_service_test.go similarity index 100% rename from server/model/terms_of_service_test.go rename to server/public/model/terms_of_service_test.go diff --git a/server/model/testdata/markdown-sample-with-rewritten-image-urls.md b/server/public/model/testdata/markdown-sample-with-rewritten-image-urls.md similarity index 100% rename from server/model/testdata/markdown-sample-with-rewritten-image-urls.md rename to server/public/model/testdata/markdown-sample-with-rewritten-image-urls.md diff --git a/server/model/testdata/markdown-sample.md b/server/public/model/testdata/markdown-sample.md similarity index 100% rename from server/model/testdata/markdown-sample.md rename to server/public/model/testdata/markdown-sample.md diff --git a/server/model/thread.go b/server/public/model/thread.go similarity index 100% rename from server/model/thread.go rename to server/public/model/thread.go diff --git a/server/model/token.go b/server/public/model/token.go similarity index 100% rename from server/model/token.go rename to server/public/model/token.go diff --git a/server/model/true_up_review_profile.go b/server/public/model/true_up_review_profile.go similarity index 100% rename from server/model/true_up_review_profile.go rename to server/public/model/true_up_review_profile.go diff --git a/server/model/typing_request.go b/server/public/model/typing_request.go similarity index 100% rename from server/model/typing_request.go rename to server/public/model/typing_request.go diff --git a/server/model/upload_session.go b/server/public/model/upload_session.go similarity index 100% rename from server/model/upload_session.go rename to server/public/model/upload_session.go diff --git a/server/model/upload_session_test.go b/server/public/model/upload_session_test.go similarity index 100% rename from server/model/upload_session_test.go rename to server/public/model/upload_session_test.go diff --git a/server/model/usage.go b/server/public/model/usage.go similarity index 100% rename from server/model/usage.go rename to server/public/model/usage.go diff --git a/server/model/user.go b/server/public/model/user.go similarity index 99% rename from server/model/user.go rename to server/public/model/user.go index 5fbbd47d6f..3185f88a0f 100644 --- a/server/model/user.go +++ b/server/public/model/user.go @@ -17,8 +17,8 @@ import ( "golang.org/x/crypto/bcrypt" "golang.org/x/text/language" - "github.com/mattermost/mattermost-server/server/v8/platform/services/timezones" - "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/public/shared/timezones" ) const ( diff --git a/server/model/user_access_token.go b/server/public/model/user_access_token.go similarity index 100% rename from server/model/user_access_token.go rename to server/public/model/user_access_token.go diff --git a/server/model/user_access_token_search.go b/server/public/model/user_access_token_search.go similarity index 100% rename from server/model/user_access_token_search.go rename to server/public/model/user_access_token_search.go diff --git a/server/model/user_access_token_test.go b/server/public/model/user_access_token_test.go similarity index 100% rename from server/model/user_access_token_test.go rename to server/public/model/user_access_token_test.go diff --git a/server/model/user_autocomplete.go b/server/public/model/user_autocomplete.go similarity index 100% rename from server/model/user_autocomplete.go rename to server/public/model/user_autocomplete.go diff --git a/server/model/user_count.go b/server/public/model/user_count.go similarity index 100% rename from server/model/user_count.go rename to server/public/model/user_count.go diff --git a/server/model/user_get.go b/server/public/model/user_get.go similarity index 100% rename from server/model/user_get.go rename to server/public/model/user_get.go diff --git a/server/model/user_search.go b/server/public/model/user_search.go similarity index 100% rename from server/model/user_search.go rename to server/public/model/user_search.go diff --git a/server/model/user_serial_gen.go b/server/public/model/user_serial_gen.go similarity index 100% rename from server/model/user_serial_gen.go rename to server/public/model/user_serial_gen.go diff --git a/server/model/user_terms_of_service.go b/server/public/model/user_terms_of_service.go similarity index 100% rename from server/model/user_terms_of_service.go rename to server/public/model/user_terms_of_service.go diff --git a/server/model/user_terms_of_service_test.go b/server/public/model/user_terms_of_service_test.go similarity index 100% rename from server/model/user_terms_of_service_test.go rename to server/public/model/user_terms_of_service_test.go diff --git a/server/model/user_test.go b/server/public/model/user_test.go similarity index 100% rename from server/model/user_test.go rename to server/public/model/user_test.go diff --git a/server/model/users_stats.go b/server/public/model/users_stats.go similarity index 100% rename from server/model/users_stats.go rename to server/public/model/users_stats.go diff --git a/server/model/utils.go b/server/public/model/utils.go similarity index 99% rename from server/model/utils.go rename to server/public/model/utils.go index fb1068e053..8d1230fdc2 100644 --- a/server/model/utils.go +++ b/server/public/model/utils.go @@ -25,7 +25,7 @@ import ( "github.com/pborman/uuid" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" ) const ( diff --git a/server/model/utils_test.go b/server/public/model/utils_test.go similarity index 100% rename from server/model/utils_test.go rename to server/public/model/utils_test.go diff --git a/server/model/version.go b/server/public/model/version.go similarity index 100% rename from server/model/version.go rename to server/public/model/version.go diff --git a/server/model/version_test.go b/server/public/model/version_test.go similarity index 100% rename from server/model/version_test.go rename to server/public/model/version_test.go diff --git a/server/model/websocket_client.go b/server/public/model/websocket_client.go similarity index 99% rename from server/model/websocket_client.go rename to server/public/model/websocket_client.go index 58f6d62c58..cc11d86335 100644 --- a/server/model/websocket_client.go +++ b/server/public/model/websocket_client.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" "github.com/gorilla/websocket" "github.com/vmihailenco/msgpack/v5" diff --git a/server/model/websocket_client_test.go b/server/public/model/websocket_client_test.go similarity index 100% rename from server/model/websocket_client_test.go rename to server/public/model/websocket_client_test.go diff --git a/server/model/websocket_message.go b/server/public/model/websocket_message.go similarity index 100% rename from server/model/websocket_message.go rename to server/public/model/websocket_message.go diff --git a/server/model/websocket_message_test.go b/server/public/model/websocket_message_test.go similarity index 100% rename from server/model/websocket_message_test.go rename to server/public/model/websocket_message_test.go diff --git a/server/model/websocket_request.go b/server/public/model/websocket_request.go similarity index 93% rename from server/model/websocket_request.go rename to server/public/model/websocket_request.go index 1abea988cb..bd6dc4233c 100644 --- a/server/model/websocket_request.go +++ b/server/public/model/websocket_request.go @@ -4,7 +4,7 @@ package model import ( - "github.com/mattermost/mattermost-server/server/v8/platform/shared/i18n" + "github.com/mattermost/mattermost-server/server/public/shared/i18n" "github.com/vmihailenco/msgpack/v5" ) diff --git a/server/model/worktemplate.go b/server/public/model/worktemplate.go similarity index 100% rename from server/model/worktemplate.go rename to server/public/model/worktemplate.go diff --git a/server/plugin/api.go b/server/public/plugin/api.go similarity index 99% rename from server/plugin/api.go rename to server/public/plugin/api.go index 63be22ce43..00aeb14585 100644 --- a/server/plugin/api.go +++ b/server/public/plugin/api.go @@ -9,7 +9,7 @@ import ( plugin "github.com/hashicorp/go-plugin" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // The API can be used to retrieve data or perform actions on behalf of the plugin. Most methods diff --git a/server/plugin/api_timer_layer_generated.go b/server/public/plugin/api_timer_layer_generated.go similarity index 99% rename from server/plugin/api_timer_layer_generated.go rename to server/public/plugin/api_timer_layer_generated.go index 2fd9e8368d..6cb162a569 100644 --- a/server/plugin/api_timer_layer_generated.go +++ b/server/public/plugin/api_timer_layer_generated.go @@ -11,7 +11,7 @@ import ( "net/http" timePkg "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type apiTimerLayer struct { diff --git a/server/plugin/checker/check_api.go b/server/public/plugin/checker/check_api.go similarity index 86% rename from server/plugin/checker/check_api.go rename to server/public/plugin/checker/check_api.go index 88c7a53775..97fd5a474f 100644 --- a/server/plugin/checker/check_api.go +++ b/server/public/plugin/checker/check_api.go @@ -8,8 +8,8 @@ import ( "go/ast" "go/token" - "github.com/mattermost/mattermost-server/server/v8/plugin/checker/internal/asthelpers" - "github.com/mattermost/mattermost-server/server/v8/plugin/checker/internal/version" + "github.com/mattermost/mattermost-server/server/public/plugin/checker/internal/asthelpers" + "github.com/mattermost/mattermost-server/server/public/plugin/checker/internal/version" ) func checkAPIVersionComments(pkgPath string) (result, error) { diff --git a/server/plugin/checker/check_api_test.go b/server/public/plugin/checker/check_api_test.go similarity index 76% rename from server/plugin/checker/check_api_test.go rename to server/public/plugin/checker/check_api_test.go index 5c22f4f231..abb15aac08 100644 --- a/server/plugin/checker/check_api_test.go +++ b/server/public/plugin/checker/check_api_test.go @@ -17,24 +17,24 @@ func TestCheckAPIVersionComments(t *testing.T) { }{ { name: "valid comments", - pkgPath: "github.com/mattermost/mattermost-server/server/v8/plugin/checker/internal/test/valid", + pkgPath: "github.com/mattermost/mattermost-server/server/public/plugin/checker/internal/test/valid", err: "", }, { name: "invalid comments", - pkgPath: "github.com/mattermost/mattermost-server/server/v8/plugin/checker/internal/test/invalid", + pkgPath: "github.com/mattermost/mattermost-server/server/public/plugin/checker/internal/test/invalid", expected: result{ Errors: []string{"internal/test/invalid/invalid.go:15:2: missing a minimum server version comment on method InvalidMethod"}, }, }, { name: "missing API interface", - pkgPath: "github.com/mattermost/mattermost-server/server/v8/plugin/checker/internal/test/missing", + pkgPath: "github.com/mattermost/mattermost-server/server/public/plugin/checker/internal/test/missing", err: "could not find API interface", }, { name: "non-existent package path", - pkgPath: "github.com/mattermost/mattermost-server/server/v8/plugin/checker/internal/test/does_not_exist", + pkgPath: "github.com/mattermost/mattermost-server/server/public/plugin/checker/internal/test/does_not_exist", err: "could not find API interface", }, } diff --git a/server/plugin/checker/internal/asthelpers/helpers.go b/server/public/plugin/checker/internal/asthelpers/helpers.go similarity index 100% rename from server/plugin/checker/internal/asthelpers/helpers.go rename to server/public/plugin/checker/internal/asthelpers/helpers.go diff --git a/server/plugin/checker/internal/test/invalid/invalid.go b/server/public/plugin/checker/internal/test/invalid/invalid.go similarity index 100% rename from server/plugin/checker/internal/test/invalid/invalid.go rename to server/public/plugin/checker/internal/test/invalid/invalid.go diff --git a/server/plugin/checker/internal/test/missing/missing.go b/server/public/plugin/checker/internal/test/missing/missing.go similarity index 100% rename from server/plugin/checker/internal/test/missing/missing.go rename to server/public/plugin/checker/internal/test/missing/missing.go diff --git a/server/plugin/checker/internal/test/valid/valid.go b/server/public/plugin/checker/internal/test/valid/valid.go similarity index 100% rename from server/plugin/checker/internal/test/valid/valid.go rename to server/public/plugin/checker/internal/test/valid/valid.go diff --git a/server/plugin/checker/internal/version/comments.go b/server/public/plugin/checker/internal/version/comments.go similarity index 100% rename from server/plugin/checker/internal/version/comments.go rename to server/public/plugin/checker/internal/version/comments.go diff --git a/server/plugin/checker/internal/version/comments_test.go b/server/public/plugin/checker/internal/version/comments_test.go similarity index 100% rename from server/plugin/checker/internal/version/comments_test.go rename to server/public/plugin/checker/internal/version/comments_test.go diff --git a/server/plugin/checker/internal/version/version.go b/server/public/plugin/checker/internal/version/version.go similarity index 100% rename from server/plugin/checker/internal/version/version.go rename to server/public/plugin/checker/internal/version/version.go diff --git a/server/plugin/checker/internal/version/version_test.go b/server/public/plugin/checker/internal/version/version_test.go similarity index 100% rename from server/plugin/checker/internal/version/version_test.go rename to server/public/plugin/checker/internal/version/version_test.go diff --git a/server/plugin/checker/main.go b/server/public/plugin/checker/main.go similarity index 98% rename from server/plugin/checker/main.go rename to server/public/plugin/checker/main.go index b7a2e76aa7..2c4ba9f044 100644 --- a/server/plugin/checker/main.go +++ b/server/public/plugin/checker/main.go @@ -10,7 +10,7 @@ import ( "strings" ) -const pluginPackagePath = "github.com/mattermost/mattermost-server/server/v8/plugin" +const pluginPackagePath = "github.com/mattermost/mattermost-server/server/public/plugin" type result struct { Warnings []string diff --git a/server/plugin/checker/render.go b/server/public/plugin/checker/render.go similarity index 100% rename from server/plugin/checker/render.go rename to server/public/plugin/checker/render.go diff --git a/server/plugin/client.go b/server/public/plugin/client.go similarity index 100% rename from server/plugin/client.go rename to server/public/plugin/client.go diff --git a/server/plugin/client_rpc.go b/server/public/plugin/client_rpc.go similarity index 99% rename from server/plugin/client_rpc.go rename to server/public/plugin/client_rpc.go index ec30c31ec6..3abc572bb3 100644 --- a/server/plugin/client_rpc.go +++ b/server/public/plugin/client_rpc.go @@ -24,8 +24,8 @@ import ( "github.com/hashicorp/go-plugin" "github.com/lib/pq" - "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" ) var hookNameToId map[string]int = make(map[string]int) diff --git a/server/plugin/client_rpc_generated.go b/server/public/plugin/client_rpc_generated.go similarity index 99% rename from server/plugin/client_rpc_generated.go rename to server/public/plugin/client_rpc_generated.go index 3453a35578..2e3b69dc18 100644 --- a/server/plugin/client_rpc_generated.go +++ b/server/public/plugin/client_rpc_generated.go @@ -10,8 +10,8 @@ import ( "fmt" "log" - "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 init() { diff --git a/server/plugin/context.go b/server/public/plugin/context.go similarity index 100% rename from server/plugin/context.go rename to server/public/plugin/context.go diff --git a/server/plugin/db_rpc.go b/server/public/plugin/db_rpc.go similarity index 100% rename from server/plugin/db_rpc.go rename to server/public/plugin/db_rpc.go diff --git a/server/plugin/doc.go b/server/public/plugin/doc.go similarity index 100% rename from server/plugin/doc.go rename to server/public/plugin/doc.go diff --git a/server/plugin/driver.go b/server/public/plugin/driver.go similarity index 100% rename from server/plugin/driver.go rename to server/public/plugin/driver.go diff --git a/server/plugin/environment.go b/server/public/plugin/environment.go similarity index 98% rename from server/plugin/environment.go rename to server/public/plugin/environment.go index e7254acc36..5a20779889 100644 --- a/server/plugin/environment.go +++ b/server/public/plugin/environment.go @@ -13,9 +13,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/model/utils" - "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" + "github.com/mattermost/mattermost-server/server/public/utils" ) var ErrNotFound = errors.New("Item not found") diff --git a/server/plugin/environment_test.go b/server/public/plugin/environment_test.go similarity index 95% rename from server/plugin/environment_test.go rename to server/public/plugin/environment_test.go index 6a4afa138f..e084a0fc8a 100644 --- a/server/plugin/environment_test.go +++ b/server/public/plugin/environment_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" - "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 TestAvailablePlugins(t *testing.T) { diff --git a/server/plugin/example_hello_world_test.go b/server/public/plugin/example_hello_world_test.go similarity index 92% rename from server/plugin/example_hello_world_test.go rename to server/public/plugin/example_hello_world_test.go index dff5c78d69..044dc071ac 100644 --- a/server/plugin/example_hello_world_test.go +++ b/server/public/plugin/example_hello_world_test.go @@ -7,7 +7,7 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) // HelloWorldPlugin implements the interface expected by the Mattermost server to communicate diff --git a/server/plugin/example_help_test.go b/server/public/plugin/example_help_test.go similarity index 96% rename from server/plugin/example_help_test.go rename to server/public/plugin/example_help_test.go index 9b6f08f4d8..47d6c7c044 100644 --- a/server/plugin/example_help_test.go +++ b/server/public/plugin/example_help_test.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" ) // configuration represents the configuration for this plugin as exposed via the Mattermost diff --git a/server/plugin/hclog_adapter.go b/server/public/plugin/hclog_adapter.go similarity index 97% rename from server/plugin/hclog_adapter.go rename to server/public/plugin/hclog_adapter.go index b2be0eae29..67e5a4ca59 100644 --- a/server/plugin/hclog_adapter.go +++ b/server/public/plugin/hclog_adapter.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/go-hclog" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) type hclogAdapter struct { diff --git a/server/plugin/health_check.go b/server/public/plugin/health_check.go similarity index 96% rename from server/plugin/health_check.go rename to server/public/plugin/health_check.go index 68ffd8b0f0..c34a3653a0 100644 --- a/server/plugin/health_check.go +++ b/server/public/plugin/health_check.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "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 ( diff --git a/server/plugin/health_check_test.go b/server/public/plugin/health_check_test.go similarity index 89% rename from server/plugin/health_check_test.go rename to server/public/plugin/health_check_test.go index 72e9a926a3..dba5cb40c0 100644 --- a/server/plugin/health_check_test.go +++ b/server/public/plugin/health_check_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/require" - "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/utils" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin/utils" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) func TestPluginHealthCheck(t *testing.T) { @@ -35,7 +35,7 @@ func testPluginHealthCheckSuccess(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { @@ -73,8 +73,8 @@ func testPluginHealthCheckPanic(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" ) type MyPlugin struct { diff --git a/server/plugin/hijack.go b/server/public/plugin/hijack.go similarity index 100% rename from server/plugin/hijack.go rename to server/public/plugin/hijack.go diff --git a/server/plugin/hooks.go b/server/public/plugin/hooks.go similarity index 99% rename from server/plugin/hooks.go rename to server/public/plugin/hooks.go index afe727d6a7..e3ab52e8bd 100644 --- a/server/plugin/hooks.go +++ b/server/public/plugin/hooks.go @@ -7,7 +7,7 @@ import ( "io" "net/http" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // These assignments are part of the wire protocol used to trigger hook events in plugins. diff --git a/server/plugin/hooks_timer_layer_generated.go b/server/public/plugin/hooks_timer_layer_generated.go similarity index 99% rename from server/plugin/hooks_timer_layer_generated.go rename to server/public/plugin/hooks_timer_layer_generated.go index 3dfe0f085c..68db921542 100644 --- a/server/plugin/hooks_timer_layer_generated.go +++ b/server/public/plugin/hooks_timer_layer_generated.go @@ -11,7 +11,7 @@ import ( "net/http" timePkg "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type hooksTimerLayer struct { diff --git a/server/plugin/http.go b/server/public/plugin/http.go similarity index 97% rename from server/plugin/http.go rename to server/public/plugin/http.go index 5480e4696a..5e5fbdbc4a 100644 --- a/server/plugin/http.go +++ b/server/public/plugin/http.go @@ -12,7 +12,7 @@ import ( "net/http" "net/rpc" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) type hijackedResponse struct { diff --git a/server/plugin/interface_generator/main.go b/server/public/plugin/interface_generator/main.go similarity index 99% rename from server/plugin/interface_generator/main.go rename to server/public/plugin/interface_generator/main.go index 9992234e77..0111f7b23d 100644 --- a/server/plugin/interface_generator/main.go +++ b/server/public/plugin/interface_generator/main.go @@ -453,7 +453,7 @@ import ( "net/http" timePkg "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type apiTimerLayer struct { @@ -494,7 +494,7 @@ import ( "net/http" timePkg "time" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type hooksTimerLayer struct { @@ -674,7 +674,7 @@ func generatePluginTimerLayer(info *PluginInterfaceInfo) { } func getPluginPackageDir() string { - dirs, err := goList("github.com/mattermost/mattermost-server/server/v8/plugin") + dirs, err := goList("github.com/mattermost/mattermost-server/server/public/plugin") if err != nil { panic(err) } else if len(dirs) != 1 { diff --git a/server/plugin/io_rpc.go b/server/public/plugin/io_rpc.go similarity index 100% rename from server/plugin/io_rpc.go rename to server/public/plugin/io_rpc.go diff --git a/server/plugin/metrics.go b/server/public/plugin/metrics.go similarity index 100% rename from server/plugin/metrics.go rename to server/public/plugin/metrics.go diff --git a/server/plugin/plugintest/api.go b/server/public/plugin/plugintest/api.go similarity index 99% rename from server/plugin/plugintest/api.go rename to server/public/plugin/plugintest/api.go index 9fa1420457..d5a2d392bd 100644 --- a/server/plugin/plugintest/api.go +++ b/server/public/plugin/plugintest/api.go @@ -10,7 +10,7 @@ import ( mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/server/v8/model" + model "github.com/mattermost/mattermost-server/server/public/model" ) // API is an autogenerated mock type for the API type diff --git a/server/plugin/plugintest/doc.go b/server/public/plugin/plugintest/doc.go similarity index 82% rename from server/plugin/plugintest/doc.go rename to server/public/plugin/plugintest/doc.go index ebf514d766..a4e5ea003e 100644 --- a/server/plugin/plugintest/doc.go +++ b/server/public/plugin/plugintest/doc.go @@ -7,5 +7,5 @@ // https://godoc.org/github.com/stretchr/testify/mock // // If you need to import the mock package, you can import it with -// "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock". +// "github.com/mattermost/mattermost-server/server/public/plugin/plugintest/mock". package plugintest diff --git a/server/plugin/plugintest/driver.go b/server/public/plugin/plugintest/driver.go similarity index 99% rename from server/plugin/plugintest/driver.go rename to server/public/plugin/plugintest/driver.go index bd10226f76..db2c82662c 100644 --- a/server/plugin/plugintest/driver.go +++ b/server/public/plugin/plugintest/driver.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - plugin "github.com/mattermost/mattermost-server/server/v8/plugin" + plugin "github.com/mattermost/mattermost-server/server/public/plugin" ) // Driver is an autogenerated mock type for the Driver type diff --git a/server/plugin/plugintest/example_hello_user_test.go b/server/public/plugin/plugintest/example_hello_user_test.go similarity index 85% rename from server/plugin/plugintest/example_hello_user_test.go rename to server/public/plugin/plugintest/example_hello_user_test.go index 0c475382d2..296fd9aee7 100644 --- a/server/plugin/plugintest/example_hello_user_test.go +++ b/server/public/plugin/plugintest/example_hello_user_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/model" - "github.com/mattermost/mattermost-server/server/v8/plugin" - "github.com/mattermost/mattermost-server/server/v8/plugin/plugintest" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost-server/server/public/plugin/plugintest" ) type HelloUserPlugin struct { diff --git a/server/plugin/plugintest/hooks.go b/server/public/plugin/plugintest/hooks.go similarity index 99% rename from server/plugin/plugintest/hooks.go rename to server/public/plugin/plugintest/hooks.go index 29900351ea..d64b23a973 100644 --- a/server/plugin/plugintest/hooks.go +++ b/server/public/plugin/plugintest/hooks.go @@ -10,9 +10,9 @@ import ( mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/server/v8/model" + model "github.com/mattermost/mattermost-server/server/public/model" - plugin "github.com/mattermost/mattermost-server/server/v8/plugin" + plugin "github.com/mattermost/mattermost-server/server/public/plugin" ) // Hooks is an autogenerated mock type for the Hooks type diff --git a/server/plugin/plugintest/mock/mock.go b/server/public/plugin/plugintest/mock/mock.go similarity index 100% rename from server/plugin/plugintest/mock/mock.go rename to server/public/plugin/plugintest/mock/mock.go diff --git a/server/plugin/product.go b/server/public/plugin/product.go similarity index 100% rename from server/plugin/product.go rename to server/public/plugin/product.go diff --git a/server/plugin/product_hooks_generated.go b/server/public/plugin/product_hooks_generated.go similarity index 99% rename from server/plugin/product_hooks_generated.go rename to server/public/plugin/product_hooks_generated.go index b81cc632a4..50c5d9c885 100644 --- a/server/plugin/product_hooks_generated.go +++ b/server/public/plugin/product_hooks_generated.go @@ -11,7 +11,7 @@ import ( "io" "reflect" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) type OnConfigurationChangeIFace interface { diff --git a/server/plugin/stringifier.go b/server/public/plugin/stringifier.go similarity index 100% rename from server/plugin/stringifier.go rename to server/public/plugin/stringifier.go diff --git a/server/plugin/stringifier_test.go b/server/public/plugin/stringifier_test.go similarity index 100% rename from server/plugin/stringifier_test.go rename to server/public/plugin/stringifier_test.go diff --git a/server/plugin/supervisor.go b/server/public/plugin/supervisor.go similarity index 97% rename from server/plugin/supervisor.go rename to server/public/plugin/supervisor.go index ce0dcecab5..c8634f7755 100644 --- a/server/plugin/supervisor.go +++ b/server/public/plugin/supervisor.go @@ -18,8 +18,8 @@ import ( plugin "github.com/hashicorp/go-plugin" "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" ) type supervisor struct { diff --git a/server/plugin/supervisor_test.go b/server/public/plugin/supervisor_test.go similarity index 92% rename from server/plugin/supervisor_test.go rename to server/public/plugin/supervisor_test.go index 29ee285842..aa50174fdc 100644 --- a/server/plugin/supervisor_test.go +++ b/server/public/plugin/supervisor_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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/utils" + "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost-server/server/public/plugin/utils" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) func TestSupervisor(t *testing.T) { diff --git a/server/plugin/utils/test_files_compiler.go b/server/public/plugin/utils/test_files_compiler.go similarity index 100% rename from server/plugin/utils/test_files_compiler.go rename to server/public/plugin/utils/test_files_compiler.go diff --git a/server/platform/shared/i18n/i18n.go b/server/public/shared/i18n/i18n.go similarity index 98% rename from server/platform/shared/i18n/i18n.go rename to server/public/shared/i18n/i18n.go index 605f0a13d4..4307d821d9 100644 --- a/server/platform/shared/i18n/i18n.go +++ b/server/public/shared/i18n/i18n.go @@ -15,7 +15,7 @@ import ( "github.com/mattermost/go-i18n/i18n" "github.com/mattermost/go-i18n/i18n/bundle" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog" + "github.com/mattermost/mattermost-server/server/public/shared/mlog" ) const defaultLocale = "en" diff --git a/server/platform/shared/i18n/i18n_test.go b/server/public/shared/i18n/i18n_test.go similarity index 100% rename from server/platform/shared/i18n/i18n_test.go rename to server/public/shared/i18n/i18n_test.go diff --git a/server/platform/shared/markdown/autolink.go b/server/public/shared/markdown/autolink.go similarity index 100% rename from server/platform/shared/markdown/autolink.go rename to server/public/shared/markdown/autolink.go diff --git a/server/platform/shared/markdown/autolink_test.go b/server/public/shared/markdown/autolink_test.go similarity index 100% rename from server/platform/shared/markdown/autolink_test.go rename to server/public/shared/markdown/autolink_test.go diff --git a/server/platform/shared/markdown/block_quote.go b/server/public/shared/markdown/block_quote.go similarity index 100% rename from server/platform/shared/markdown/block_quote.go rename to server/public/shared/markdown/block_quote.go diff --git a/server/platform/shared/markdown/blocks.go b/server/public/shared/markdown/blocks.go similarity index 100% rename from server/platform/shared/markdown/blocks.go rename to server/public/shared/markdown/blocks.go diff --git a/server/platform/shared/markdown/commonmark_test.go b/server/public/shared/markdown/commonmark_test.go similarity index 100% rename from server/platform/shared/markdown/commonmark_test.go rename to server/public/shared/markdown/commonmark_test.go diff --git a/server/platform/shared/markdown/document.go b/server/public/shared/markdown/document.go similarity index 100% rename from server/platform/shared/markdown/document.go rename to server/public/shared/markdown/document.go diff --git a/server/platform/shared/markdown/fenced_code.go b/server/public/shared/markdown/fenced_code.go similarity index 100% rename from server/platform/shared/markdown/fenced_code.go rename to server/public/shared/markdown/fenced_code.go diff --git a/server/platform/shared/markdown/html.go b/server/public/shared/markdown/html.go similarity index 100% rename from server/platform/shared/markdown/html.go rename to server/public/shared/markdown/html.go diff --git a/server/platform/shared/markdown/html_entities.go b/server/public/shared/markdown/html_entities.go similarity index 100% rename from server/platform/shared/markdown/html_entities.go rename to server/public/shared/markdown/html_entities.go diff --git a/server/platform/shared/markdown/indented_code.go b/server/public/shared/markdown/indented_code.go similarity index 100% rename from server/platform/shared/markdown/indented_code.go rename to server/public/shared/markdown/indented_code.go diff --git a/server/platform/shared/markdown/inlines.go b/server/public/shared/markdown/inlines.go similarity index 100% rename from server/platform/shared/markdown/inlines.go rename to server/public/shared/markdown/inlines.go diff --git a/server/platform/shared/markdown/inspect.go b/server/public/shared/markdown/inspect.go similarity index 100% rename from server/platform/shared/markdown/inspect.go rename to server/public/shared/markdown/inspect.go diff --git a/server/platform/shared/markdown/inspect_test.go b/server/public/shared/markdown/inspect_test.go similarity index 100% rename from server/platform/shared/markdown/inspect_test.go rename to server/public/shared/markdown/inspect_test.go diff --git a/server/platform/shared/markdown/lines.go b/server/public/shared/markdown/lines.go similarity index 100% rename from server/platform/shared/markdown/lines.go rename to server/public/shared/markdown/lines.go diff --git a/server/platform/shared/markdown/lines_test.go b/server/public/shared/markdown/lines_test.go similarity index 100% rename from server/platform/shared/markdown/lines_test.go rename to server/public/shared/markdown/lines_test.go diff --git a/server/platform/shared/markdown/links.go b/server/public/shared/markdown/links.go similarity index 100% rename from server/platform/shared/markdown/links.go rename to server/public/shared/markdown/links.go diff --git a/server/platform/shared/markdown/links_test.go b/server/public/shared/markdown/links_test.go similarity index 100% rename from server/platform/shared/markdown/links_test.go rename to server/public/shared/markdown/links_test.go diff --git a/server/platform/shared/markdown/list.go b/server/public/shared/markdown/list.go similarity index 100% rename from server/platform/shared/markdown/list.go rename to server/public/shared/markdown/list.go diff --git a/server/platform/shared/markdown/markdown.go b/server/public/shared/markdown/markdown.go similarity index 100% rename from server/platform/shared/markdown/markdown.go rename to server/public/shared/markdown/markdown.go diff --git a/server/platform/shared/markdown/paragraph.go b/server/public/shared/markdown/paragraph.go similarity index 100% rename from server/platform/shared/markdown/paragraph.go rename to server/public/shared/markdown/paragraph.go diff --git a/server/platform/shared/markdown/reference_definition.go b/server/public/shared/markdown/reference_definition.go similarity index 100% rename from server/platform/shared/markdown/reference_definition.go rename to server/public/shared/markdown/reference_definition.go diff --git a/server/platform/shared/markdown/text_range_test.go b/server/public/shared/markdown/text_range_test.go similarity index 100% rename from server/platform/shared/markdown/text_range_test.go rename to server/public/shared/markdown/text_range_test.go diff --git a/server/platform/shared/mlog/default.go b/server/public/shared/mlog/default.go similarity index 100% rename from server/platform/shared/mlog/default.go rename to server/public/shared/mlog/default.go diff --git a/server/platform/shared/mlog/global.go b/server/public/shared/mlog/global.go similarity index 100% rename from server/platform/shared/mlog/global.go rename to server/public/shared/mlog/global.go diff --git a/server/platform/shared/mlog/global_test.go b/server/public/shared/mlog/global_test.go similarity index 98% rename from server/platform/shared/mlog/global_test.go rename to server/public/shared/mlog/global_test.go index 8c661d7e77..4cc53780b9 100644 --- a/server/platform/shared/mlog/global_test.go +++ b/server/public/shared/mlog/global_test.go @@ -14,7 +14,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 TestLoggingBeforeInitialized(t *testing.T) { diff --git a/server/platform/shared/mlog/graphql.go b/server/public/shared/mlog/graphql.go similarity index 100% rename from server/platform/shared/mlog/graphql.go rename to server/public/shared/mlog/graphql.go diff --git a/server/platform/shared/mlog/levels.go b/server/public/shared/mlog/levels.go similarity index 100% rename from server/platform/shared/mlog/levels.go rename to server/public/shared/mlog/levels.go diff --git a/server/platform/shared/mlog/mlog.go b/server/public/shared/mlog/mlog.go similarity index 100% rename from server/platform/shared/mlog/mlog.go rename to server/public/shared/mlog/mlog.go diff --git a/server/platform/shared/mlog/options.go b/server/public/shared/mlog/options.go similarity index 100% rename from server/platform/shared/mlog/options.go rename to server/public/shared/mlog/options.go diff --git a/server/platform/shared/mlog/tlog.go b/server/public/shared/mlog/tlog.go similarity index 100% rename from server/platform/shared/mlog/tlog.go rename to server/public/shared/mlog/tlog.go diff --git a/server/platform/services/timezones/default.go b/server/public/shared/timezones/default.go similarity index 100% rename from server/platform/services/timezones/default.go rename to server/public/shared/timezones/default.go diff --git a/server/platform/services/timezones/timezones.go b/server/public/shared/timezones/timezones.go similarity index 100% rename from server/platform/services/timezones/timezones.go rename to server/public/shared/timezones/timezones.go diff --git a/server/platform/services/timezones/timezones_test.go b/server/public/shared/timezones/timezones_test.go similarity index 100% rename from server/platform/services/timezones/timezones_test.go rename to server/public/shared/timezones/timezones_test.go diff --git a/server/model/utils/file.go b/server/public/utils/file.go similarity index 100% rename from server/model/utils/file.go rename to server/public/utils/file.go diff --git a/server/model/utils/file_test.go b/server/public/utils/file_test.go similarity index 100% rename from server/model/utils/file_test.go rename to server/public/utils/file_test.go diff --git a/server/model/utils/json.go b/server/public/utils/json.go similarity index 100% rename from server/model/utils/json.go rename to server/public/utils/json.go diff --git a/server/model/utils/json_test.go b/server/public/utils/json_test.go similarity index 98% rename from server/model/utils/json_test.go rename to server/public/utils/json_test.go index 5686684ca5..0f2bad3e33 100644 --- a/server/model/utils/json_test.go +++ b/server/public/utils/json_test.go @@ -11,7 +11,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/server/v8/model/utils" + "github.com/mattermost/mattermost-server/server/public/utils" ) func TestHumanizeJsonError(t *testing.T) { diff --git a/server/scripts/config_generator/main.go b/server/scripts/config_generator/main.go index 6767d13912..280d606a5d 100644 --- a/server/scripts/config_generator/main.go +++ b/server/scripts/config_generator/main.go @@ -8,7 +8,7 @@ import ( "fmt" "os" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" ) // generateDefaultConfig writes default config to outputFile. diff --git a/server/scripts/config_generator/main_test.go b/server/scripts/config_generator/main_test.go index da10cd3491..856a1d2899 100644 --- a/server/scripts/config_generator/main_test.go +++ b/server/scripts/config_generator/main_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/mattermost/mattermost-server/server/v8/model" + "github.com/mattermost/mattermost-server/server/public/model" "github.com/stretchr/testify/require" ) diff --git a/server/scripts/setup_go_work.sh b/server/scripts/setup_go_work.sh deleted file mode 100755 index 821a48588e..0000000000 --- a/server/scripts/setup_go_work.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [[ $1 != "true" ]] ; -then - echo "Creating a go.work file" - - txt="go 1.19\n\nuse ./\n" - - if [ "$BUILD_ENTERPRISE_READY" == "true" ] - then - txt="${txt}use ../../enterprise\n" - fi - - printf "$txt" > "go.work" -fi