diff --git a/server/Makefile b/server/Makefile index 1fff34d07bb..0e2b90fe0e9 100644 --- a/server/Makefile +++ b/server/Makefile @@ -58,7 +58,7 @@ endif MM_SERVER_PATH ?= $(PWD) MMCTL_BUILD_TAGS = MMCTL_TESTFLAGS = -timeout 30m -race -v -MMCTL_PKG = github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/commands +MMCTL_PKG = github.com/mattermost/mattermost/server/v8/cmd/mmctl/commands LDFLAGS += -X "$(MMCTL_PKG).gitCommit=$(BUILD_HASH)" LDFLAGS += -X "$(MMCTL_PKG).gitTreeState=$(GIT_TREESTATE)" LDFLAGS += -X "$(MMCTL_PKG).buildDate=$(BUILD_DATE)" @@ -70,7 +70,7 @@ BUILD_ENTERPRISE_READY = false BUILD_TYPE_NAME = team BUILD_HASH_ENTERPRISE = none ifneq ($(wildcard $(BUILD_ENTERPRISE_DIR)/.),) - MMCTL_TESTFLAGS += -ldflags '-X "$(MMCTL_PKG).EnableEnterpriseTests=true" -X "github.com/mattermost/mattermost-server/server/public/model.BuildEnterpriseReady=true"' + MMCTL_TESTFLAGS += -ldflags '-X "$(MMCTL_PKG).EnableEnterpriseTests=true" -X "github.com/mattermost/mattermost/server/public/model.BuildEnterpriseReady=true"' MMCTL_BUILD_TAGS += enterprise ifeq ($(BUILD_ENTERPRISE),true) @@ -117,11 +117,11 @@ GOFLAGS ?= $(GOFLAGS:) export GOBIN ?= $(PWD)/bin GO=go DELVE=dlv -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)" +LDFLAGS += -X "github.com/mattermost/mattermost/server/public/model.BuildNumber=$(BUILD_NUMBER)" +LDFLAGS += -X "github.com/mattermost/mattermost/server/public/model.BuildDate=$(BUILD_DATE)" +LDFLAGS += -X "github.com/mattermost/mattermost/server/public/model.BuildHash=$(BUILD_HASH)" +LDFLAGS += -X "github.com/mattermost/mattermost/server/public/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)" +LDFLAGS += -X "github.com/mattermost/mattermost/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) @@ -206,7 +206,7 @@ endif include config.mk include build/*.mk -LDFLAGS += -X "github.com/mattermost/mattermost-server/server/public/model.MockCWS=$(MM_ENABLE_CWS_MOCK)" +LDFLAGS += -X "github.com/mattermost/mattermost/server/public/model.MockCWS=$(MM_ENABLE_CWS_MOCK)" RUN_IN_BACKGROUND ?= ifeq ($(RUN_SERVER_IN_BACKGROUND),true) @@ -399,7 +399,7 @@ platform-mocks: ## Creates mocks for platform interfaces. mmctl-mocks: ## Creates mocks for mmctl $(GO) install github.com/golang/mock/mockgen@v1.6.0 - $(GOBIN)/mockgen -destination=cmd/mmctl/mocks/client_mock.go -copyright_file=cmd/mmctl/mocks/copyright.txt -package=mocks github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client Client + $(GOBIN)/mockgen -destination=cmd/mmctl/mocks/client_mock.go -copyright_file=cmd/mmctl/mocks/copyright.txt -package=mocks github.com/mattermost/mattermost/server/v8/cmd/mmctl/client Client pluginapi: ## Generates api and hooks glue code for plugins $(GO) generate $(GOFLAGS) ./public/plugin @@ -575,20 +575,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/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)'" + -X github.com/mattermost/mattermost/server/public/model.BuildNumber=$(BUILD_NUMBER)\ + -X \"github.com/mattermost/mattermost/server/public/model.BuildDate=$(BUILD_DATE)\"\ + -X github.com/mattermost/mattermost/server/public/model.BuildHash=$(BUILD_HASH)\ + -X github.com/mattermost/mattermost/server/public/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\ + -X github.com/mattermost/mattermost/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/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)'" + -X github.com/mattermost/mattermost/server/public/model.BuildNumber=$(BUILD_NUMBER)\ + -X \"github.com/mattermost/mattermost/server/public/model.BuildDate=$(BUILD_DATE)\"\ + -X github.com/mattermost/mattermost/server/public/model.BuildHash=$(BUILD_HASH)\ + -X github.com/mattermost/mattermost/server/public/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\ + -X github.com/mattermost/mattermost/server/public/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'" run-cli: start-docker ## Runs CLI. @echo Running mattermost for development diff --git a/server/boards/api/admin.go b/server/boards/api/admin.go index 4c81506e039..4c139df5faa 100644 --- a/server/boards/api/admin.go +++ b/server/boards/api/admin.go @@ -11,10 +11,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) type AdminSetPasswordData struct { diff --git a/server/boards/api/api.go b/server/boards/api/api.go index 411cd6ba5de..d1851cc931c 100644 --- a/server/boards/api/api.go +++ b/server/boards/api/api.go @@ -12,12 +12,12 @@ import ( "github.com/gorilla/mux" - "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/boards/services/audit" - "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions" + "github.com/mattermost/mattermost/server/v8/boards/app" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/services/permissions" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/boards/api/api_test.go b/server/boards/api/api_test.go index b09a0c1dd4b..f9f220ab94f 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/boards/model" ) func TestErrorResponse(t *testing.T) { diff --git a/server/boards/api/archive.go b/server/boards/api/archive.go index de6bb250523..aa4d2c6aa20 100644 --- a/server/boards/api/archive.go +++ b/server/boards/api/archive.go @@ -10,11 +10,11 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" - mm_model "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/boards/api/audit.go b/server/boards/api/audit.go index 766e166f585..432060755b2 100644 --- a/server/boards/api/audit.go +++ b/server/boards/api/audit.go @@ -6,8 +6,8 @@ package api import ( "net/http" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" ) // makeAuditRecord creates an audit record pre-populated with data from the request. diff --git a/server/boards/api/auth.go b/server/boards/api/auth.go index e9cf3ee131e..dcac1f68a04 100644 --- a/server/boards/api/auth.go +++ b/server/boards/api/auth.go @@ -13,12 +13,12 @@ import ( "github.com/gorilla/mux" - "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/boards/services/auth" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/services/auth" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 4d9cb7a47d9..17e0668ba8a 100644 --- a/server/boards/api/blocks.go +++ b/server/boards/api/blocks.go @@ -12,10 +12,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 dd782150f1e..2c3176ce786 100644 --- a/server/boards/api/boards.go +++ b/server/boards/api/boards.go @@ -10,10 +10,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 eca8012ed35..946840ffa1d 100644 --- a/server/boards/api/boards_and_blocks.go +++ b/server/boards/api/boards_and_blocks.go @@ -11,10 +11,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 69cef8cb237..b847d30370d 100644 --- a/server/boards/api/cards.go +++ b/server/boards/api/cards.go @@ -12,10 +12,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/boards/api/categories.go b/server/boards/api/categories.go index ef269e98aeb..c6d86f9bb75 100644 --- a/server/boards/api/categories.go +++ b/server/boards/api/categories.go @@ -11,8 +11,8 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" ) func (a *API) registerCategoriesRoutes(r *mux.Router) { diff --git a/server/boards/api/channels.go b/server/boards/api/channels.go index d51eb971db0..5190a2c2103 100644 --- a/server/boards/api/channels.go +++ b/server/boards/api/channels.go @@ -10,11 +10,11 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" - mm_model "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 b1bc1bdc6d8..913dbe5b016 100644 --- a/server/boards/api/compliance.go +++ b/server/boards/api/compliance.go @@ -11,10 +11,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/boards/api/content_blocks.go b/server/boards/api/content_blocks.go index 18a1fd36636..3f72c60b86e 100644 --- a/server/boards/api/content_blocks.go +++ b/server/boards/api/content_blocks.go @@ -8,8 +8,8 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" ) func (a *API) registerContentBlocksRoutes(r *mux.Router) { diff --git a/server/boards/api/files.go b/server/boards/api/files.go index 6fc2279f331..af23d8c97c2 100644 --- a/server/boards/api/files.go +++ b/server/boards/api/files.go @@ -11,17 +11,17 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/server/v8/boards/app" + "github.com/mattermost/mattermost/server/v8/boards/app" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/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/public/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/web" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/platform/shared/web" ) // FileUploadResponse is the response to a file upload diff --git a/server/boards/api/insights.go b/server/boards/api/insights.go index 3b0e230a172..08721ada3db 100644 --- a/server/boards/api/insights.go +++ b/server/boards/api/insights.go @@ -12,10 +12,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" ) func (a *API) registerInsightsRoutes(r *mux.Router) { diff --git a/server/boards/api/limits.go b/server/boards/api/limits.go index bf081849906..b25eb384fbb 100644 --- a/server/boards/api/limits.go +++ b/server/boards/api/limits.go @@ -9,7 +9,7 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) func (a *API) registerLimitsRoutes(r *mux.Router) { diff --git a/server/boards/api/members.go b/server/boards/api/members.go index ad5b1e612cc..2c0be1040b1 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" ) func (a *API) registerMembersRoutes(r *mux.Router) { diff --git a/server/boards/api/onboarding.go b/server/boards/api/onboarding.go index 4e96e9ecc6b..aa2f47917cb 100644 --- a/server/boards/api/onboarding.go +++ b/server/boards/api/onboarding.go @@ -9,7 +9,7 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) func (a *API) registerOnboardingRoutes(r *mux.Router) { diff --git a/server/boards/api/search.go b/server/boards/api/search.go index ec31d162bec..62d369602af 100644 --- a/server/boards/api/search.go +++ b/server/boards/api/search.go @@ -9,10 +9,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 cf34ce9b404..149c5fc9c10 100644 --- a/server/boards/api/sharing.go +++ b/server/boards/api/sharing.go @@ -11,10 +11,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 e505c461312..df1f80e29c7 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/public/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) func (a *API) registerStatisticsRoutes(r *mux.Router) { diff --git a/server/boards/api/subscriptions.go b/server/boards/api/subscriptions.go index 6ec80477b8b..1068aab2d28 100644 --- a/server/boards/api/subscriptions.go +++ b/server/boards/api/subscriptions.go @@ -11,10 +11,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 1d6da5a5824..57aa2235cbf 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/boards/app" + "github.com/mattermost/mattermost/server/v8/boards/model" ) func TestHello(t *testing.T) { diff --git a/server/boards/api/teams.go b/server/boards/api/teams.go index 9a93ec1dd77..7b1515b5df2 100644 --- a/server/boards/api/teams.go +++ b/server/boards/api/teams.go @@ -10,9 +10,9 @@ import ( "github.com/gorilla/mux" - "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/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) func (a *API) registerTeamsRoutes(r *mux.Router) { diff --git a/server/boards/api/templates.go b/server/boards/api/templates.go index f886396628b..5746761925a 100644 --- a/server/boards/api/templates.go +++ b/server/boards/api/templates.go @@ -9,10 +9,10 @@ import ( "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) func (a *API) registerTemplatesRoutes(r *mux.Router) { diff --git a/server/boards/api/users.go b/server/boards/api/users.go index 26e824afca6..c5a01f8c079 100644 --- a/server/boards/api/users.go +++ b/server/boards/api/users.go @@ -10,9 +10,9 @@ import ( "github.com/gorilla/mux" - "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/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) func (a *API) registerUsersRoutes(r *mux.Router) { diff --git a/server/boards/app/app.go b/server/boards/app/app.go index 0a8139d377c..a0259873ed9 100644 --- a/server/boards/app/app.go +++ b/server/boards/app/app.go @@ -8,19 +8,19 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/server/v8/boards/auth" - "github.com/mattermost/mattermost-server/server/v8/boards/services/config" - "github.com/mattermost/mattermost-server/server/v8/boards/services/metrics" - "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/boards/services/store" - "github.com/mattermost/mattermost-server/server/v8/boards/services/webhook" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/v8/boards/ws" + "github.com/mattermost/mattermost/server/v8/boards/auth" + "github.com/mattermost/mattermost/server/v8/boards/services/config" + "github.com/mattermost/mattermost/server/v8/boards/services/metrics" + "github.com/mattermost/mattermost/server/v8/boards/services/notify" + "github.com/mattermost/mattermost/server/v8/boards/services/permissions" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/services/webhook" + "github.com/mattermost/mattermost/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/ws" - 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" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) const ( diff --git a/server/boards/app/app_test.go b/server/boards/app/app_test.go index a938dfd1dfc..26462b7ee32 100644 --- a/server/boards/app/app_test.go +++ b/server/boards/app/app_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/services/config" + "github.com/mattermost/mattermost/server/v8/boards/services/config" ) func TestSetConfig(t *testing.T) { diff --git a/server/boards/app/auth.go b/server/boards/app/auth.go index 49db9891e6b..21cc7130f0a 100644 --- a/server/boards/app/auth.go +++ b/server/boards/app/auth.go @@ -4,11 +4,11 @@ package app import ( - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/auth" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/auth" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" "github.com/pkg/errors" ) diff --git a/server/boards/app/auth_test.go b/server/boards/app/auth_test.go index 6f3093139a0..c360fce844b 100644 --- a/server/boards/app/auth_test.go +++ b/server/boards/app/auth_test.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/auth" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/auth" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) var mockUser = &model.User{ diff --git a/server/boards/app/blocks.go b/server/boards/app/blocks.go index ef121292378..10dd0c09d47 100644 --- a/server/boards/app/blocks.go +++ b/server/boards/app/blocks.go @@ -8,10 +8,10 @@ import ( "fmt" "path/filepath" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/notify" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/notify" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 cc047796fef..392fb1ba79f 100644 --- a/server/boards/app/blocks_test.go +++ b/server/boards/app/blocks_test.go @@ -12,9 +12,9 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) type blockError struct { diff --git a/server/boards/app/boards.go b/server/boards/app/boards.go index 4a7628a97fe..711f9041ebb 100644 --- a/server/boards/app/boards.go +++ b/server/boards/app/boards.go @@ -7,11 +7,11 @@ import ( "errors" "fmt" - "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/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/notify" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) var ( diff --git a/server/boards/app/boards_and_blocks.go b/server/boards/app/boards_and_blocks.go index 6a6de02cbb7..e25ea4ab0b1 100644 --- a/server/boards/app/boards_and_blocks.go +++ b/server/boards/app/boards_and_blocks.go @@ -4,10 +4,10 @@ package app 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/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/notify" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) func (a *App) CreateBoardsAndBlocks(bab *model.BoardsAndBlocks, userID string, addMember bool) (*model.BoardsAndBlocks, error) { diff --git a/server/boards/app/boards_test.go b/server/boards/app/boards_test.go index be672c418d5..a0390a59352 100644 --- a/server/boards/app/boards_test.go +++ b/server/boards/app/boards_test.go @@ -6,14 +6,14 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) func TestAddMemberToBoard(t *testing.T) { diff --git a/server/boards/app/cards.go b/server/boards/app/cards.go index dea4ed88c74..2086d6eb265 100644 --- a/server/boards/app/cards.go +++ b/server/boards/app/cards.go @@ -6,8 +6,8 @@ package app import ( "fmt" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) func (a *App) CreateCard(card *model.Card, boardID string, userID string, disableNotify bool) (*model.Card, error) { diff --git a/server/boards/app/cards_test.go b/server/boards/app/cards_test.go index d1d4b76059e..38dbf587d67 100644 --- a/server/boards/app/cards_test.go +++ b/server/boards/app/cards_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) func TestCreateCard(t *testing.T) { diff --git a/server/boards/app/category.go b/server/boards/app/category.go index ce48580d423..ef769fd934a 100644 --- a/server/boards/app/category.go +++ b/server/boards/app/category.go @@ -7,8 +7,8 @@ import ( "errors" "fmt" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) var errCategoryNotFound = errors.New("category ID specified in input does not exist for user") diff --git a/server/boards/app/category_boards.go b/server/boards/app/category_boards.go index eb142dea7ec..ebf570f01ea 100644 --- a/server/boards/app/category_boards.go +++ b/server/boards/app/category_boards.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) const defaultCategoryBoards = "Boards" diff --git a/server/boards/app/category_boards_test.go b/server/boards/app/category_boards_test.go index a158e62292c..d9a42881718 100644 --- a/server/boards/app/category_boards_test.go +++ b/server/boards/app/category_boards_test.go @@ -6,11 +6,11 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/utils" "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) func TestGetUserCategoryBoards(t *testing.T) { diff --git a/server/boards/app/category_test.go b/server/boards/app/category_test.go index 63e250d2bfb..f61420b5e97 100644 --- a/server/boards/app/category_test.go +++ b/server/boards/app/category_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) func TestCreateCategory(t *testing.T) { diff --git a/server/boards/app/clientConfig.go b/server/boards/app/clientConfig.go index 5814cbc806d..edf367b3eb1 100644 --- a/server/boards/app/clientConfig.go +++ b/server/boards/app/clientConfig.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) func (a *App) GetClientConfig() *model.ClientConfig { diff --git a/server/boards/app/clientConfig_test.go b/server/boards/app/clientConfig_test.go index 6ec12fb50dd..03bc132bbae 100644 --- a/server/boards/app/clientConfig_test.go +++ b/server/boards/app/clientConfig_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/services/config" + "github.com/mattermost/mattermost/server/v8/boards/services/config" ) func TestGetClientConfig(t *testing.T) { diff --git a/server/boards/app/cloud.go b/server/boards/app/cloud.go index 49aeec2ce41..1ca3a3ddee5 100644 --- a/server/boards/app/cloud.go +++ b/server/boards/app/cloud.go @@ -7,12 +7,12 @@ import ( "errors" "fmt" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) var ErrNilPluginAPI = errors.New("server not running in plugin mode") diff --git a/server/boards/app/cloud_test.go b/server/boards/app/cloud_test.go index 51ca5bcbab8..2930306903e 100644 --- a/server/boards/app/cloud_test.go +++ b/server/boards/app/cloud_test.go @@ -12,10 +12,10 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" - "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/v8/boards/model" + mockservicesapi "github.com/mattermost/mattermost/server/v8/boards/model/mocks" ) func TestIsCloud(t *testing.T) { diff --git a/server/boards/app/compliance.go b/server/boards/app/compliance.go index f84c647bc45..d7713872c49 100644 --- a/server/boards/app/compliance.go +++ b/server/boards/app/compliance.go @@ -3,7 +3,7 @@ package app -import "github.com/mattermost/mattermost-server/server/v8/boards/model" +import "github.com/mattermost/mattermost/server/v8/boards/model" func (a *App) GetBoardsForCompliance(opts model.QueryBoardsForComplianceOptions) ([]*model.Board, bool, error) { return a.store.GetBoardsForCompliance(opts) diff --git a/server/boards/app/content_blocks.go b/server/boards/app/content_blocks.go index b5711bb9bfc..fa840d12a63 100644 --- a/server/boards/app/content_blocks.go +++ b/server/boards/app/content_blocks.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) func (a *App) MoveContentBlock(block *model.Block, dstBlock *model.Block, where string, userID string) error { diff --git a/server/boards/app/content_blocks_test.go b/server/boards/app/content_blocks_test.go index 8447eb33111..bf23f9b0cfd 100644 --- a/server/boards/app/content_blocks_test.go +++ b/server/boards/app/content_blocks_test.go @@ -11,7 +11,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) type contentOrderMatcher struct { diff --git a/server/boards/app/export.go b/server/boards/app/export.go index 98c50f46387..de001855732 100644 --- a/server/boards/app/export.go +++ b/server/boards/app/export.go @@ -11,9 +11,9 @@ import ( "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) var ( diff --git a/server/boards/app/files.go b/server/boards/app/files.go index ba9eb85dacf..5211f2294f4 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/public/model" + mm_model "github.com/mattermost/mattermost/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/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) 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 a980b36f1f9..a59e4c8bf23 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" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore/mocks" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore/mocks" ) const ( diff --git a/server/boards/app/helper_test.go b/server/boards/app/helper_test.go index 7f9f164e0e4..a4f862f9d95 100644 --- a/server/boards/app/helper_test.go +++ b/server/boards/app/helper_test.go @@ -7,18 +7,18 @@ import ( "github.com/golang/mock/gomock" - "github.com/mattermost/mattermost-server/server/v8/boards/auth" - "github.com/mattermost/mattermost-server/server/v8/boards/services/config" - "github.com/mattermost/mattermost-server/server/v8/boards/services/metrics" - "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mmpermissions" - 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" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store/mockstore" - "github.com/mattermost/mattermost-server/server/v8/boards/services/webhook" - "github.com/mattermost/mattermost-server/server/v8/boards/ws" + "github.com/mattermost/mattermost/server/v8/boards/auth" + "github.com/mattermost/mattermost/server/v8/boards/services/config" + "github.com/mattermost/mattermost/server/v8/boards/services/metrics" + "github.com/mattermost/mattermost/server/v8/boards/services/permissions/mmpermissions" + mmpermissionsMocks "github.com/mattermost/mattermost/server/v8/boards/services/permissions/mmpermissions/mocks" + permissionsMocks "github.com/mattermost/mattermost/server/v8/boards/services/permissions/mocks" + "github.com/mattermost/mattermost/server/v8/boards/services/store/mockstore" + "github.com/mattermost/mattermost/server/v8/boards/services/webhook" + "github.com/mattermost/mattermost/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/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore/mocks" ) type TestHelper struct { diff --git a/server/boards/app/import.go b/server/boards/app/import.go index 8c92047429d..1bd69794d8a 100644 --- a/server/boards/app/import.go +++ b/server/boards/app/import.go @@ -16,10 +16,10 @@ import ( "github.com/krolaw/zipstream" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/boards/app/import_test.go b/server/boards/app/import_test.go index 061549cbad4..2d1dc2e5629 100644 --- a/server/boards/app/import_test.go +++ b/server/boards/app/import_test.go @@ -7,12 +7,12 @@ import ( "bytes" "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/utils" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) func TestApp_ImportArchive(t *testing.T) { diff --git a/server/boards/app/initialize.go b/server/boards/app/initialize.go index c5f24d2afa5..9de547d5a3c 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/public/shared/mlog" + "github.com/mattermost/mattermost/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 8979220fc44..364b5e0566a 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/public/model" + "github.com/mattermost/mattermost/server/v8/boards/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 016c0354d04..36f67a34dc8 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/public/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) var mockInsightsBoards = []*model.Board{ diff --git a/server/boards/app/onboarding.go b/server/boards/app/onboarding.go index b30b0d5f0fc..48e1f7d805a 100644 --- a/server/boards/app/onboarding.go +++ b/server/boards/app/onboarding.go @@ -6,7 +6,7 @@ package app import ( "errors" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) const ( diff --git a/server/boards/app/onboarding_test.go b/server/boards/app/onboarding_test.go index 97e7eef5299..769310f8cf7 100644 --- a/server/boards/app/onboarding_test.go +++ b/server/boards/app/onboarding_test.go @@ -6,11 +6,11 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/utils" "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) const ( diff --git a/server/boards/app/permissions.go b/server/boards/app/permissions.go index a104819e6cb..ac7f3ff2aaa 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/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" ) func (a *App) HasPermissionToBoard(userID, boardID string, permission *mm_model.Permission) bool { diff --git a/server/boards/app/server_metadata.go b/server/boards/app/server_metadata.go index 28a2a44bcaf..ebd5217c69d 100644 --- a/server/boards/app/server_metadata.go +++ b/server/boards/app/server_metadata.go @@ -6,7 +6,7 @@ package app import ( "runtime" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) type ServerMetadata struct { diff --git a/server/boards/app/server_metadata_test.go b/server/boards/app/server_metadata_test.go index 76991bac20c..073da763769 100644 --- a/server/boards/app/server_metadata_test.go +++ b/server/boards/app/server_metadata_test.go @@ -8,7 +8,7 @@ import ( "runtime" "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) func TestGetServerMetadata(t *testing.T) { diff --git a/server/boards/app/sharing.go b/server/boards/app/sharing.go index 3dc7ede8115..03319276639 100644 --- a/server/boards/app/sharing.go +++ b/server/boards/app/sharing.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) func (a *App) GetSharing(boardID string) (*model.Sharing, error) { diff --git a/server/boards/app/sharing_test.go b/server/boards/app/sharing_test.go index ebf6fea176d..31c024f2114 100644 --- a/server/boards/app/sharing_test.go +++ b/server/boards/app/sharing_test.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) func TestGetSharing(t *testing.T) { diff --git a/server/boards/app/subscriptions.go b/server/boards/app/subscriptions.go index 7e3531a399b..7af755cfa1b 100644 --- a/server/boards/app/subscriptions.go +++ b/server/boards/app/subscriptions.go @@ -4,10 +4,10 @@ package app import ( - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 1620109dabf..8d6c1a8b222 100644 --- a/server/boards/app/teams.go +++ b/server/boards/app/teams.go @@ -4,10 +4,10 @@ package app import ( - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) func (a *App) GetRootTeam() (*model.Team, error) { diff --git a/server/boards/app/teams_test.go b/server/boards/app/teams_test.go index e418c1968ad..9a37f768400 100644 --- a/server/boards/app/teams_test.go +++ b/server/boards/app/teams_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) var errInvalidTeam = errors.New("invalid team id") diff --git a/server/boards/app/templates.go b/server/boards/app/templates.go index 74635e16c45..5e2281cb3f1 100644 --- a/server/boards/app/templates.go +++ b/server/boards/app/templates.go @@ -8,10 +8,10 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/server/v8/boards/assets" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/assets" + "github.com/mattermost/mattermost/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/boards/app/templates_test.go b/server/boards/app/templates_test.go index e8985f39ff1..cd6c88208d3 100644 --- a/server/boards/app/templates_test.go +++ b/server/boards/app/templates_test.go @@ -9,10 +9,10 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/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 75fbb0f3789..5a33bfc875b 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/public/model" + "github.com/mattermost/mattermost/server/v8/boards/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 3e451218051..200a1a5cded 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/public/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) func TestSearchUsers(t *testing.T) { diff --git a/server/boards/auth/auth.go b/server/boards/auth/auth.go index 8e93c0cd440..c929e2614b3 100644 --- a/server/boards/auth/auth.go +++ b/server/boards/auth/auth.go @@ -7,11 +7,11 @@ package auth import ( "github.com/pkg/errors" - "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/boards/services/permissions" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/config" + "github.com/mattermost/mattermost/server/v8/boards/services/permissions" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) type AuthInterface interface { diff --git a/server/boards/auth/auth_test.go b/server/boards/auth/auth_test.go index f5a1828cfad..d5393ccbf2e 100644 --- a/server/boards/auth/auth_test.go +++ b/server/boards/auth/auth_test.go @@ -10,14 +10,14 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "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/boards/services/permissions/localpermissions" - mockpermissions "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mocks" - "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/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/config" + "github.com/mattermost/mattermost/server/v8/boards/services/permissions/localpermissions" + mockpermissions "github.com/mattermost/mattermost/server/v8/boards/services/permissions/mocks" + "github.com/mattermost/mattermost/server/v8/boards/services/store/mockstore" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) type TestHelper struct { diff --git a/server/boards/auth/mocks/mockauth_interface.go b/server/boards/auth/mocks/mockauth_interface.go index 45d151310d0..c9370f1fa26 100644 --- a/server/boards/auth/mocks/mockauth_interface.go +++ b/server/boards/auth/mocks/mockauth_interface.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/boards/auth (interfaces: AuthInterface) +// Source: github.com/mattermost/mattermost/server/v8/boards/auth (interfaces: AuthInterface) // Package mocks is a generated GoMock package. package mocks @@ -11,7 +11,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/server/v8/boards/model" + model "github.com/mattermost/mattermost/server/v8/boards/model" ) // MockAuthInterface is a mock of AuthInterface interface. diff --git a/server/boards/client/client.go b/server/boards/client/client.go index 807f42ed1a4..fad63090dc4 100644 --- a/server/boards/client/client.go +++ b/server/boards/client/client.go @@ -12,10 +12,10 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/server/v8/boards/api" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/api" + "github.com/mattermost/mattermost/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" ) const ( diff --git a/server/boards/integrationtests/blocks_test.go b/server/boards/integrationtests/blocks_test.go index 16365fd0346..2edce3b20d0 100644 --- a/server/boards/integrationtests/blocks_test.go +++ b/server/boards/integrationtests/blocks_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" "github.com/stretchr/testify/require" ) diff --git a/server/boards/integrationtests/board_test.go b/server/boards/integrationtests/board_test.go index 3f48b8f7909..280d1841e1c 100644 --- a/server/boards/integrationtests/board_test.go +++ b/server/boards/integrationtests/board_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/server/v8/boards/client" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/client" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" "github.com/stretchr/testify/require" ) diff --git a/server/boards/integrationtests/boards_and_blocks_test.go b/server/boards/integrationtests/boards_and_blocks_test.go index 965b3f320f6..4246da22fc1 100644 --- a/server/boards/integrationtests/boards_and_blocks_test.go +++ b/server/boards/integrationtests/boards_and_blocks_test.go @@ -6,7 +6,7 @@ package integrationtests import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" "github.com/stretchr/testify/require" ) diff --git a/server/boards/integrationtests/boardsapp_test.go b/server/boards/integrationtests/boardsapp_test.go index 54e4e7c9a51..356c8290a36 100644 --- a/server/boards/integrationtests/boardsapp_test.go +++ b/server/boards/integrationtests/boardsapp_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/server/v8/boards/server" + "github.com/mattermost/mattermost/server/v8/boards/server" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) func TestSetConfiguration(t *testing.T) { diff --git a/server/boards/integrationtests/cards_test.go b/server/boards/integrationtests/cards_test.go index e2290d46aa0..de748d510d9 100644 --- a/server/boards/integrationtests/cards_test.go +++ b/server/boards/integrationtests/cards_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) func TestCreateCard(t *testing.T) { diff --git a/server/boards/integrationtests/clienttestlib.go b/server/boards/integrationtests/clienttestlib.go index 50c71d30655..8e90339a4d9 100644 --- a/server/boards/integrationtests/clienttestlib.go +++ b/server/boards/integrationtests/clienttestlib.go @@ -10,19 +10,19 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/server/v8/boards/client" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/server" - "github.com/mattermost/mattermost-server/server/v8/boards/services/auth" - "github.com/mattermost/mattermost-server/server/v8/boards/services/config" - "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/localpermissions" - "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mmpermissions" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/client" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/server" + "github.com/mattermost/mattermost/server/v8/boards/services/auth" + "github.com/mattermost/mattermost/server/v8/boards/services/config" + "github.com/mattermost/mattermost/server/v8/boards/services/permissions/localpermissions" + "github.com/mattermost/mattermost/server/v8/boards/services/permissions/mmpermissions" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/services/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/boards/utils" - mm_model "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" "github.com/stretchr/testify/require" ) diff --git a/server/boards/integrationtests/compliance_test.go b/server/boards/integrationtests/compliance_test.go index 7ed89c3c7e7..656a1116418 100644 --- a/server/boards/integrationtests/compliance_test.go +++ b/server/boards/integrationtests/compliance_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) var ( diff --git a/server/boards/integrationtests/configuration_test.go b/server/boards/integrationtests/configuration_test.go index a5c05286de7..a1b6a33dda0 100644 --- a/server/boards/integrationtests/configuration_test.go +++ b/server/boards/integrationtests/configuration_test.go @@ -8,14 +8,14 @@ import ( "github.com/golang/mock/gomock" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/server" - "github.com/mattermost/mattermost-server/server/v8/boards/ws" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/server" + "github.com/mattermost/mattermost/server/v8/boards/ws" - mockservicesapi "github.com/mattermost/mattermost-server/server/v8/boards/model/mocks" + mockservicesapi "github.com/mattermost/mattermost/server/v8/boards/model/mocks" - mm_model "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" "github.com/stretchr/testify/assert" ) diff --git a/server/boards/integrationtests/content_blocks_test.go b/server/boards/integrationtests/content_blocks_test.go index 461bbd8da46..6aafa450081 100644 --- a/server/boards/integrationtests/content_blocks_test.go +++ b/server/boards/integrationtests/content_blocks_test.go @@ -7,8 +7,8 @@ import ( "fmt" "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" "github.com/stretchr/testify/require" ) diff --git a/server/boards/integrationtests/export_test.go b/server/boards/integrationtests/export_test.go index f896e83632b..4da8e78f0cb 100644 --- a/server/boards/integrationtests/export_test.go +++ b/server/boards/integrationtests/export_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) func TestExportBoard(t *testing.T) { diff --git a/server/boards/integrationtests/file_test.go b/server/boards/integrationtests/file_test.go index f0598ce83e4..3e6cbbc4e89 100644 --- a/server/boards/integrationtests/file_test.go +++ b/server/boards/integrationtests/file_test.go @@ -7,7 +7,7 @@ import ( "bytes" "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" "github.com/stretchr/testify/require" ) diff --git a/server/boards/integrationtests/permissions_test.go b/server/boards/integrationtests/permissions_test.go index a784ef2bf31..eb43eb0e658 100644 --- a/server/boards/integrationtests/permissions_test.go +++ b/server/boards/integrationtests/permissions_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/client" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/client" + "github.com/mattermost/mattermost/server/v8/boards/model" ) type Clients struct { diff --git a/server/boards/integrationtests/pluginteststore.go b/server/boards/integrationtests/pluginteststore.go index 40bd9092b4a..8f25be52a0a 100644 --- a/server/boards/integrationtests/pluginteststore.go +++ b/server/boards/integrationtests/pluginteststore.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" ) var errTestStore = errors.New("plugin test store error") diff --git a/server/boards/integrationtests/sharing_test.go b/server/boards/integrationtests/sharing_test.go index 982f88c74f9..b8eff2df134 100644 --- a/server/boards/integrationtests/sharing_test.go +++ b/server/boards/integrationtests/sharing_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) func TestSharing(t *testing.T) { diff --git a/server/boards/integrationtests/sidebar_test.go b/server/boards/integrationtests/sidebar_test.go index d62c3b48a33..c458ad8fdb3 100644 --- a/server/boards/integrationtests/sidebar_test.go +++ b/server/boards/integrationtests/sidebar_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) func TestSidebar(t *testing.T) { diff --git a/server/boards/integrationtests/statistics_test.go b/server/boards/integrationtests/statistics_test.go index cb0e44b4568..597a1af6bbb 100644 --- a/server/boards/integrationtests/statistics_test.go +++ b/server/boards/integrationtests/statistics_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/client" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/client" + "github.com/mattermost/mattermost/server/v8/boards/model" ) func TestStatisticsLocalMode(t *testing.T) { diff --git a/server/boards/integrationtests/subscriptions_test.go b/server/boards/integrationtests/subscriptions_test.go index cfd75a70195..9261bcd2d3e 100644 --- a/server/boards/integrationtests/subscriptions_test.go +++ b/server/boards/integrationtests/subscriptions_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/client" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/client" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) func createTestSubscriptions(client *client.Client, num int) ([]*model.Subscription, string, error) { diff --git a/server/boards/integrationtests/teststore.go b/server/boards/integrationtests/teststore.go index 527a38de5aa..d78a462820e 100644 --- a/server/boards/integrationtests/teststore.go +++ b/server/boards/integrationtests/teststore.go @@ -4,9 +4,9 @@ package integrationtests import ( - "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/services/store" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" ) type TestStore struct { diff --git a/server/boards/integrationtests/user_test.go b/server/boards/integrationtests/user_test.go index 836bbbd0c50..2812a18b5d5 100644 --- a/server/boards/integrationtests/user_test.go +++ b/server/boards/integrationtests/user_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) const ( diff --git a/server/boards/model/auth.go b/server/boards/model/auth.go index f63acab92d1..dd7c6264227 100644 --- a/server/boards/model/auth.go +++ b/server/boards/model/auth.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "github.com/mattermost/mattermost-server/server/v8/boards/services/auth" + "github.com/mattermost/mattermost/server/v8/boards/services/auth" ) const ( diff --git a/server/boards/model/block.go b/server/boards/model/block.go index 972e564b0aa..bdf4aa83628 100644 --- a/server/boards/model/block.go +++ b/server/boards/model/block.go @@ -8,7 +8,7 @@ import ( "io" "strconv" - "github.com/mattermost/mattermost-server/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" ) // Block is the basic data unit diff --git a/server/boards/model/block_test.go b/server/boards/model/block_test.go index d4008eb08f5..e9cb3918a9b 100644 --- a/server/boards/model/block_test.go +++ b/server/boards/model/block_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/utils" "github.com/stretchr/testify/require" ) diff --git a/server/boards/model/blockid.go b/server/boards/model/blockid.go index 3a4efae9eff..7280680a4c6 100644 --- a/server/boards/model/blockid.go +++ b/server/boards/model/blockid.go @@ -6,9 +6,9 @@ package model import ( "fmt" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) // GenerateBlockIDs generates new IDs for all the blocks of the list, diff --git a/server/boards/model/blocktype.go b/server/boards/model/blocktype.go index 6c1868898d7..4260aff2b63 100644 --- a/server/boards/model/blocktype.go +++ b/server/boards/model/blocktype.go @@ -7,7 +7,7 @@ import ( "errors" "strings" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) // BlockType represents a block type. diff --git a/server/boards/model/board_insights.go b/server/boards/model/board_insights.go index 75496ee0fc1..4f5b46ea084 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/public/model" + mm_model "github.com/mattermost/mattermost/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 85ac3290701..710b0636dae 100644 --- a/server/boards/model/boards_and_blocks.go +++ b/server/boards/model/boards_and_blocks.go @@ -9,9 +9,9 @@ import ( "fmt" "io" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 7fa02d3f0a9..34659f13855 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) func TestIsValidBoardsAndBlocks(t *testing.T) { diff --git a/server/boards/model/card.go b/server/boards/model/card.go index f27c59af7e8..938ac2d5bc2 100644 --- a/server/boards/model/card.go +++ b/server/boards/model/card.go @@ -9,7 +9,7 @@ import ( "github.com/rivo/uniseg" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) var ErrBoardIDMismatch = errors.New("Board IDs do not match") diff --git a/server/boards/model/card_test.go b/server/boards/model/card_test.go index 96237ebfc8a..a7b4a3452aa 100644 --- a/server/boards/model/card_test.go +++ b/server/boards/model/card_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) func TestBlock2Card(t *testing.T) { diff --git a/server/boards/model/category.go b/server/boards/model/category.go index 0d49b3b0a0a..7829b38829e 100644 --- a/server/boards/model/category.go +++ b/server/boards/model/category.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) const ( diff --git a/server/boards/model/error.go b/server/boards/model/error.go index d850837dfba..30077fddb56 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/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" ) var ( diff --git a/server/boards/model/file.go b/server/boards/model/file.go index 4087829cb4d..4ad8acb758a 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/public/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) func NewFileInfo(name string) *mm_model.FileInfo { diff --git a/server/boards/model/mocks/mockservicesapi.go b/server/boards/model/mocks/mockservicesapi.go index 2847a672bfe..b408f9fbcc7 100644 --- a/server/boards/model/mocks/mockservicesapi.go +++ b/server/boards/model/mocks/mockservicesapi.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/boards/model (interfaces: ServicesAPI) +// Source: github.com/mattermost/mattermost/server/v8/boards/model (interfaces: ServicesAPI) // Package mocks is a generated GoMock package. package mocks @@ -13,8 +13,8 @@ import ( gomock "github.com/golang/mock/gomock" mux "github.com/gorilla/mux" - model "github.com/mattermost/mattermost-server/server/public/model" - mlog "github.com/mattermost/mattermost-server/server/public/shared/mlog" + model "github.com/mattermost/mattermost/server/public/model" + mlog "github.com/mattermost/mattermost/server/public/shared/mlog" ) // MockServicesAPI is a mock of ServicesAPI interface. diff --git a/server/boards/model/mocks/propValueResolverMock.go b/server/boards/model/mocks/propValueResolverMock.go index 0030038d46e..7e141c3bc92 100644 --- a/server/boards/model/mocks/propValueResolverMock.go +++ b/server/boards/model/mocks/propValueResolverMock.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/boards/model (interfaces: PropValueResolver) +// Source: github.com/mattermost/mattermost/server/v8/boards/model (interfaces: PropValueResolver) // Package mocks is a generated GoMock package. package mocks @@ -11,7 +11,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/server/v8/boards/model" + model "github.com/mattermost/mattermost/server/v8/boards/model" ) // MockPropValueResolver is a mock of PropValueResolver interface. diff --git a/server/boards/model/notification.go b/server/boards/model/notification.go index dfb2641aa43..ca3ed086e29 100644 --- a/server/boards/model/notification.go +++ b/server/boards/model/notification.go @@ -6,7 +6,7 @@ package model import ( "time" - "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) // NotificationHint provides a hint that a block has been modified and has subscribers that diff --git a/server/boards/model/permission.go b/server/boards/model/permission.go index d5652563278..1743a68ca23 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/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" ) var ( diff --git a/server/boards/model/properties.go b/server/boards/model/properties.go index c640d87d0a8..ae7b505fb58 100644 --- a/server/boards/model/properties.go +++ b/server/boards/model/properties.go @@ -11,7 +11,7 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) var ErrInvalidBoardBlock = errors.New("invalid board block") diff --git a/server/boards/model/properties_test.go b/server/boards/model/properties_test.go index df24231779a..c2b749bb084 100644 --- a/server/boards/model/properties_test.go +++ b/server/boards/model/properties_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) type MockResolver struct{} diff --git a/server/boards/model/services_api.go b/server/boards/model/services_api.go index 0aa76caee1c..b1c7d72e855 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/boards/model/util.go b/server/boards/model/util.go index b08d31cb3f2..7cd1a9fc753 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/public/model" + mm_model "github.com/mattermost/mattermost/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 29df2ac1049..d5af6a17de5 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/public/shared/mlog" + "github.com/mattermost/mattermost/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 8300d2f7555..93c2bf3e9f1 100644 --- a/server/boards/product/api_adapter.go +++ b/server/boards/product/api_adapter.go @@ -8,11 +8,11 @@ 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) // normalizeAppError returns a truly nil error if appErr is nil diff --git a/server/boards/product/boards_product.go b/server/boards/product/boards_product.go index 98fd4fe3dae..c6a03265a9c 100644 --- a/server/boards/product/boards_product.go +++ b/server/boards/product/boards_product.go @@ -7,13 +7,13 @@ import ( "errors" "fmt" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/server" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/product" ) const ( diff --git a/server/boards/product/imports/boards_imports.go b/server/boards/product/imports/boards_imports.go index e684480eafd..92b215b2d22 100644 --- a/server/boards/product/imports/boards_imports.go +++ b/server/boards/product/imports/boards_imports.go @@ -6,5 +6,5 @@ package imports import ( // Needed to ensure the init() method in the FocalBoard product is run. // This file is copied to the mmserver imports package via makefile. - _ "github.com/mattermost/mattermost-server/server/v8/boards/product" + _ "github.com/mattermost/mattermost/server/v8/boards/product" ) diff --git a/server/boards/server/boards_service.go b/server/boards/server/boards_service.go index 25162775114..2f578697a34 100644 --- a/server/boards/server/boards_service.go +++ b/server/boards/server/boards_service.go @@ -8,19 +8,19 @@ import ( "net/http" "sync" - "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/boards/services/config" - "github.com/mattermost/mattermost-server/server/v8/boards/services/notify" - "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mmpermissions" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store/mattermostauthlayer" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" - "github.com/mattermost/mattermost-server/server/v8/boards/ws" + "github.com/mattermost/mattermost/server/v8/boards/auth" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/config" + "github.com/mattermost/mattermost/server/v8/boards/services/notify" + "github.com/mattermost/mattermost/server/v8/boards/services/permissions/mmpermissions" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/services/store/mattermostauthlayer" + "github.com/mattermost/mattermost/server/v8/boards/services/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/boards/ws" - 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" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/boards/server/boards_service_api.go b/server/boards/server/boards_service_api.go index bef53cd181b..354c422c4a3 100644 --- a/server/boards/server/boards_service_api.go +++ b/server/boards/server/boards_service_api.go @@ -4,11 +4,11 @@ package server import ( - "github.com/mattermost/mattermost-server/server/v8/boards/app" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/app" + "github.com/mattermost/mattermost/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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/product" ) // 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 4c76080fee2..2051230a714 100644 --- a/server/boards/server/boards_service_util.go +++ b/server/boards/server/boards_service_util.go @@ -8,9 +8,9 @@ import ( "path" "strings" - "github.com/mattermost/mattermost-server/server/v8/boards/services/config" + "github.com/mattermost/mattermost/server/v8/boards/services/config" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/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 069c7fe8ea0..17e7a2ada3e 100644 --- a/server/boards/server/data_retention_test.go +++ b/server/boards/server/data_retention_test.go @@ -11,12 +11,12 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/server/v8/boards/services/config" - "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/v8/boards/services/config" + "github.com/mattermost/mattermost/server/v8/boards/services/permissions/localpermissions" + "github.com/mattermost/mattermost/server/v8/boards/services/store/mockstore" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) type TestHelperMockStore struct { diff --git a/server/boards/server/notifications.go b/server/boards/server/notifications.go index bfa3939b782..151036e8e2e 100644 --- a/server/boards/server/notifications.go +++ b/server/boards/server/notifications.go @@ -7,15 +7,15 @@ import ( "fmt" "time" - "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/boards/services/notify/notifymentions" - "github.com/mattermost/mattermost-server/server/v8/boards/services/notify/notifysubscriptions" - "github.com/mattermost/mattermost-server/server/v8/boards/services/notify/plugindelivery" - "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/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/config" + "github.com/mattermost/mattermost/server/v8/boards/services/notify/notifymentions" + "github.com/mattermost/mattermost/server/v8/boards/services/notify/notifysubscriptions" + "github.com/mattermost/mattermost/server/v8/boards/services/notify/plugindelivery" + "github.com/mattermost/mattermost/server/v8/boards/services/permissions" + "github.com/mattermost/mattermost/server/v8/boards/services/store" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) type notifyBackendParams struct { diff --git a/server/boards/server/params.go b/server/boards/server/params.go index 9b23972a667..3ad3f70a3e6 100644 --- a/server/boards/server/params.go +++ b/server/boards/server/params.go @@ -6,14 +6,14 @@ package server import ( "fmt" - "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/boards/services/notify" - "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/boards/ws" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/config" + "github.com/mattermost/mattermost/server/v8/boards/services/notify" + "github.com/mattermost/mattermost/server/v8/boards/services/permissions" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/ws" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) type Params struct { diff --git a/server/boards/server/post.go b/server/boards/server/post.go index 02e229661d1..0459fad986c 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/markdown" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 4f35134d9bc..aaa94193b23 100644 --- a/server/boards/server/server.go +++ b/server/boards/server/server.go @@ -19,26 +19,26 @@ import ( "github.com/oklog/run" - "github.com/mattermost/mattermost-server/server/v8/boards/api" - "github.com/mattermost/mattermost-server/server/v8/boards/app" - "github.com/mattermost/mattermost-server/server/v8/boards/auth" - appModel "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/boards/services/config" - "github.com/mattermost/mattermost-server/server/v8/boards/services/metrics" - "github.com/mattermost/mattermost-server/server/v8/boards/services/notify" - "github.com/mattermost/mattermost-server/server/v8/boards/services/notify/notifylogger" - "github.com/mattermost/mattermost-server/server/v8/boards/services/scheduler" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" - "github.com/mattermost/mattermost-server/server/v8/boards/services/telemetry" - "github.com/mattermost/mattermost-server/server/v8/boards/services/webhook" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/v8/boards/web" - "github.com/mattermost/mattermost-server/server/v8/boards/ws" + "github.com/mattermost/mattermost/server/v8/boards/api" + "github.com/mattermost/mattermost/server/v8/boards/app" + "github.com/mattermost/mattermost/server/v8/boards/auth" + appModel "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/audit" + "github.com/mattermost/mattermost/server/v8/boards/services/config" + "github.com/mattermost/mattermost/server/v8/boards/services/metrics" + "github.com/mattermost/mattermost/server/v8/boards/services/notify" + "github.com/mattermost/mattermost/server/v8/boards/services/notify/notifylogger" + "github.com/mattermost/mattermost/server/v8/boards/services/scheduler" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/services/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/boards/services/telemetry" + "github.com/mattermost/mattermost/server/v8/boards/services/webhook" + "github.com/mattermost/mattermost/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/web" + "github.com/mattermost/mattermost/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/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) const ( diff --git a/server/boards/services/audit/audit.go b/server/boards/services/audit/audit.go index 5162a4a6bea..b32881ddff8 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/boards/services/audit/record.go b/server/boards/services/audit/record.go index a128c68a2e2..ce835b80ef5 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/public/shared/mlog" +import "github.com/mattermost/mattermost/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 5bd5dc8bd81..7ec21b8c96b 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/public/shared/mlog" + "github.com/mattermost/mattermost/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 e36b5309b6c..d5657bf6886 100644 --- a/server/boards/services/notify/notifylogger/logger_backend.go +++ b/server/boards/services/notify/notifylogger/logger_backend.go @@ -4,9 +4,9 @@ package notifylogger import ( - "github.com/mattermost/mattermost-server/server/v8/boards/services/notify" + "github.com/mattermost/mattermost/server/v8/boards/services/notify" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/boards/services/notify/notifymentions/app_api.go b/server/boards/services/notify/notifymentions/app_api.go index ab66fb700f1..85f704921b1 100644 --- a/server/boards/services/notify/notifymentions/app_api.go +++ b/server/boards/services/notify/notifymentions/app_api.go @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. package notifymentions -import "github.com/mattermost/mattermost-server/server/v8/boards/model" +import "github.com/mattermost/mattermost/server/v8/boards/model" type AppAPI interface { GetMemberForBoard(boardID, userID string) (*model.BoardMember, error) diff --git a/server/boards/services/notify/notifymentions/delivery.go b/server/boards/services/notify/notifymentions/delivery.go index c15b1b9d1ab..a23e5119d07 100644 --- a/server/boards/services/notify/notifymentions/delivery.go +++ b/server/boards/services/notify/notifymentions/delivery.go @@ -4,9 +4,9 @@ package notifymentions import ( - "github.com/mattermost/mattermost-server/server/v8/boards/services/notify" + "github.com/mattermost/mattermost/server/v8/boards/services/notify" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/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 ffa823dd054..d169a33294e 100644 --- a/server/boards/services/notify/notifymentions/mentions.go +++ b/server/boards/services/notify/notifymentions/mentions.go @@ -7,9 +7,9 @@ import ( "regexp" "strings" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/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 9ed57753a37..f0f654bc7b6 100644 --- a/server/boards/services/notify/notifymentions/mentions_backend.go +++ b/server/boards/services/notify/notifymentions/mentions_backend.go @@ -10,11 +10,11 @@ import ( "github.com/wiggin77/merror" - "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/boards/services/permissions" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/notify" + "github.com/mattermost/mattermost/server/v8/boards/services/permissions" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 412236d5450..8f479cc149f 100644 --- a/server/boards/services/notify/notifymentions/mentions_test.go +++ b/server/boards/services/notify/notifymentions/mentions_test.go @@ -7,9 +7,9 @@ import ( "reflect" "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" ) func Test_extractMentions(t *testing.T) { diff --git a/server/boards/services/notify/notifysubscriptions/app_api.go b/server/boards/services/notify/notifysubscriptions/app_api.go index cfbee710197..f15c0690e5e 100644 --- a/server/boards/services/notify/notifysubscriptions/app_api.go +++ b/server/boards/services/notify/notifysubscriptions/app_api.go @@ -6,7 +6,7 @@ package notifysubscriptions import ( "time" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) type AppAPI interface { diff --git a/server/boards/services/notify/notifysubscriptions/delivery.go b/server/boards/services/notify/notifysubscriptions/delivery.go index b02180d7a15..06df5aa26a5 100644 --- a/server/boards/services/notify/notifysubscriptions/delivery.go +++ b/server/boards/services/notify/notifysubscriptions/delivery.go @@ -4,9 +4,9 @@ package notifysubscriptions import ( - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/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 72c8a444d46..527a4411ada 100644 --- a/server/boards/services/notify/notifysubscriptions/diff.go +++ b/server/boards/services/notify/notifysubscriptions/diff.go @@ -7,9 +7,9 @@ import ( "fmt" "sort" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 eb7686631a6..8fc1edb899a 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/public/shared/mlog" + "github.com/mattermost/mattermost/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 2a0ed9c4073..38738f788a6 100644 --- a/server/boards/services/notify/notifysubscriptions/diff2slackattachments.go +++ b/server/boards/services/notify/notifysubscriptions/diff2slackattachments.go @@ -13,10 +13,10 @@ import ( "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/boards/services/notify/notifysubscriptions/notifier.go b/server/boards/services/notify/notifysubscriptions/notifier.go index ad70bb2b20a..6e4acf6e230 100644 --- a/server/boards/services/notify/notifysubscriptions/notifier.go +++ b/server/boards/services/notify/notifysubscriptions/notifier.go @@ -11,11 +11,11 @@ import ( "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/permissions" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 a8c2e09ff15..6108618aa1f 100644 --- a/server/boards/services/notify/notifysubscriptions/subscriptions_backend.go +++ b/server/boards/services/notify/notifysubscriptions/subscriptions_backend.go @@ -11,11 +11,11 @@ import ( "github.com/wiggin77/merror" - "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/boards/services/permissions" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/notify" + "github.com/mattermost/mattermost/server/v8/boards/services/permissions" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/boards/services/notify/notifysubscriptions/util.go b/server/boards/services/notify/notifysubscriptions/util.go index 04f5b77433d..e808009c9f1 100644 --- a/server/boards/services/notify/notifysubscriptions/util.go +++ b/server/boards/services/notify/notifysubscriptions/util.go @@ -6,7 +6,7 @@ package notifysubscriptions import ( "strings" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) func getBoardDescription(board *model.Block) string { diff --git a/server/boards/services/notify/plugindelivery/mention_deliver.go b/server/boards/services/notify/plugindelivery/mention_deliver.go index 7a4d8bfa13a..44f073cf39d 100644 --- a/server/boards/services/notify/plugindelivery/mention_deliver.go +++ b/server/boards/services/notify/plugindelivery/mention_deliver.go @@ -6,10 +6,10 @@ package plugindelivery import ( "fmt" - "github.com/mattermost/mattermost-server/server/v8/boards/services/notify" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/services/notify" + "github.com/mattermost/mattermost/server/v8/boards/utils" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/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/message.go b/server/boards/services/notify/plugindelivery/message.go index ebaa0f7020f..ab96233db03 100644 --- a/server/boards/services/notify/plugindelivery/message.go +++ b/server/boards/services/notify/plugindelivery/message.go @@ -6,7 +6,7 @@ package plugindelivery import ( "fmt" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) const ( diff --git a/server/boards/services/notify/plugindelivery/plugin_delivery.go b/server/boards/services/notify/plugindelivery/plugin_delivery.go index 8e1e179ac51..b3538b83b94 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/public/model" + mm_model "github.com/mattermost/mattermost/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 2382c0f32c1..bc7df9e4d16 100644 --- a/server/boards/services/notify/plugindelivery/subscription_deliver.go +++ b/server/boards/services/notify/plugindelivery/subscription_deliver.go @@ -7,9 +7,9 @@ import ( "errors" "fmt" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" ) var ( diff --git a/server/boards/services/notify/plugindelivery/user.go b/server/boards/services/notify/plugindelivery/user.go index 8075c2c626b..377258c715c 100644 --- a/server/boards/services/notify/plugindelivery/user.go +++ b/server/boards/services/notify/plugindelivery/user.go @@ -6,9 +6,9 @@ package plugindelivery import ( "strings" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/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 d1f9f4fb58a..c5b19f12c48 100644 --- a/server/boards/services/notify/plugindelivery/user_test.go +++ b/server/boards/services/notify/plugindelivery/user_test.go @@ -7,9 +7,9 @@ import ( "reflect" "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" ) var ( diff --git a/server/boards/services/notify/service.go b/server/boards/services/notify/service.go index a728dcbcafc..5f9533ee71b 100644 --- a/server/boards/services/notify/service.go +++ b/server/boards/services/notify/service.go @@ -8,9 +8,9 @@ import ( "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 433d0d32d4d..4ac1fe9e484 100644 --- a/server/boards/services/permissions/localpermissions/helpers_test.go +++ b/server/boards/services/permissions/localpermissions/helpers_test.go @@ -6,11 +6,11 @@ package localpermissions import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - permissionsMocks "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mocks" + "github.com/mattermost/mattermost/server/v8/boards/model" + permissionsMocks "github.com/mattermost/mattermost/server/v8/boards/services/permissions/mocks" - mm_model "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 a8f9ba98e67..ab0d35e98a9 100644 --- a/server/boards/services/permissions/localpermissions/localpermissions.go +++ b/server/boards/services/permissions/localpermissions/localpermissions.go @@ -4,11 +4,11 @@ package localpermissions import ( - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/permissions" - mm_model "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 2cfb4878e84..82b5549c5a2 100644 --- a/server/boards/services/permissions/localpermissions/localpermissions_test.go +++ b/server/boards/services/permissions/localpermissions/localpermissions_test.go @@ -7,9 +7,9 @@ import ( "database/sql" "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/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 850f5b76621..c3783349937 100644 --- a/server/boards/services/permissions/mmpermissions/helpers_test.go +++ b/server/boards/services/permissions/mmpermissions/helpers_test.go @@ -6,12 +6,12 @@ package mmpermissions import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - 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" + "github.com/mattermost/mattermost/server/v8/boards/model" + mmpermissionsMocks "github.com/mattermost/mattermost/server/v8/boards/services/permissions/mmpermissions/mocks" + permissionsMocks "github.com/mattermost/mattermost/server/v8/boards/services/permissions/mocks" - mm_model "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 2fb66e8aa8d..324e884bbbb 100644 --- a/server/boards/services/permissions/mmpermissions/mmpermissions.go +++ b/server/boards/services/permissions/mmpermissions/mmpermissions.go @@ -4,11 +4,11 @@ package mmpermissions import ( - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/permissions" - mm_model "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 aafe67ff8a1..1cb68b08c5e 100644 --- a/server/boards/services/permissions/mmpermissions/mmpermissions_test.go +++ b/server/boards/services/permissions/mmpermissions/mmpermissions_test.go @@ -1,16 +1,16 @@ // 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/public/plugin API +//go:generate mockgen -copyright_file=../../../../copyright.txt -destination=mocks/mockpluginapi.go -package mocks github.com/mattermost/mattermost/server/public/plugin API package mmpermissions import ( "database/sql" "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/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 98888663462..f3cfc95df80 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/public/plugin (interfaces: API) +// Source: github.com/mattermost/mattermost/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/public/model" + model "github.com/mattermost/mattermost/server/public/model" ) // MockAPI is a mock of API interface. diff --git a/server/boards/services/permissions/mocks/mockstore.go b/server/boards/services/permissions/mocks/mockstore.go index 39fe98f0290..d70a57290a9 100644 --- a/server/boards/services/permissions/mocks/mockstore.go +++ b/server/boards/services/permissions/mocks/mockstore.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/boards/services/permissions (interfaces: Store) +// Source: github.com/mattermost/mattermost/server/v8/boards/services/permissions (interfaces: Store) // Package mocks is a generated GoMock package. package mocks @@ -11,7 +11,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/server/v8/boards/model" + model "github.com/mattermost/mattermost/server/v8/boards/model" ) // MockStore is a mock of Store interface. diff --git a/server/boards/services/permissions/permissions.go b/server/boards/services/permissions/permissions.go index c1c9e3413dd..5a50a175964 100644 --- a/server/boards/services/permissions/permissions.go +++ b/server/boards/services/permissions/permissions.go @@ -6,9 +6,9 @@ package permissions import ( - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/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 832a7e88add..55be08f1515 100644 --- a/server/boards/services/store/generators/transactional_store.go.tmpl +++ b/server/boards/services/store/generators/transactional_store.go.tmpl @@ -16,10 +16,10 @@ import ( "context" "time" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost/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 0858cc78ce4..cd91580c942 100644 --- a/server/boards/services/store/mattermostauthlayer/mattermostauthlayer.go +++ b/server/boards/services/store/mattermostauthlayer/mattermostauthlayer.go @@ -11,15 +11,15 @@ import ( "net/http" "strings" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" sq "github.com/Masterminds/squirrel" - "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" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 4d3b425bb86..247fd7dca02 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/boards/model" + mockservicesapi "github.com/mattermost/mattermost/server/v8/boards/model/mocks" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/mockstore/mockstore.go b/server/boards/services/store/mockstore/mockstore.go index bf38cd7291f..9b5f61cfd8d 100644 --- a/server/boards/services/store/mockstore/mockstore.go +++ b/server/boards/services/store/mockstore/mockstore.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/boards/services/store (interfaces: Store) +// Source: github.com/mattermost/mattermost/server/v8/boards/services/store (interfaces: Store) // Package mockstore is a generated GoMock package. package mockstore @@ -12,8 +12,8 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/server/public/model" - model0 "github.com/mattermost/mattermost-server/server/v8/boards/model" + model "github.com/mattermost/mattermost/server/public/model" + model0 "github.com/mattermost/mattermost/server/v8/boards/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 8516bf6bee9..2828f19041b 100644 --- a/server/boards/services/store/sqlstore/blocks.go +++ b/server/boards/services/store/sqlstore/blocks.go @@ -9,14 +9,14 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/utils" sq "github.com/Masterminds/squirrel" _ "github.com/lib/pq" // postgres driver - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/boards/services/store/sqlstore/board.go b/server/boards/services/store/sqlstore/board.go index 2e8ad262ab7..ee1aaacc35f 100644 --- a/server/boards/services/store/sqlstore/board.go +++ b/server/boards/services/store/sqlstore/board.go @@ -12,13 +12,13 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/utils" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 58182932dac..927716c78e8 100644 --- a/server/boards/services/store/sqlstore/board_insights.go +++ b/server/boards/services/store/sqlstore/board_insights.go @@ -9,13 +9,13 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" sq "github.com/Masterminds/squirrel" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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_and_blocks.go b/server/boards/services/store/sqlstore/boards_and_blocks.go index 8221470d94d..f17f1d485f9 100644 --- a/server/boards/services/store/sqlstore/boards_and_blocks.go +++ b/server/boards/services/store/sqlstore/boards_and_blocks.go @@ -8,7 +8,7 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) type BlockDoesntBelongToBoardsErr struct { diff --git a/server/boards/services/store/sqlstore/boards_migrator.go b/server/boards/services/store/sqlstore/boards_migrator.go index c83672794b1..c4599c0ba31 100644 --- a/server/boards/services/store/sqlstore/boards_migrator.go +++ b/server/boards/services/store/sqlstore/boards_migrator.go @@ -18,11 +18,11 @@ 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/db" + mmSqlStore "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) var tablePrefix = "focalboard_" diff --git a/server/boards/services/store/sqlstore/category.go b/server/boards/services/store/sqlstore/category.go index df626fedc61..7f0e0a636a9 100644 --- a/server/boards/services/store/sqlstore/category.go +++ b/server/boards/services/store/sqlstore/category.go @@ -9,10 +9,10 @@ import ( 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/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 699c5938059..7d14f8779c1 100644 --- a/server/boards/services/store/sqlstore/category_boards.go +++ b/server/boards/services/store/sqlstore/category_boards.go @@ -9,10 +9,10 @@ import ( 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/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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/cloud.go b/server/boards/services/store/sqlstore/cloud.go index 054d71a8f5b..0ae6840ac74 100644 --- a/server/boards/services/store/sqlstore/cloud.go +++ b/server/boards/services/store/sqlstore/cloud.go @@ -10,8 +10,8 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" ) var ErrInvalidCardLimitValue = errors.New("card limit value is invalid") diff --git a/server/boards/services/store/sqlstore/compliance.go b/server/boards/services/store/sqlstore/compliance.go index 995504c521f..6d6e5316cae 100644 --- a/server/boards/services/store/sqlstore/compliance.go +++ b/server/boards/services/store/sqlstore/compliance.go @@ -8,9 +8,9 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 994ee373bc2..0b95084b40c 100644 --- a/server/boards/services/store/sqlstore/data_migrations.go +++ b/server/boards/services/store/sqlstore/data_migrations.go @@ -12,10 +12,10 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/wiggin77/merror" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/boards/services/store/sqlstore/data_migrations_test.go b/server/boards/services/store/sqlstore/data_migrations_test.go index f2dad542283..91f77036df6 100644 --- a/server/boards/services/store/sqlstore/data_migrations_test.go +++ b/server/boards/services/store/sqlstore/data_migrations_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore/migrationstests" + "github.com/mattermost/mattermost/server/v8/boards/services/store/sqlstore/migrationstests" "github.com/mgdelacroix/foundation" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/server/boards/services/store/sqlstore/data_retention.go b/server/boards/services/store/sqlstore/data_retention.go index def429377c6..85992d8a922 100644 --- a/server/boards/services/store/sqlstore/data_retention.go +++ b/server/boards/services/store/sqlstore/data_retention.go @@ -12,9 +12,9 @@ import ( sq "github.com/Masterminds/squirrel" _ "github.com/lib/pq" // postgres driver - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 f1402abd42d..2c279c8f3cd 100644 --- a/server/boards/services/store/sqlstore/file.go +++ b/server/boards/services/store/sqlstore/file.go @@ -9,10 +9,10 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 42b3de23178..0d8cf2cfcdd 100644 --- a/server/boards/services/store/sqlstore/legacy_blocks.go +++ b/server/boards/services/store/sqlstore/legacy_blocks.go @@ -8,13 +8,13 @@ import ( "encoding/json" "strings" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/utils" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 dc7f5bfddfe..066a80115b3 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" "github.com/mattermost/morph" drivers "github.com/mattermost/morph/drivers" @@ -28,7 +28,7 @@ import ( _ "github.com/lib/pq" // postgres driver - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) //go:embed migrations/*.sql diff --git a/server/boards/services/store/sqlstore/migrationstests/deleted_membership_boards_migration_test.go b/server/boards/services/store/sqlstore/migrationstests/deleted_membership_boards_migration_test.go index d55b3e704ef..f98a12ba1a7 100644 --- a/server/boards/services/store/sqlstore/migrationstests/deleted_membership_boards_migration_test.go +++ b/server/boards/services/store/sqlstore/migrationstests/deleted_membership_boards_migration_test.go @@ -6,7 +6,7 @@ package migrationstests import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/boards/services/store/sqlstore" "github.com/mgdelacroix/foundation" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/sqlstore/migrationstests/migrate_34_test.go b/server/boards/services/store/sqlstore/migrationstests/migrate_34_test.go index 68ad2a04d24..4a6152ebf2a 100644 --- a/server/boards/services/store/sqlstore/migrationstests/migrate_34_test.go +++ b/server/boards/services/store/sqlstore/migrationstests/migrate_34_test.go @@ -6,7 +6,7 @@ package migrationstests import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/boards/services/store/sqlstore" "github.com/mgdelacroix/foundation" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/sqlstore/migrationstests/migration35_test.go b/server/boards/services/store/sqlstore/migrationstests/migration35_test.go index 814e2b17348..52d1c0116db 100644 --- a/server/boards/services/store/sqlstore/migrationstests/migration35_test.go +++ b/server/boards/services/store/sqlstore/migrationstests/migration35_test.go @@ -6,7 +6,7 @@ package migrationstests import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/boards/services/store/sqlstore" "github.com/mgdelacroix/foundation" ) diff --git a/server/boards/services/store/sqlstore/migrationstests/migration36_test.go b/server/boards/services/store/sqlstore/migrationstests/migration36_test.go index feedb2d8a62..f8dfc082845 100644 --- a/server/boards/services/store/sqlstore/migrationstests/migration36_test.go +++ b/server/boards/services/store/sqlstore/migrationstests/migration36_test.go @@ -6,7 +6,7 @@ package migrationstests import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/boards/services/store/sqlstore" "github.com/mgdelacroix/foundation" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/sqlstore/migrationstests/migration37_test.go b/server/boards/services/store/sqlstore/migrationstests/migration37_test.go index 1b9dd71a44d..7e236206443 100644 --- a/server/boards/services/store/sqlstore/migrationstests/migration37_test.go +++ b/server/boards/services/store/sqlstore/migrationstests/migration37_test.go @@ -6,7 +6,7 @@ package migrationstests import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/boards/services/store/sqlstore" "github.com/mgdelacroix/foundation" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/sqlstore/migrationstests/migration38_test.go b/server/boards/services/store/sqlstore/migrationstests/migration38_test.go index 24b62866da5..aa6f7807c16 100644 --- a/server/boards/services/store/sqlstore/migrationstests/migration38_test.go +++ b/server/boards/services/store/sqlstore/migrationstests/migration38_test.go @@ -6,7 +6,7 @@ package migrationstests import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/boards/services/store/sqlstore" "github.com/mgdelacroix/foundation" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/sqlstore/migrationstests/migration_18_test.go b/server/boards/services/store/sqlstore/migrationstests/migration_18_test.go index 5abbf31e91e..c42e88d2025 100644 --- a/server/boards/services/store/sqlstore/migrationstests/migration_18_test.go +++ b/server/boards/services/store/sqlstore/migrationstests/migration_18_test.go @@ -7,7 +7,7 @@ import ( "encoding/json" "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/boards/services/store/sqlstore" "github.com/mgdelacroix/foundation" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/sqlstore/migrationstests/migration_28_test.go b/server/boards/services/store/sqlstore/migrationstests/migration_28_test.go index 1b65ef5d54a..5e424754bd2 100644 --- a/server/boards/services/store/sqlstore/migrationstests/migration_28_test.go +++ b/server/boards/services/store/sqlstore/migrationstests/migration_28_test.go @@ -6,7 +6,7 @@ package migrationstests import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/boards/services/store/sqlstore" "github.com/mgdelacroix/foundation" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/sqlstore/migrationstests/migration_33_test.go b/server/boards/services/store/sqlstore/migrationstests/migration_33_test.go index f0cbb51ecef..9c6ce57cd47 100644 --- a/server/boards/services/store/sqlstore/migrationstests/migration_33_test.go +++ b/server/boards/services/store/sqlstore/migrationstests/migration_33_test.go @@ -9,7 +9,7 @@ import ( "github.com/mgdelacroix/foundation" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/boards/services/store/sqlstore" ) func Test33RemoveDeletedCategoryBoards(t *testing.T) { diff --git a/server/boards/services/store/sqlstore/notificationhints.go b/server/boards/services/store/sqlstore/notificationhints.go index 76bc4300729..be9a7ca5206 100644 --- a/server/boards/services/store/sqlstore/notificationhints.go +++ b/server/boards/services/store/sqlstore/notificationhints.go @@ -10,10 +10,10 @@ import ( 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/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 1b79c6c50ae..9ed79ef887e 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/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 31d34db51fc..85450811e24 100644 --- a/server/boards/services/store/sqlstore/public_methods.go +++ b/server/boards/services/store/sqlstore/public_methods.go @@ -16,10 +16,10 @@ import ( "context" "time" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 2d57584aa1c..de67adea8e6 100644 --- a/server/boards/services/store/sqlstore/schema_table_migration.go +++ b/server/boards/services/store/sqlstore/schema_table_migration.go @@ -12,9 +12,9 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/mattermost/morph/models" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) // EnsureSchemaMigrationFormat checks the schema migrations table diff --git a/server/boards/services/store/sqlstore/session.go b/server/boards/services/store/sqlstore/session.go index 967eed002d5..ac633b7643f 100644 --- a/server/boards/services/store/sqlstore/session.go +++ b/server/boards/services/store/sqlstore/session.go @@ -8,8 +8,8 @@ import ( 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/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) // GetActiveUserCount returns the number of users with active sessions within N seconds ago. diff --git a/server/boards/services/store/sqlstore/sharing.go b/server/boards/services/store/sqlstore/sharing.go index 2b7cd6faa7e..78aba6082ef 100644 --- a/server/boards/services/store/sqlstore/sharing.go +++ b/server/boards/services/store/sqlstore/sharing.go @@ -4,8 +4,8 @@ package sqlstore import ( - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" sq "github.com/Masterminds/squirrel" ) diff --git a/server/boards/services/store/sqlstore/sqlstore.go b/server/boards/services/store/sqlstore/sqlstore.go index da62e7a6be7..e14e1e12648 100644 --- a/server/boards/services/store/sqlstore/sqlstore.go +++ b/server/boards/services/store/sqlstore/sqlstore.go @@ -11,11 +11,11 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" - mm_model "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) // SQLStore is a SQL database. diff --git a/server/boards/services/store/sqlstore/sqlstore_test.go b/server/boards/services/store/sqlstore/sqlstore_test.go index d0435f4c65a..02e514baf7a 100644 --- a/server/boards/services/store/sqlstore/sqlstore_test.go +++ b/server/boards/services/store/sqlstore/sqlstore_test.go @@ -6,11 +6,11 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store/storetests" + "github.com/mattermost/mattermost/server/v8/boards/services/store/storetests" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) func TestSQLStore(t *testing.T) { diff --git a/server/boards/services/store/sqlstore/subscriptions.go b/server/boards/services/store/sqlstore/subscriptions.go index a4129647bb1..bf0893cad2a 100644 --- a/server/boards/services/store/sqlstore/subscriptions.go +++ b/server/boards/services/store/sqlstore/subscriptions.go @@ -9,9 +9,9 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) var subscriptionFields = []string{ diff --git a/server/boards/services/store/sqlstore/system.go b/server/boards/services/store/sqlstore/system.go index 140fdef5eca..923bab523e4 100644 --- a/server/boards/services/store/sqlstore/system.go +++ b/server/boards/services/store/sqlstore/system.go @@ -6,7 +6,7 @@ package sqlstore import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) func (s *SQLStore) getSystemSetting(db sq.BaseRunner, key string) (string, error) { diff --git a/server/boards/services/store/sqlstore/team.go b/server/boards/services/store/sqlstore/team.go index 9c9366a67cb..8c5332b9ec8 100644 --- a/server/boards/services/store/sqlstore/team.go +++ b/server/boards/services/store/sqlstore/team.go @@ -7,10 +7,10 @@ import ( "database/sql" "encoding/json" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 64e3a3d112c..d1925fb8d1a 100644 --- a/server/boards/services/store/sqlstore/templates.go +++ b/server/boards/services/store/sqlstore/templates.go @@ -9,9 +9,9 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) var ( diff --git a/server/boards/services/store/sqlstore/testlib.go b/server/boards/services/store/sqlstore/testlib.go index 34b1f95d416..0010e6f42f5 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" "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 2c16865ebd8..182ccf3749c 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" 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/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) var ( diff --git a/server/boards/services/store/sqlstore/util.go b/server/boards/services/store/sqlstore/util.go index c6c2b75dc56..d910de4d8f1 100644 --- a/server/boards/services/store/sqlstore/util.go +++ b/server/boards/services/store/sqlstore/util.go @@ -10,10 +10,10 @@ import ( 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/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 a7f2fee3205..eb0c961f196 100644 --- a/server/boards/services/store/store.go +++ b/server/boards/services/store/store.go @@ -8,9 +8,9 @@ package store import ( "time" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" ) const CardLimitTimestampSystemKey = "card_limit_timestamp" diff --git a/server/boards/services/store/storetests/blocks.go b/server/boards/services/store/storetests/blocks.go index b3e48f560af..2f023718562 100644 --- a/server/boards/services/store/storetests/blocks.go +++ b/server/boards/services/store/storetests/blocks.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "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" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/server/boards/services/store/storetests/board_insights.go b/server/boards/services/store/storetests/board_insights.go index 0268178db46..5c399ec687c 100644 --- a/server/boards/services/store/storetests/board_insights.go +++ b/server/boards/services/store/storetests/board_insights.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" ) const ( diff --git a/server/boards/services/store/storetests/boards.go b/server/boards/services/store/storetests/boards.go index 84bae5097d1..23ae620885d 100644 --- a/server/boards/services/store/storetests/boards.go +++ b/server/boards/services/store/storetests/boards.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "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" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/utils" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/storetests/boards_and_blocks.go b/server/boards/services/store/storetests/boards_and_blocks.go index 36be0176102..5bb4580e547 100644 --- a/server/boards/services/store/storetests/boards_and_blocks.go +++ b/server/boards/services/store/storetests/boards_and_blocks.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "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" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/utils" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/storetests/category.go b/server/boards/services/store/storetests/category.go index c7afabe2c47..a9224e59329 100644 --- a/server/boards/services/store/storetests/category.go +++ b/server/boards/services/store/storetests/category.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" - "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" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) type testFunc func(t *testing.T, store store.Store) diff --git a/server/boards/services/store/storetests/categoryBoards.go b/server/boards/services/store/storetests/categoryBoards.go index a3552fb0584..c8ad46e4ac7 100644 --- a/server/boards/services/store/storetests/categoryBoards.go +++ b/server/boards/services/store/storetests/categoryBoards.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" - "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" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) func StoreTestCategoryBoardsStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) { diff --git a/server/boards/services/store/storetests/cloud.go b/server/boards/services/store/storetests/cloud.go index 792f852a17e..148cef3992b 100644 --- a/server/boards/services/store/storetests/cloud.go +++ b/server/boards/services/store/storetests/cloud.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store" - storeservice "github.com/mattermost/mattermost-server/server/v8/boards/services/store" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + storeservice "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) func StoreTestCloudStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) { diff --git a/server/boards/services/store/storetests/compliance.go b/server/boards/services/store/storetests/compliance.go index 1964b6257d5..284111e6839 100644 --- a/server/boards/services/store/storetests/compliance.go +++ b/server/boards/services/store/storetests/compliance.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) func StoreTestComplianceHistoryStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) { diff --git a/server/boards/services/store/storetests/data_retention.go b/server/boards/services/store/storetests/data_retention.go index df8ed9a0286..05f4686f1a9 100644 --- a/server/boards/services/store/storetests/data_retention.go +++ b/server/boards/services/store/storetests/data_retention.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "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" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/utils" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/storetests/files.go b/server/boards/services/store/storetests/files.go index 9f6ad3f9aca..67e9cf882cd 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/public/model" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/utils" "github.com/stretchr/testify/require" ) diff --git a/server/boards/services/store/storetests/helpers.go b/server/boards/services/store/storetests/helpers.go index b7e85ca5510..7b5f796b4ea 100644 --- a/server/boards/services/store/storetests/helpers.go +++ b/server/boards/services/store/storetests/helpers.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" ) func InsertBlocks(t *testing.T, s store.Store, blocks []*model.Block, userID string) { diff --git a/server/boards/services/store/storetests/notificationhints.go b/server/boards/services/store/storetests/notificationhints.go index 07a31136bdf..8354984a9c6 100644 --- a/server/boards/services/store/storetests/notificationhints.go +++ b/server/boards/services/store/storetests/notificationhints.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) func StoreTestNotificationHintsStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) { diff --git a/server/boards/services/store/storetests/session.go b/server/boards/services/store/storetests/session.go index b15a71718db..a12b983309f 100644 --- a/server/boards/services/store/storetests/session.go +++ b/server/boards/services/store/storetests/session.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" ) func StoreTestSessionStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) { diff --git a/server/boards/services/store/storetests/sharing.go b/server/boards/services/store/storetests/sharing.go index 1bd492c5f8f..ace20180068 100644 --- a/server/boards/services/store/storetests/sharing.go +++ b/server/boards/services/store/storetests/sharing.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" ) func StoreTestSharingStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) { diff --git a/server/boards/services/store/storetests/subscriptions.go b/server/boards/services/store/storetests/subscriptions.go index 833bcd4ca08..9368f3e3dd3 100644 --- a/server/boards/services/store/storetests/subscriptions.go +++ b/server/boards/services/store/storetests/subscriptions.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" ) //nolint:dupl diff --git a/server/boards/services/store/storetests/system.go b/server/boards/services/store/storetests/system.go index 2f0014bc783..ce5654c45b7 100644 --- a/server/boards/services/store/storetests/system.go +++ b/server/boards/services/store/storetests/system.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/services/store" ) func StoreTestSystemStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) { diff --git a/server/boards/services/store/storetests/teams.go b/server/boards/services/store/storetests/teams.go index e2997c5008b..e25f30fdd6e 100644 --- a/server/boards/services/store/storetests/teams.go +++ b/server/boards/services/store/storetests/teams.go @@ -6,14 +6,14 @@ package storetests import ( "fmt" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" "testing" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/services/store" ) func StoreTestTeamStore(t *testing.T, runStoreTests func(*testing.T, func(*testing.T, store.Store))) { diff --git a/server/boards/services/store/storetests/users.go b/server/boards/services/store/storetests/users.go index 73ff54ddbb8..bfb41648ef3 100644 --- a/server/boards/services/store/storetests/users.go +++ b/server/boards/services/store/storetests/users.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/require" - "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" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) //nolint:dupl diff --git a/server/boards/services/store/storetests/util.go b/server/boards/services/store/storetests/util.go index 976e60448ec..562f0bd4ffc 100644 --- a/server/boards/services/store/storetests/util.go +++ b/server/boards/services/store/storetests/util.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/store" + "github.com/mattermost/mattermost/server/v8/boards/utils" ) func createTestUsers(t *testing.T, store store.Store, num int) []*model.User { diff --git a/server/boards/services/telemetry/mocks/ServerIface.go b/server/boards/services/telemetry/mocks/ServerIface.go index 8eb837be297..ec0ea350e55 100644 --- a/server/boards/services/telemetry/mocks/ServerIface.go +++ b/server/boards/services/telemetry/mocks/ServerIface.go @@ -5,12 +5,12 @@ package mocks import ( - httpservice "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" + httpservice "github.com/mattermost/mattermost/server/v8/platform/services/httpservice" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" - plugin "github.com/mattermost/mattermost-server/server/public/plugin" + plugin "github.com/mattermost/mattermost/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 97f13d5afd8..6dd6bce1b92 100644 --- a/server/boards/services/telemetry/telemetry.go +++ b/server/boards/services/telemetry/telemetry.go @@ -9,11 +9,11 @@ import ( rudder "github.com/rudderlabs/analytics-go" - "github.com/mattermost/mattermost-server/server/v8/boards/services/scheduler" + "github.com/mattermost/mattermost/server/v8/boards/services/scheduler" - "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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) const ( diff --git a/server/boards/services/telemetry/telemetry_test.go b/server/boards/services/telemetry/telemetry_test.go index d34990d6770..de40cdf7300 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/public/shared/mlog" + "github.com/mattermost/mattermost/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 762a42bd0fc..5c0856b0b1c 100644 --- a/server/boards/services/webhook/webhook.go +++ b/server/boards/services/webhook/webhook.go @@ -9,10 +9,10 @@ import ( "io" "net/http" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/config" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/config" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 14b8ea3ed81..466b542d69c 100644 --- a/server/boards/services/webhook/webhook_test.go +++ b/server/boards/services/webhook/webhook_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/v8/boards/services/config" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/services/config" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) func TestClientUpdateNotify(t *testing.T) { diff --git a/server/boards/utils/callbackqueue.go b/server/boards/utils/callbackqueue.go index 471517f63c1..89583c03627 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/public/shared/mlog" + "github.com/mattermost/mattermost/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 eff8080cd1c..fce8a8b58d1 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/public/shared/mlog" + "github.com/mattermost/mattermost/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 dc3b1a6bc6b..89e916f88b6 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/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" ) type IDType byte diff --git a/server/boards/web/webserver.go b/server/boards/web/webserver.go index 6c52848fe27..fe5726cb559 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/public/shared/mlog" + "github.com/mattermost/mattermost/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 74de097eaee..5f820ce5cd4 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) func Test_NewServer(t *testing.T) { diff --git a/server/boards/ws/adapter.go b/server/boards/ws/adapter.go index be4160780a4..5cc8217e56b 100644 --- a/server/boards/ws/adapter.go +++ b/server/boards/ws/adapter.go @@ -5,7 +5,7 @@ package ws import ( - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) const ( diff --git a/server/boards/ws/common.go b/server/boards/ws/common.go index 4a5a1794b0f..c0283716c2e 100644 --- a/server/boards/ws/common.go +++ b/server/boards/ws/common.go @@ -4,7 +4,7 @@ package ws import ( - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" ) // UpdateCategoryMessage is sent on block updates. diff --git a/server/boards/ws/helpers_test.go b/server/boards/ws/helpers_test.go index 3be3a4f1e9e..b2f23b37469 100644 --- a/server/boards/ws/helpers_test.go +++ b/server/boards/ws/helpers_test.go @@ -6,11 +6,11 @@ package ws import ( "testing" - authMocks "github.com/mattermost/mattermost-server/server/v8/boards/auth/mocks" - wsMocks "github.com/mattermost/mattermost-server/server/v8/boards/ws/mocks" + authMocks "github.com/mattermost/mattermost/server/v8/boards/auth/mocks" + wsMocks "github.com/mattermost/mattermost/server/v8/boards/ws/mocks" - mm_model "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 98888663462..f3cfc95df80 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/public/plugin (interfaces: API) +// Source: github.com/mattermost/mattermost/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/public/model" + model "github.com/mattermost/mattermost/server/public/model" ) // MockAPI is a mock of API interface. diff --git a/server/boards/ws/mocks/mockstore.go b/server/boards/ws/mocks/mockstore.go index 58aab276c31..b32e4b636c7 100644 --- a/server/boards/ws/mocks/mockstore.go +++ b/server/boards/ws/mocks/mockstore.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/boards/ws (interfaces: Store) +// Source: github.com/mattermost/mattermost/server/v8/boards/ws (interfaces: Store) // Package mocks is a generated GoMock package. package mocks @@ -11,7 +11,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/server/v8/boards/model" + model "github.com/mattermost/mattermost/server/v8/boards/model" ) // MockStore is a mock of Store interface. diff --git a/server/boards/ws/plugin_adapter.go b/server/boards/ws/plugin_adapter.go index 83ad0cd1df9..d5137ec2ede 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/public/plugin API +//go:generate mockgen -copyright_file=../../copyright.txt -destination=mocks/mockpluginapi.go -package mocks github.com/mattermost/mattermost/server/public/plugin API package ws import ( @@ -11,12 +11,12 @@ import ( "sync/atomic" "time" - "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/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/auth" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" - mm_model "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 57de6b671b6..8ca6ef132c4 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/public/model" + mm_model "github.com/mattermost/mattermost/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 e9844af1c6c..9dbd57e3375 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 794b4a493e7..030496bb5eb 100644 --- a/server/boards/ws/plugin_adapter_test.go +++ b/server/boards/ws/plugin_adapter_test.go @@ -7,9 +7,9 @@ import ( "sync" "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/model" - mm_model "github.com/mattermost/mattermost-server/server/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" "github.com/stretchr/testify/require" ) diff --git a/server/boards/ws/server.go b/server/boards/ws/server.go index e8bc6786cf9..2391e673f99 100644 --- a/server/boards/ws/server.go +++ b/server/boards/ws/server.go @@ -11,11 +11,11 @@ import ( "github.com/gorilla/mux" "github.com/gorilla/websocket" - "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/boards/utils" + "github.com/mattermost/mattermost/server/v8/boards/auth" + "github.com/mattermost/mattermost/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 35bd76e6ed1..acafdac8f60 100644 --- a/server/boards/ws/server_test.go +++ b/server/boards/ws/server_test.go @@ -7,10 +7,10 @@ import ( "sync" "testing" - "github.com/mattermost/mattermost-server/server/v8/boards/auth" - "github.com/mattermost/mattermost-server/server/v8/boards/model" + "github.com/mattermost/mattermost/server/v8/boards/auth" + "github.com/mattermost/mattermost/server/v8/boards/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 607270c32ed..8068d8b8a8e 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/web" ) type Routes struct { diff --git a/server/channels/api4/apitestlib.go b/server/channels/api4/apitestlib.go index 5c2679a2cb7..b581a13b039 100644 --- a/server/channels/api4/apitestlib.go +++ b/server/channels/api4/apitestlib.go @@ -26,18 +26,18 @@ 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" - "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/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/services/searchengine" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/channels/web" + "github.com/mattermost/mattermost/server/v8/channels/wsapi" + "github.com/mattermost/mattermost/server/v8/config" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine" ) type TestHelper struct { diff --git a/server/channels/api4/bleve.go b/server/channels/api4/bleve.go index 56cce8d100d..563b6e8c0bb 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitBleve() { diff --git a/server/channels/api4/bleve_test.go b/server/channels/api4/bleve_test.go index 281d6daf1ee..672a6c549ba 100644 --- a/server/channels/api4/bleve_test.go +++ b/server/channels/api4/bleve_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestBlevePurgeIndexes(t *testing.T) { diff --git a/server/channels/api4/bot.go b/server/channels/api4/bot.go index 96fef1c82f0..c7112a66103 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitBot() { diff --git a/server/channels/api4/bot_test.go b/server/channels/api4/bot_test.go index e0a705aafe7..e7a495d33d5 100644 --- a/server/channels/api4/bot_test.go +++ b/server/channels/api4/bot_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestCreateBot(t *testing.T) { diff --git a/server/channels/api4/brand.go b/server/channels/api4/brand.go index e5ebdb95433..7cbe4141ee1 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitBrand() { diff --git a/server/channels/api4/brand_test.go b/server/channels/api4/brand_test.go index ad3bd75ba32..71df5e4e6b5 100644 --- a/server/channels/api4/brand_test.go +++ b/server/channels/api4/brand_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" ) func TestGetBrandImage(t *testing.T) { diff --git a/server/channels/api4/channel.go b/server/channels/api4/channel.go index aef74b557f7..4e73799072a 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitChannel() { diff --git a/server/channels/api4/channel_category.go b/server/channels/api4/channel_category.go index 6a7c569177e..5401bc6703d 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) 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 10f1fadb5bf..2074ea7e2aa 100644 --- a/server/channels/api4/channel_category_test.go +++ b/server/channels/api4/channel_category_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestCreateCategoryForTeamForUser(t *testing.T) { diff --git a/server/channels/api4/channel_local.go b/server/channels/api4/channel_local.go index eed428efb92..65f6e204cb7 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitChannelLocal() { diff --git a/server/channels/api4/channel_test.go b/server/channels/api4/channel_test.go index 136319b40ea..3f9a74ad4b1 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" ) func TestCreateChannel(t *testing.T) { diff --git a/server/channels/api4/cloud.go b/server/channels/api4/cloud.go index c8c0446a8d4..893921464d2 100644 --- a/server/channels/api4/cloud.go +++ b/server/channels/api4/cloud.go @@ -11,10 +11,10 @@ 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/platform/shared/web" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/platform/shared/web" ) func (api *API) InitCloud() { diff --git a/server/channels/api4/cloud_test.go b/server/channels/api4/cloud_test.go index 5ec50c69a7b..da6d727c82d 100644 --- a/server/channels/api4/cloud_test.go +++ b/server/channels/api4/cloud_test.go @@ -12,8 +12,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/einterfaces/mocks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 7b14be28333..b6ff25659d6 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func (api *API) InitCluster() { diff --git a/server/channels/api4/cluster_test.go b/server/channels/api4/cluster_test.go index d19a99cea5e..508e20a002d 100644 --- a/server/channels/api4/cluster_test.go +++ b/server/channels/api4/cluster_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestGetClusterStatus(t *testing.T) { diff --git a/server/channels/api4/command.go b/server/channels/api4/command.go index 8ff82ad71d1..0151b0ec2be 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitCommand() { diff --git a/server/channels/api4/command_help_test.go b/server/channels/api4/command_help_test.go index 1add2fa6f85..ea0d4a89a78 100644 --- a/server/channels/api4/command_help_test.go +++ b/server/channels/api4/command_help_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestHelpCommand(t *testing.T) { diff --git a/server/channels/api4/command_local.go b/server/channels/api4/command_local.go index 1398003a091..92d54d645fd 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitCommandLocal() { diff --git a/server/channels/api4/command_test.go b/server/channels/api4/command_test.go index 6614a868e9c..fddd0153446 100644 --- a/server/channels/api4/command_test.go +++ b/server/channels/api4/command_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/public/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) func TestCreateCommand(t *testing.T) { diff --git a/server/channels/api4/commands_test.go b/server/channels/api4/commands_test.go index 934e2274189..159ec748e11 100644 --- a/server/channels/api4/commands_test.go +++ b/server/channels/api4/commands_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/require" - _ "github.com/mattermost/mattermost-server/server/v8/channels/app/slashcommands" + _ "github.com/mattermost/mattermost/server/v8/channels/app/slashcommands" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestEchoCommand(t *testing.T) { diff --git a/server/channels/api4/compliance.go b/server/channels/api4/compliance.go index ede2aebf15a..c72c5bd8472 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitCompliance() { diff --git a/server/channels/api4/config.go b/server/channels/api4/config.go index 14b75906889..02b8bb14b0c 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/config" ) 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 c98c9b3e863..f0348a1ea7c 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/config" ) func (api *API) InitConfigLocal() { diff --git a/server/channels/api4/config_test.go b/server/channels/api4/config_test.go index 3beacd286ae..bb070f87479 100644 --- a/server/channels/api4/config_test.go +++ b/server/channels/api4/config_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/v8/channels/app" - "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/config" ) func TestGetConfig(t *testing.T) { diff --git a/server/channels/api4/cors_test.go b/server/channels/api4/cors_test.go index 71b48df1721..131ca7f4d59 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) const ( diff --git a/server/channels/api4/data_retention.go b/server/channels/api4/data_retention.go index 6d778138d4f..78fad0afbab 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitDataRetention() { diff --git a/server/channels/api4/drafts.go b/server/channels/api4/drafts.go index 27d7eacdcfb..5500160899e 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 6102dc2edd9..f68e2b49063 100644 --- a/server/channels/api4/drafts_test.go +++ b/server/channels/api4/drafts_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/utils/testutils" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" ) func TestUpsertDraft(t *testing.T) { diff --git a/server/channels/api4/elasticsearch.go b/server/channels/api4/elasticsearch.go index 3dab3a8749e..4e0bdb4afec 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitElasticsearch() { diff --git a/server/channels/api4/elasticsearch_test.go b/server/channels/api4/elasticsearch_test.go index aafb3ad8e40..0ebb8fa27c2 100644 --- a/server/channels/api4/elasticsearch_test.go +++ b/server/channels/api4/elasticsearch_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestElasticsearchTest(t *testing.T) { diff --git a/server/channels/api4/emoji.go b/server/channels/api4/emoji.go index 99505e3a7c7..d6a08d2aecb 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/channels/web" ) const ( diff --git a/server/channels/api4/emoji_test.go b/server/channels/api4/emoji_test.go index f1a3e466da4..a1e1dcb0a83 100644 --- a/server/channels/api4/emoji_test.go +++ b/server/channels/api4/emoji_test.go @@ -15,10 +15,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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) func TestCreateEmoji(t *testing.T) { diff --git a/server/channels/api4/export.go b/server/channels/api4/export.go index d3124429fb1..b3608837c74 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitExport() { diff --git a/server/channels/api4/export_test.go b/server/channels/api4/export_test.go index d154b69625e..b1801ace360 100644 --- a/server/channels/api4/export_test.go +++ b/server/channels/api4/export_test.go @@ -11,8 +11,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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" "github.com/stretchr/testify/require" ) diff --git a/server/channels/api4/file.go b/server/channels/api4/file.go index d46d742e016..ee7bb2f680a 100644 --- a/server/channels/api4/file.go +++ b/server/channels/api4/file.go @@ -14,12 +14,12 @@ 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/platform/shared/web" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/platform/shared/web" ) const ( diff --git a/server/channels/api4/file_test.go b/server/channels/api4/file_test.go index 48b91fec2c5..b7239f33dd3 100644 --- a/server/channels/api4/file_test.go +++ b/server/channels/api4/file_test.go @@ -23,10 +23,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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" ) var testDir = "" diff --git a/server/channels/api4/graphql.go b/server/channels/api4/graphql.go index 332ca9ec321..6212c08cdd2 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/web" ) type graphQLInput struct { diff --git a/server/channels/api4/graphql_client.go b/server/channels/api4/graphql_client.go index 0b3d72106fe..975d350aee6 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/public/model" + "github.com/mattermost/mattermost/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 6655f93ae01..c66be01cdeb 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitGroup() { diff --git a/server/channels/api4/group_test.go b/server/channels/api4/group_test.go index 38604091639..1585ce3debe 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestGetGroup(t *testing.T) { diff --git a/server/channels/api4/handlers.go b/server/channels/api4/handlers.go index 9f7e93ab540..90053958774 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/web" ) type Context = web.Context diff --git a/server/channels/api4/handlers_test.go b/server/channels/api4/handlers_test.go index 5e0a7a34ae3..8516fa9b83e 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/public/model" + "github.com/mattermost/mattermost/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 29b1aef90f5..f063b30c604 100644 --- a/server/channels/api4/hosted_customer.go +++ b/server/channels/api4/hosted_customer.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/platform/shared/web" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/platform/shared/web" ) // APIs for self-hosted workspaces to communicate with the backing customer & payments system. diff --git a/server/channels/api4/hosted_customer_test.go b/server/channels/api4/hosted_customer_test.go index 7a5ed9d3aab..a6a9aa9351c 100644 --- a/server/channels/api4/hosted_customer_test.go +++ b/server/channels/api4/hosted_customer_test.go @@ -12,8 +12,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/einterfaces/mocks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/einterfaces/mocks" ) var valFalse = false diff --git a/server/channels/api4/image.go b/server/channels/api4/image.go index c6e4341eb3c..12b91950873 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func (api *API) InitImage() { diff --git a/server/channels/api4/image_test.go b/server/channels/api4/image_test.go index 031d94c92a7..c63603d47c3 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestGetImage(t *testing.T) { diff --git a/server/channels/api4/import.go b/server/channels/api4/import.go index b52927817e8..a21ccbe1bd2 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 4b9403ea5af..664a652e073 100644 --- a/server/channels/api4/import_test.go +++ b/server/channels/api4/import_test.go @@ -11,8 +11,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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) func TestListImports(t *testing.T) { diff --git a/server/channels/api4/insights.go b/server/channels/api4/insights.go index 25c4f6d607f..48974716ac7 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func (api *API) InitInsights() { diff --git a/server/channels/api4/insights_test.go b/server/channels/api4/insights_test.go index fa5f1bef9e5..9b32844606e 100644 --- a/server/channels/api4/insights_test.go +++ b/server/channels/api4/insights_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/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" ) // Top Reactions diff --git a/server/channels/api4/integration_action.go b/server/channels/api4/integration_action.go index 6527ae1ba03..7b7addb88ad 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 7ba69ebf5cb..343e8bb1597 100644 --- a/server/channels/api4/integration_action_test.go +++ b/server/channels/api4/integration_action_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type testHandler struct { diff --git a/server/channels/api4/job.go b/server/channels/api4/job.go index 0518700f0cf..1555fc4480d 100644 --- a/server/channels/api4/job.go +++ b/server/channels/api4/job.go @@ -10,10 +10,10 @@ 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/platform/shared/web" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/platform/shared/web" ) func (api *API) InitJob() { diff --git a/server/channels/api4/job_test.go b/server/channels/api4/job_test.go index ee0ce7ff8bc..8dada07306c 100644 --- a/server/channels/api4/job_test.go +++ b/server/channels/api4/job_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestCreateJob(t *testing.T) { diff --git a/server/channels/api4/ldap.go b/server/channels/api4/ldap.go index 340c4811764..b7dc07cbb8b 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) type mixedUnlinkedGroup struct { diff --git a/server/channels/api4/ldap_test.go b/server/channels/api4/ldap_test.go index 696cd6358e9..bc09d51d686 100644 --- a/server/channels/api4/ldap_test.go +++ b/server/channels/api4/ldap_test.go @@ -9,9 +9,9 @@ import ( "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/einterfaces/mocks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/v8/einterfaces/mocks" ) var spPrivateKey = `-----BEGIN PRIVATE KEY----- diff --git a/server/channels/api4/license.go b/server/channels/api4/license.go index e2028378011..90e796828e8 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/utils" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitLicense() { diff --git a/server/channels/api4/license_local.go b/server/channels/api4/license_local.go index 31f3f4f59de..5145e9eb407 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitLicenseLocal() { diff --git a/server/channels/api4/license_test.go b/server/channels/api4/license_test.go index 374c7c08b0f..7601932c996 100644 --- a/server/channels/api4/license_test.go +++ b/server/channels/api4/license_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "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/einterfaces/mocks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils" + mocks2 "github.com/mattermost/mattermost/server/v8/channels/utils/mocks" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost/server/v8/einterfaces/mocks" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/server/channels/api4/main_test.go b/server/channels/api4/main_test.go index e7b1bb91e33..1f6220dc326 100644 --- a/server/channels/api4/main_test.go +++ b/server/channels/api4/main_test.go @@ -7,7 +7,7 @@ import ( "flag" "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) var replicaFlag bool diff --git a/server/channels/api4/notify_admin.go b/server/channels/api4/notify_admin.go index d109d6cef91..fd35b82759b 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/public/model" + "github.com/mattermost/mattermost/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 46baac67aaf..3b144fc75b5 100644 --- a/server/channels/api4/notify_admin_test.go +++ b/server/channels/api4/notify_admin_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestNotifyAdmin(t *testing.T) { diff --git a/server/channels/api4/oauth.go b/server/channels/api4/oauth.go index 09de966f562..f946b12f7f3 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitOAuth() { diff --git a/server/channels/api4/oauth_test.go b/server/channels/api4/oauth_test.go index d56df686a79..384f8917d37 100644 --- a/server/channels/api4/oauth_test.go +++ b/server/channels/api4/oauth_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestCreateOAuthApp(t *testing.T) { diff --git a/server/channels/api4/openGraph.go b/server/channels/api4/openGraph.go index 5e00707bca6..a66d62016f6 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 0cf2ae67dbd..52e65c0dbcc 100644 --- a/server/channels/api4/openGraph_test.go +++ b/server/channels/api4/openGraph_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestGetOpenGraphMetadata(t *testing.T) { diff --git a/server/channels/api4/permission.go b/server/channels/api4/permission.go index 11a38b6341b..a5c9752f9c9 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func (api *API) InitPermissions() { diff --git a/server/channels/api4/permissions_test.go b/server/channels/api4/permissions_test.go index 00bc9816c7c..ca1f9c22bb7 100644 --- a/server/channels/api4/permissions_test.go +++ b/server/channels/api4/permissions_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestGetAncillaryPermissions(t *testing.T) { diff --git a/server/channels/api4/plugin.go b/server/channels/api4/plugin.go index 4b8dc573e71..4068e24218d 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/channels/store" ) const ( diff --git a/server/channels/api4/plugin_test.go b/server/channels/api4/plugin_test.go index ae12f0d1523..bcc4b19c806 100644 --- a/server/channels/api4/plugin_test.go +++ b/server/channels/api4/plugin_test.go @@ -23,10 +23,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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) func TestPlugin(t *testing.T) { diff --git a/server/channels/api4/post.go b/server/channels/api4/post.go index f380cae2e37..8d26d840ef6 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/channels/web" ) func (api *API) InitPost() { diff --git a/server/channels/api4/post_test.go b/server/channels/api4/post_test.go index b217c373dc0..d3aaea401e1 100644 --- a/server/channels/api4/post_test.go +++ b/server/channels/api4/post_test.go @@ -22,13 +22,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/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" ) func TestCreatePost(t *testing.T) { diff --git a/server/channels/api4/preference.go b/server/channels/api4/preference.go index c07c930133e..e3a71b487d0 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitPreference() { diff --git a/server/channels/api4/preference_test.go b/server/channels/api4/preference_test.go index e70d755d252..5f41afd3f21 100644 --- a/server/channels/api4/preference_test.go +++ b/server/channels/api4/preference_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestGetPreferences(t *testing.T) { diff --git a/server/channels/api4/reaction.go b/server/channels/api4/reaction.go index 64c6328324d..d6adc0f6876 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 0a51fca4389..e139fc544bb 100644 --- a/server/channels/api4/reaction_test.go +++ b/server/channels/api4/reaction_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestSaveReaction(t *testing.T) { diff --git a/server/channels/api4/remote_cluster.go b/server/channels/api4/remote_cluster.go index fe4a0009cf7..93e43259c29 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/platform/services/remotecluster" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" ) func (api *API) InitRemoteCluster() { diff --git a/server/channels/api4/resolver.go b/server/channels/api4/resolver.go index 14538d796c2..942e3f43499 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/web" ) // cursorPrefix is used to categorize objects diff --git a/server/channels/api4/resolver_channel.go b/server/channels/api4/resolver_channel.go index a108bcc5c29..6dbe0809304 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/web" ) // 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 a4327e1dfda..c7e7018bd7d 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/web" ) // 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 480da379967..02198c6584d 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/public/model" + "github.com/mattermost/mattermost/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 8e7aab37563..57a04fd7caa 100644 --- a/server/channels/api4/resolver_channel_test.go +++ b/server/channels/api4/resolver_channel_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func 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 dc33a8b7881..65d69905f61 100644 --- a/server/channels/api4/resolver_sidebar_categories_test.go +++ b/server/channels/api4/resolver_sidebar_categories_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestGraphQLSidebarCategories(t *testing.T) { diff --git a/server/channels/api4/resolver_team.go b/server/channels/api4/resolver_team.go index b6282275783..6fedd8174a2 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/web" ) 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 c3c95b513fb..5facac57d44 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/public/model" + "github.com/mattermost/mattermost/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 70925fab359..e371b2e1ce8 100644 --- a/server/channels/api4/resolver_team_member_test.go +++ b/server/channels/api4/resolver_team_member_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestGraphQLTeamMembers(t *testing.T) { diff --git a/server/channels/api4/resolver_test.go b/server/channels/api4/resolver_test.go index 0f783cbafad..13b6111f397 100644 --- a/server/channels/api4/resolver_test.go +++ b/server/channels/api4/resolver_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestGraphQLConfig(t *testing.T) { diff --git a/server/channels/api4/resolver_user.go b/server/channels/api4/resolver_user.go index da9adc3ae16..868e2555f17 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/web" ) // 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 9a4e7d74878..267bf5fb357 100644 --- a/server/channels/api4/resolver_user_test.go +++ b/server/channels/api4/resolver_user_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestGraphQLUser(t *testing.T) { diff --git a/server/channels/api4/role.go b/server/channels/api4/role.go index 79417108d1d..f658ebac35f 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) var notAllowedPermissions = []string{ diff --git a/server/channels/api4/role_test.go b/server/channels/api4/role_test.go index 0a6617413fa..10e3b94ece9 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestGetAllRoles(t *testing.T) { diff --git a/server/channels/api4/saml.go b/server/channels/api4/saml.go index 7e92111d60d..479431274fd 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitSaml() { diff --git a/server/channels/api4/saml_test.go b/server/channels/api4/saml_test.go index 941439902c4..ac6bf972f5d 100644 --- a/server/channels/api4/saml_test.go +++ b/server/channels/api4/saml_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/einterfaces/mocks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/einterfaces/mocks" ) func TestGetSamlMetadata(t *testing.T) { diff --git a/server/channels/api4/scheme.go b/server/channels/api4/scheme.go index 6bf1edfaedb..b62c0ed7c17 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitScheme() { diff --git a/server/channels/api4/scheme_test.go b/server/channels/api4/scheme_test.go index 0ae632c2788..c2533b22f9b 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/public/model" + "github.com/mattermost/mattermost/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 1f6038a3c57..f4834013c7d 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/public/model" + "github.com/mattermost/mattermost/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 6c14b383a16..eb1558f6e92 100644 --- a/server/channels/api4/shared_channel_test.go +++ b/server/channels/api4/shared_channel_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/app" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app" ) var ( diff --git a/server/channels/api4/status.go b/server/channels/api4/status.go index 788d8a4b71d..83c262071c5 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 f31b9c35674..418a4b78196 100644 --- a/server/channels/api4/status_test.go +++ b/server/channels/api4/status_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestGetUserStatus(t *testing.T) { diff --git a/server/channels/api4/system.go b/server/channels/api4/system.go index 739c5065855..273818888cf 100644 --- a/server/channels/api4/system.go +++ b/server/channels/api4/system.go @@ -17,12 +17,12 @@ 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/platform/services/cache" - "github.com/mattermost/mattermost-server/server/v8/platform/services/upgrader" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/web" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/platform/services/cache" + "github.com/mattermost/mattermost/server/v8/platform/services/upgrader" + "github.com/mattermost/mattermost/server/v8/platform/shared/web" ) const ( diff --git a/server/channels/api4/system_local.go b/server/channels/api4/system_local.go index 2619bc94529..25d47e621e8 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitSystemLocal() { diff --git a/server/channels/api4/system_test.go b/server/channels/api4/system_test.go index 6e1ac34e6aa..6b3f1911f19 100644 --- a/server/channels/api4/system_test.go +++ b/server/channels/api4/system_test.go @@ -22,9 +22,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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) func TestGetPing(t *testing.T) { diff --git a/server/channels/api4/team.go b/server/channels/api4/team.go index 3be95b404c1..72a9452cd5d 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) const ( diff --git a/server/channels/api4/team_local.go b/server/channels/api4/team_local.go index d1b72f5c8e2..9897ad73355 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/email" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/channels/store" ) func (api *API) InitTeamLocal() { diff --git a/server/channels/api4/team_test.go b/server/channels/api4/team_test.go index 3caf7908ef3..887d6b90000 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/utils/testutils" - "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost/server/v8/einterfaces/mocks" + "github.com/mattermost/mattermost/server/v8/platform/shared/mail" ) func TestCreateTeam(t *testing.T) { diff --git a/server/channels/api4/terms_of_service.go b/server/channels/api4/terms_of_service.go index 888a060734a..e49dd8e11f4 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) 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 5393cd3dca8..252082dcb30 100644 --- a/server/channels/api4/terms_of_service_test.go +++ b/server/channels/api4/terms_of_service_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestGetTermsOfService(t *testing.T) { diff --git a/server/channels/api4/upload.go b/server/channels/api4/upload.go index e50a314f75e..d4f11ad1c65 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitUpload() { diff --git a/server/channels/api4/upload_test.go b/server/channels/api4/upload_test.go index 16b815b17db..514e0920117 100644 --- a/server/channels/api4/upload_test.go +++ b/server/channels/api4/upload_test.go @@ -15,8 +15,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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) func TestCreateUpload(t *testing.T) { diff --git a/server/channels/api4/usage.go b/server/channels/api4/usage.go index c9e9da62975..cea192bb2eb 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) func (api *API) InitUsage() { diff --git a/server/channels/api4/usage_test.go b/server/channels/api4/usage_test.go index 98de5f3eb01..d6182ff87d9 100644 --- a/server/channels/api4/usage_test.go +++ b/server/channels/api4/usage_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestGetPostsUsage(t *testing.T) { diff --git a/server/channels/api4/user.go b/server/channels/api4/user.go index 491f02dbdd6..28b46862e06 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/channels/web" ) func (api *API) InitUser() { diff --git a/server/channels/api4/user_local.go b/server/channels/api4/user_local.go index 5ad09f468cf..f4d423d728c 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) func (api *API) InitUserLocal() { diff --git a/server/channels/api4/user_test.go b/server/channels/api4/user_test.go index b51f8e7be40..acee1b1a835 100644 --- a/server/channels/api4/user_test.go +++ b/server/channels/api4/user_test.go @@ -21,13 +21,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/v8/channels/app" - "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" - "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost/server/v8/einterfaces/mocks" + "github.com/mattermost/mattermost/server/v8/platform/shared/mail" - _ "github.com/mattermost/mattermost-server/server/v8/channels/app/oauthproviders/gitlab" + _ "github.com/mattermost/mattermost/server/v8/channels/app/oauthproviders/gitlab" ) func TestCreateUser(t *testing.T) { diff --git a/server/channels/api4/user_viewmembers_test.go b/server/channels/api4/user_viewmembers_test.go index 67d7fa06907..f3566c9d22b 100644 --- a/server/channels/api4/user_viewmembers_test.go +++ b/server/channels/api4/user_viewmembers_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestAPIRestrictedViewMembers(t *testing.T) { diff --git a/server/channels/api4/webhook.go b/server/channels/api4/webhook.go index b09dd42673e..037624f5c6b 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitWebhook() { diff --git a/server/channels/api4/webhook_local.go b/server/channels/api4/webhook_local.go index 22c9507ed5c..245e002a251 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) func (api *API) InitWebhookLocal() { diff --git a/server/channels/api4/webhook_test.go b/server/channels/api4/webhook_test.go index a1c9323016f..f8626305976 100644 --- a/server/channels/api4/webhook_test.go +++ b/server/channels/api4/webhook_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestCreateIncomingWebhook(t *testing.T) { diff --git a/server/channels/api4/websocket.go b/server/channels/api4/websocket.go index e77905269e1..d49e7cea3cc 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/platform" ) const ( diff --git a/server/channels/api4/websocket_norace_test.go b/server/channels/api4/websocket_norace_test.go index 06c9ee64372..399903a9c4a 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/public/model" + "github.com/mattermost/mattermost/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 202631c66dc..6d0ec68875d 100644 --- a/server/channels/api4/websocket_test.go +++ b/server/channels/api4/websocket_test.go @@ -15,9 +15,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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) func TestWebSocketTrailingSlash(t *testing.T) { diff --git a/server/channels/app/admin.go b/server/channels/app/admin.go index bf2c36c5cff..7e1678cafcf 100644 --- a/server/channels/app/admin.go +++ b/server/channels/app/admin.go @@ -10,11 +10,11 @@ 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/platform/services/cache" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/platform/services/cache" + "github.com/mattermost/mattermost/server/v8/platform/shared/mail" ) var latestVersionCache = cache.NewLRU(cache.LRUOptions{ diff --git a/server/channels/app/admin_advisor.go b/server/channels/app/admin_advisor.go index 279ca907448..c68279ba12d 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/platform/shared/mail" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/platform/shared/mail" ) 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 fb222d74b84..ac650e392b0 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestGetLatestVersion(t *testing.T) { diff --git a/server/channels/app/analytics.go b/server/channels/app/analytics.go index bd896b1e6dc..ec54a76448d 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/channels/app/app.go b/server/channels/app/app.go index eb2f2713ef1..dbb15fb0779 100644 --- a/server/channels/app/app.go +++ b/server/channels/app/app.go @@ -9,16 +9,16 @@ 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/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/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/shared/templates" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/timezones" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost/server/v8/platform/services/imageproxy" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost/server/v8/platform/shared/templates" ) // App is a pure functional component that does not have any fields, except Server. diff --git a/server/channels/app/app_iface.go b/server/channels/app/app_iface.go index b04ec1c6b26..889ec2736ec 100644 --- a/server/channels/app/app_iface.go +++ b/server/channels/app/app_iface.go @@ -18,22 +18,22 @@ 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/audit" - "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/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/shared/filestore" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/timezones" + "github.com/mattermost/mattermost/server/v8/channels/app/platform" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost/server/v8/platform/services/imageproxy" + "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) // 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 060dbacaeb8..4cdeacb28ef 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) /* TODO: Temporarily comment out until MM-11108 diff --git a/server/channels/app/audit.go b/server/channels/app/audit.go index 659ef697dcf..200e9d8b690 100644 --- a/server/channels/app/audit.go +++ b/server/channels/app/audit.go @@ -9,12 +9,12 @@ 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/public/utils" - "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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/utils" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/config" ) var ( diff --git a/server/channels/app/authentication.go b/server/channels/app/authentication.go index 737ac414da3..c2c9d488905 100644 --- a/server/channels/app/authentication.go +++ b/server/channels/app/authentication.go @@ -8,10 +8,10 @@ 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/platform/shared/mfa" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/app/users" + "github.com/mattermost/mattermost/server/v8/platform/shared/mfa" ) type TokenLocation int diff --git a/server/channels/app/authentication_test.go b/server/channels/app/authentication_test.go index b21ea4fd978..c3ca41a95d4 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestParseAuthTokenFromRequest(t *testing.T) { diff --git a/server/channels/app/authorization.go b/server/channels/app/authorization.go index 4af1c1b989f..26889035618 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) 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 ab78fe3ac16..04e2f064883 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestCheckIfRolesGrantPermission(t *testing.T) { diff --git a/server/channels/app/auto_responder.go b/server/channels/app/auto_responder.go index e2110b26f95..c9a66c333d6 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) // 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 fa8023b77ed..655e1dcc0f7 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestSetAutoResponderStatus(t *testing.T) { diff --git a/server/channels/app/bot.go b/server/channels/app/bot.go index 906bc3be592..8ac5e6a414c 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/server/v8/channels/store" ) const ( diff --git a/server/channels/app/bot_test.go b/server/channels/app/bot_test.go index 46bad500f7b..8ed8ecbaffa 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestCreateBot(t *testing.T) { diff --git a/server/channels/app/brand.go b/server/channels/app/brand.go index 947540342e8..3ffce918a5a 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) const ( diff --git a/server/channels/app/busy.go b/server/channels/app/busy.go index 45551703690..0f82ef95f2c 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/public/model" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) const ( diff --git a/server/channels/app/busy_test.go b/server/channels/app/busy_test.go index 361b3b80b9a..eb8f3117133 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/public/model" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) func TestBusySet(t *testing.T) { diff --git a/server/channels/app/channel.go b/server/channels/app/channel.go index de5d7a4a6bf..2e45de9f1cb 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) // 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 0e2ed89b82c..cfa2735f8cd 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 e89626e098c..461e02ec75b 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/public/model" + "github.com/mattermost/mattermost/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 7a1bcb9dad4..d9b7609d1ff 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/public/model" + "github.com/mattermost/mattermost/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 4503cdcaf00..19cb1307b5a 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/users" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestPermanentDeleteChannel(t *testing.T) { diff --git a/server/channels/app/channels.go b/server/channels/app/channels.go index 7bbb0248e6b..d8e19d1553f 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/product" - "github.com/mattermost/mattermost-server/server/v8/config" - "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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/imaging" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/server/v8/config" + "github.com/mattermost/mattermost/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/v8/platform/services/imageproxy" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) const ServerKey product.ServiceKey = "server" diff --git a/server/channels/app/cloud.go b/server/channels/app/cloud.go index 5fdc1e5e262..57d7e799565 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/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/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/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 2d3386c9e52..d26ea11a683 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/public/model" - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/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 ace25a14327..9189510cf8e 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 c7fd3718069..21ae449df58 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" ) const ( diff --git a/server/channels/app/command_autocomplete.go b/server/channels/app/command_autocomplete.go index 34923699999..e90d5c30417 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) // 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 2d9b95ef305..441576165c5 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) func TestParseStaticListArgument(t *testing.T) { diff --git a/server/channels/app/compliance.go b/server/channels/app/compliance.go index 4db83f138f9..736c6e9e928 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 578d3db87ca..73378d8cc57 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/platform/shared/mail" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/platform/shared/mail" ) const ( diff --git a/server/channels/app/config_test.go b/server/channels/app/config_test.go index 21bcf4ca66c..b075d047c12 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) func TestAsymmetricSigningKey(t *testing.T) { diff --git a/server/channels/app/context.go b/server/channels/app/context.go index 6a1037c3564..26775422efb 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/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" ) // 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 99c221d88ee..85a477c8a1e 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/public/model" + "github.com/mattermost/mattermost/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 23f9f5c26da..87a61744178 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) const ( diff --git a/server/channels/app/download_test.go b/server/channels/app/download_test.go index d63052ab78e..c2e23de334c 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestDownloadFromURL(t *testing.T) { diff --git a/server/channels/app/draft.go b/server/channels/app/draft.go index 66506acbf48..3debfb6c69b 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 5864a00a7bd..7c35dc214f5 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" ) func TestGetDraft(t *testing.T) { diff --git a/server/channels/app/email/email.go b/server/channels/app/email/email.go index 718765bcbaf..fd647a7960d 100644 --- a/server/channels/app/email/email.go +++ b/server/channels/app/email/email.go @@ -15,11 +15,11 @@ 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/platform/shared/mail" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/templates" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/platform/shared/mail" + "github.com/mattermost/mattermost/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 053f27b5e43..5a0585b2ef9 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/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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/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 cc8003a829d..48fa76ece66 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/public/model" + "github.com/mattermost/mattermost/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 27446e8fcb3..b06666074a3 100644 --- a/server/channels/app/email/email_test.go +++ b/server/channels/app/email/email_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/platform/shared/mail" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/platform/shared/mail" ) func TestCondenseSiteURL(t *testing.T) { diff --git a/server/channels/app/email/helper_test.go b/server/channels/app/email/helper_test.go index 0de6e0f7091..de5fe9d0cc5 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/platform/shared/templates" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/users" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/config" + "github.com/mattermost/mattermost/server/v8/platform/shared/templates" ) type TestHelper struct { diff --git a/server/channels/app/email/main_test.go b/server/channels/app/email/main_test.go index a2bcf53cdb5..f70407f19d9 100644 --- a/server/channels/app/email/main_test.go +++ b/server/channels/app/email/main_test.go @@ -7,7 +7,7 @@ import ( "flag" "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/app/email/mocks/ServiceInterface.go b/server/channels/app/email/mocks/ServiceInterface.go index 5fdb4e6a4cb..588c3c03a1d 100644 --- a/server/channels/app/email/mocks/ServiceInterface.go +++ b/server/channels/app/email/mocks/ServiceInterface.go @@ -7,13 +7,13 @@ package mocks import ( io "io" - i18n "github.com/mattermost/mattermost-server/server/public/shared/i18n" + i18n "github.com/mattermost/mattermost/server/public/shared/i18n" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" - templates "github.com/mattermost/mattermost-server/server/v8/platform/shared/templates" + templates "github.com/mattermost/mattermost/server/v8/platform/shared/templates" throttled "github.com/throttled/throttled" ) diff --git a/server/channels/app/email/notification_email.go b/server/channels/app/email/notification_email.go index 6331f79153c..9ff1f379956 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) type FieldRow struct { diff --git a/server/channels/app/email/notification_email_test.go b/server/channels/app/email/notification_email_test.go index 247d45101ee..cc8eeed074a 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/public/model" + "github.com/mattermost/mattermost/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 8f21972fb9e..14d87a7616e 100644 --- a/server/channels/app/email/service.go +++ b/server/channels/app/email/service.go @@ -12,12 +12,12 @@ 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/platform/shared/templates" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/users" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/platform/shared/templates" ) const ( diff --git a/server/channels/app/email/utils.go b/server/channels/app/email/utils.go index 225b9178f0e..9427b9bcec9 100644 --- a/server/channels/app/email/utils.go +++ b/server/channels/app/email/utils.go @@ -4,8 +4,8 @@ package email import ( - "github.com/mattermost/mattermost-server/server/v8/channels/utils" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mail" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/platform/shared/mail" ) func (es *Service) mailServiceConfig(replyToAddress string) *mail.SMTPConfig { diff --git a/server/channels/app/email_test.go b/server/channels/app/email_test.go index 532b776cd4c..7995b7e7acd 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestSendInviteEmailRateLimits(t *testing.T) { diff --git a/server/channels/app/emoji.go b/server/channels/app/emoji.go index b5990f2bbe3..73924114e85 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) const ( diff --git a/server/channels/app/enterprise.go b/server/channels/app/enterprise.go index 8befd43515a..4638932bfb2 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/einterfaces" - ejobs "github.com/mattermost/mattermost-server/server/v8/einterfaces/jobs" + "github.com/mattermost/mattermost/server/v8/einterfaces" + ejobs "github.com/mattermost/mattermost/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 b8b53d97ba3..1594ee2eb1b 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/public/model" - storemocks "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" + "github.com/mattermost/mattermost/server/public/model" + storemocks "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/v8/einterfaces/mocks" ) func TestSAMLSettings(t *testing.T) { diff --git a/server/channels/app/expirynotify.go b/server/channels/app/expirynotify.go index 17cbdec3d54..847fc99e032 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/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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/channels/app/expirynotify_test.go b/server/channels/app/expirynotify_test.go index bea57171906..f9dd9dd4a74 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestNotifySessionsExpired(t *testing.T) { diff --git a/server/channels/app/export.go b/server/channels/app/export.go index 3c3e986df7f..f7adfe9b3c9 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/imports" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" ) // 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 3caabc0ea24..df903a428c4 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/imports" ) func ImportLineFromTeam(team *model.TeamForExport) *imports.LineImportData { diff --git a/server/channels/app/export_test.go b/server/channels/app/export_test.go index d9bb25cd49b..d82c95e5630 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) func TestReactionsOfPost(t *testing.T) { diff --git a/server/channels/app/extract_plugin_tar.go b/server/channels/app/extract_plugin_tar.go index 4466cffd249..94201aa18d2 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/public/shared/mlog" + "github.com/mattermost/mattermost/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 b7485c09ff7..9f37ebc53d3 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 d2e3976dd8f..be0993fe9c5 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/public/model" + "github.com/mattermost/mattermost/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 21098a19107..ef4c77cdcf7 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) type splitLogger struct { diff --git a/server/channels/app/file.go b/server/channels/app/file.go index b35ca9880bc..d46a69999e6 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/platform/services/docextractor" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/imaging" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/platform/services/docextractor" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" "github.com/pkg/errors" ) diff --git a/server/channels/app/file_bench_test.go b/server/channels/app/file_bench_test.go index bd81760af3a..1566b26677e 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) var randomJPEG []byte diff --git a/server/channels/app/file_helper.go b/server/channels/app/file_helper.go index e2e9c4af531..741c871ed73 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/public/model" + "github.com/mattermost/mattermost/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 d23afe485c4..e6aa3b7afcd 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/public/model" + "github.com/mattermost/mattermost/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 7ca34fc5943..068bf8a45a7 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils/imgutils" ) 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 d7cfd445456..85bad0eb735 100644 --- a/server/channels/app/file_test.go +++ b/server/channels/app/file_test.go @@ -16,13 +16,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/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" - 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" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + storemocks "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" + eMocks "github.com/mattermost/mattermost/server/v8/einterfaces/mocks" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine/mocks" + filesStoreMocks "github.com/mattermost/mattermost/server/v8/platform/shared/filestore/mocks" ) func TestGeneratePublicLinkHash(t *testing.T) { diff --git a/server/channels/app/group.go b/server/channels/app/group.go index b3474cca510..c337252f485 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 eaded659702..849f88c637b 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/public/model" + "github.com/mattermost/mattermost/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 b30b2962961..acb8d428519 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/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/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/config" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) type TestHelper struct { diff --git a/server/channels/app/hosted_customer.go b/server/channels/app/hosted_customer.go index a6544e3efb1..ca63585d89e 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func (a *App) NotifySelfHostedSignupProgress(progress string, userId string) { diff --git a/server/channels/app/image.go b/server/channels/app/image.go index 113402a768a..a9fde74b9b6 100644 --- a/server/channels/app/image.go +++ b/server/channels/app/image.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/mattermost/mattermost-server/server/v8/channels/app/imaging" + "github.com/mattermost/mattermost/server/v8/channels/app/imaging" ) func checkImageResolutionLimit(w, h int, maxRes int64) error { diff --git a/server/channels/app/imaging/decode_bench_test.go b/server/channels/app/imaging/decode_bench_test.go index 1fdec804149..ca88d81d88f 100644 --- a/server/channels/app/imaging/decode_bench_test.go +++ b/server/channels/app/imaging/decode_bench_test.go @@ -10,7 +10,7 @@ import ( "sync" "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" "github.com/stretchr/testify/require" ) diff --git a/server/channels/app/imaging/decode_test.go b/server/channels/app/imaging/decode_test.go index 6426999e283..63a99f2e643 100644 --- a/server/channels/app/imaging/decode_test.go +++ b/server/channels/app/imaging/decode_test.go @@ -9,7 +9,7 @@ import ( "sync" "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" "github.com/stretchr/testify/require" ) diff --git a/server/channels/app/imaging/utils_test.go b/server/channels/app/imaging/utils_test.go index e626ddffc16..e43fdf53e8d 100644 --- a/server/channels/app/imaging/utils_test.go +++ b/server/channels/app/imaging/utils_test.go @@ -9,7 +9,7 @@ import ( "os" "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" "github.com/stretchr/testify/require" ) diff --git a/server/channels/app/import.go b/server/channels/app/import.go index f600f7149ab..ceb8ca93edf 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/imports" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) 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 66ab23bd66b..ae2de145979 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/imports" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/app/teams" + "github.com/mattermost/mattermost/server/v8/channels/app/users" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) // -- Bulk Import Functions -- diff --git a/server/channels/app/import_functions_test.go b/server/channels/app/import_functions_test.go index 3764cbb697d..b897df9f5eb 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/imports" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) func TestImportImportScheme(t *testing.T) { diff --git a/server/channels/app/import_test.go b/server/channels/app/import_test.go index c6f1a1ba27a..b57c4a2c033 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/imports" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) func ptrStr(s string) *string { diff --git a/server/channels/app/imports/import_types.go b/server/channels/app/imports/import_types.go index 608c1aaf3a1..785cd8ad1cc 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/public/model" + "github.com/mattermost/mattermost/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 90e51541039..c537cf40610 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 3b39f9c57a5..f37ec593bbc 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) func TestImportValidateSchemeImportData(t *testing.T) { diff --git a/server/channels/app/integration_action.go b/server/channels/app/integration_action.go index 8d75560834f..ca9c64f3e4c 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) 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 3972d1e94bb..1d06676f8b7 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/public/model" + "github.com/mattermost/mattermost/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/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/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/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -1042,7 +1042,7 @@ func TestDoPluginRequest(t *testing.T) { "reflect" "sort" - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/job.go b/server/channels/app/job.go index 41975610f5e..085ce57388b 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 d85857ce49d..03ac47c6577 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" ) func TestGetJob(t *testing.T) { diff --git a/server/channels/app/ldap.go b/server/channels/app/ldap.go index fc268dd1613..9ad70447b80 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/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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/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 d07c00b8d30..5952d59f3cf 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/server/v8/channels/store" ) const ( diff --git a/server/channels/app/license_test.go b/server/channels/app/license_test.go index d0f05e6acf1..26b4b58b70c 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestLoadLicense(t *testing.T) { diff --git a/server/channels/app/login.go b/server/channels/app/login.go index 0d415d12f60..af02284173d 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) const cwsTokenEnv = "CWS_CLOUD_TOKEN" diff --git a/server/channels/app/login_test.go b/server/channels/app/login_test.go index 66dbb573bde..ae48e47acf9 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestCheckForClientSideCert(t *testing.T) { diff --git a/server/channels/app/main_test.go b/server/channels/app/main_test.go index 41e35701e05..54c069ba7e4 100644 --- a/server/channels/app/main_test.go +++ b/server/channels/app/main_test.go @@ -7,7 +7,7 @@ import ( "flag" "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/app/migrations.go b/server/channels/app/migrations.go index 3b26dceaa19..107a7e90cf3 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const EmojisPermissionsMigrationKey = "EmojisPermissionsMigrationComplete" diff --git a/server/channels/app/notification.go b/server/channels/app/notification.go index 5981e6742a7..fa5607c4a0e 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/markdown" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" ) func (a *App) canSendPushNotifications() bool { diff --git a/server/channels/app/notification_email.go b/server/channels/app/notification_email.go index 3a758583357..11f2ae2e995 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + email "github.com/mattermost/mattermost/server/v8/channels/app/email" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) 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 55dea3a7e94..ce6f376e7b4 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/timezones" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestGetDirectMessageNotificationEmailSubject(t *testing.T) { diff --git a/server/channels/app/notification_push.go b/server/channels/app/notification_push.go index 1ba3195029a..fa05738a70f 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) type notificationType string diff --git a/server/channels/app/notification_push_test.go b/server/channels/app/notification_push_test.go index bbffa5f8f85..60ec6f1bc65 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" - fmocks "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore/mocks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app/platform" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/config" + fmocks "github.com/mattermost/mattermost/server/v8/platform/shared/filestore/mocks" ) func TestDoesNotifyPropsAllowPushNotification(t *testing.T) { diff --git a/server/channels/app/notification_test.go b/server/channels/app/notification_test.go index 9ac09554791..9328e7ab86e 100644 --- a/server/channels/app/notification_test.go +++ b/server/channels/app/notification_test.go @@ -11,10 +11,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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) func getLicWithSkuShortName(skuShortName string) *model.License { diff --git a/server/channels/app/notify_admin.go b/server/channels/app/notify_admin.go index 8ce2f477d1e..54a319cfaf6 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 0b696ec7bef..e432f65ae32 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) const PluginIdGithub = "github" diff --git a/server/channels/app/oauth.go b/server/channels/app/oauth.go index 8e0b1447f80..2a186b2fc72 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/store" - "github.com/mattermost/mattermost-server/server/v8/channels/utils" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/platform" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) const ( diff --git a/server/channels/app/oauth_test.go b/server/channels/app/oauth_test.go index 3e4fa87910b..ff61f256648 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/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/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" + "github.com/mattermost/mattermost/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 16a0190c073..1f7155b16d6 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/public/model" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) type GitLabProvider struct { diff --git a/server/channels/app/onboarding.go b/server/channels/app/onboarding.go index 452215c019f..0184fd6f5cf 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 9981dde44c6..9d7dd0e06f2 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) func TestOnboardingSavesOrganizationName(t *testing.T) { diff --git a/server/channels/app/opengraph.go b/server/channels/app/opengraph.go index d0e7e839bb0..cfa5135326d 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/channels/app/opentracing/opentracing_layer.go b/server/channels/app/opentracing/opentracing_layer.go index 86ef5d1cc55..3fc3468374a 100644 --- a/server/channels/app/opentracing/opentracing_layer.go +++ b/server/channels/app/opentracing/opentracing_layer.go @@ -18,24 +18,24 @@ 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/audit" - "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/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/tracing" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/timezones" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/platform" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost/server/v8/platform/services/imageproxy" + "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost/server/v8/platform/services/tracing" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" "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 4e2e916a26f..5877d2aaeed 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/store" - "github.com/mattermost/mattermost-server/server/v8/config" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/platform" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/config" + "github.com/mattermost/mattermost/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) type Option func(s *Server) error diff --git a/server/channels/app/permissions.go b/server/channels/app/permissions.go index 6e63231c955..16afddf44f3 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/product" ) const permissionsExportBatchSize = 100 diff --git a/server/channels/app/permissions_migrations.go b/server/channels/app/permissions_migrations.go index c17c19c0afd..e0fefa0b1f8 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" ) type permissionTransformation struct { diff --git a/server/channels/app/permissions_migrations_test.go b/server/channels/app/permissions_migrations_test.go index af160758004..b684b91b8cd 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" ) func TestApplyPermissionsMap(t *testing.T) { diff --git a/server/channels/app/permissions_test.go b/server/channels/app/permissions_test.go index 6891186f5b0..7fa68d6f3e4 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type testWriter struct { diff --git a/server/channels/app/platform/busy.go b/server/channels/app/platform/busy.go index f75f1510775..950a8b7dee9 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/public/model" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) const ( diff --git a/server/channels/app/platform/busy_test.go b/server/channels/app/platform/busy_test.go index e39255e4cf6..71758bdbb3d 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/public/model" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 b10bf04bc9f..20ffe41fd86 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/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/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/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 9c13f0d89a9..bd942fb6ac7 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 e59d9ae3d80..1a68059cc82 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/public/model" + "github.com/mattermost/mattermost/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 15cca374739..f92aec3a0cd 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) func (ps *PlatformService) RegisterClusterHandlers() { diff --git a/server/channels/app/platform/config.go b/server/channels/app/platform/config.go index 01b85432d75..862240afd66 100644 --- a/server/channels/app/platform/config.go +++ b/server/channels/app/platform/config.go @@ -17,13 +17,13 @@ import ( "reflect" "strconv" - "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" - "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/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/utils" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/config" + "github.com/mattermost/mattermost/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 76c9164ba48..ee26acc52d7 100644 --- a/server/channels/app/platform/config_test.go +++ b/server/channels/app/platform/config_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "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/einterfaces/mocks" + "github.com/mattermost/mattermost/server/public/model" + smocks "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/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 ae51246cc3b..f928b04ede7 100644 --- a/server/channels/app/platform/enterprise.go +++ b/server/channels/app/platform/enterprise.go @@ -4,8 +4,8 @@ package platform import ( - "github.com/mattermost/mattermost-server/server/v8/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine" ) var clusterInterface func(*PlatformService) einterfaces.ClusterInterface diff --git a/server/channels/app/platform/feature_flags.go b/server/channels/app/platform/feature_flags.go index 3ed1d16ebcd..5d471f2a7ab 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/featureflag" ) // 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 aafee0a4d3a..015d50834ba 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/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/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/config" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) type TestHelper struct { diff --git a/server/channels/app/platform/license.go b/server/channels/app/platform/license.go index 5979881c443..5b9f35a7f45 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/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/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/jobs" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) const ( diff --git a/server/channels/app/platform/license_test.go b/server/channels/app/platform/license_test.go index 62e31beacd0..3f1af98ad1d 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestLoadLicense(t *testing.T) { diff --git a/server/channels/app/platform/link_cache.go b/server/channels/app/platform/link_cache.go index d13d30cfc77..bdec5d3686d 100644 --- a/server/channels/app/platform/link_cache.go +++ b/server/channels/app/platform/link_cache.go @@ -6,7 +6,7 @@ package platform import ( "time" - "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" + "github.com/mattermost/mattermost/server/v8/platform/services/cache" ) const LinkCacheSize = 10000 diff --git a/server/channels/app/platform/log.go b/server/channels/app/platform/log.go index dec1f9a0e22..030da2f204a 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/config" ) func (ps *PlatformService) Log() mlog.LoggerIFace { diff --git a/server/channels/app/platform/main_test.go b/server/channels/app/platform/main_test.go index ca15d20c434..6b68df2aa49 100644 --- a/server/channels/app/platform/main_test.go +++ b/server/channels/app/platform/main_test.go @@ -7,7 +7,7 @@ import ( "flag" "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/app/platform/metrics.go b/server/channels/app/platform/metrics.go index 3ac551b4370..499dde29a42 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/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 b939366892d..a5f377280fd 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/public/model" + model "github.com/mattermost/mattermost/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 97d948ae68c..8180ffeb95a 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/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/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/localcachelayer" + "github.com/mattermost/mattermost/server/v8/config" + "github.com/mattermost/mattermost/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) type Option func(ps *PlatformService) error diff --git a/server/channels/app/platform/searchengine.go b/server/channels/app/platform/searchengine.go index 0ea2a2aef38..1ffd44bff11 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 5e0a99de52d..ab81f43b29e 100644 --- a/server/channels/app/platform/service.go +++ b/server/channels/app/platform/service.go @@ -12,23 +12,23 @@ 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/jobs" - "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/channels/store/retrylayer" - "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/timerlayer" - "github.com/mattermost/mattermost-server/server/v8/config" - "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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/featureflag" + "github.com/mattermost/mattermost/server/v8/channels/jobs" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/localcachelayer" + "github.com/mattermost/mattermost/server/v8/channels/store/retrylayer" + "github.com/mattermost/mattermost/server/v8/channels/store/searchlayer" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/channels/store/timerlayer" + "github.com/mattermost/mattermost/server/v8/config" + "github.com/mattermost/mattermost/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/v8/platform/services/cache" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine/bleveengine" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) // 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 958ae742aae..1110e9584b1 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/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/einterfaces/mocks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/config" + "github.com/mattermost/mattermost/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 719f2c6c86b..82ac01d26d9 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" ) 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 4beb82cf33a..f52dd09c1e2 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/public/model" + "github.com/mattermost/mattermost/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 b7b38d1ad24..0591b3c5ed5 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/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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/platform/services/sharedchannel" ) 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 7130e9c5576..b028b7381d2 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) 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 8dc53d434d6..dc9665d4e25 100644 --- a/server/channels/app/platform/shared_channel_service_iface.go +++ b/server/channels/app/platform/shared_channel_service_iface.go @@ -4,8 +4,8 @@ package platform import ( - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/platform/services/sharedchannel" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/platform/services/sharedchannel" ) // SharedChannelServiceIFace is the interface to the shared channel service diff --git a/server/channels/app/platform/status.go b/server/channels/app/platform/status.go index 4cb7e39b2bf..8ed29b9e49d 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 64736c8652f..bbb4d6d57a8 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/public/model" + "github.com/mattermost/mattermost/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 708e9adfa9a..7b969671d0c 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/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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/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 9fe76d1c193..1943aeed76b 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/public/model" - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 2fa25260b90..edb2b3d4e1e 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 5552df3b691..7277380d2e3 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + platform_mocks "github.com/mattermost/mattermost/server/v8/channels/app/platform/mocks" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) 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 4ff5fe2adae..fdc45d5b9e0 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/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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) type webSocketHandler interface { diff --git a/server/channels/app/plugin.go b/server/channels/app/plugin.go index 893b5ac8976..13a2ac045d6 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/platform/services/marketplace" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost/server/v8/platform/services/marketplace" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) const prepackagedPluginsDir = "prepackaged_plugins" diff --git a/server/channels/app/plugin_api.go b/server/channels/app/plugin_api.go index ceb32adcb34..6b459a1cf8e 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type PluginAPI struct { diff --git a/server/channels/app/plugin_api_test.go b/server/channels/app/plugin_api_test.go index c4312c6ce33..26e8f0f6b87 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/utils/fileutils" - "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin/utils" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost/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/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin" ) type MyPlugin struct { @@ -830,7 +830,7 @@ func TestPluginAPIGetPlugins(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/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/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin" ) type configuration struct { @@ -1498,7 +1498,7 @@ func TestInterpluginPluginHTTP(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin" "bytes" "net/http" ) @@ -1539,8 +1539,8 @@ func TestInterpluginPluginHTTP(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/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/public/model" - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin" ) type MyPlugin struct { @@ -2112,8 +2112,8 @@ func TestPluginUploadsAPI(t *testing.T) { "fmt" "bytes" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 d15bbcea65f..922d069dbf8 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/public/plugin" + "github.com/mattermost/mattermost/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 6c5add35637..cb008b126b5 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/public/model" - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 8c0dab47723..a145d382ddc 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" ) 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 f64f02727de..6f2c1a2a551 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" ) 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 0c9f735638b..e53992817bd 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" ) 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 7bd3a17a5cd..f64bbe48740 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/public/model" - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 4c940a4ebd7..195f03fc341 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/platform/shared/driver" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/platform/shared/driver" ) 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 73cfd2b8ee4..c8660d9ce86 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" ) 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 ebd8996d391..c385d1c26cb 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" ) 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 7d2038d67c4..c876b1c9e07 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" ) 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 1d824b6b9ff..1bb71dc625b 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" ) 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 52eea5fa0dd..21dcb072ae6 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" ) 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 b8d991878c5..140514011dd 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" ) 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 920ec4c6c25..5302cb30142 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" ) 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 cd1ebadb961..1b868ace9c8 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" ) 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 196db502e89..1ab4891181a 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" ) 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 51794ae854e..9a1381d94fb 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" ) 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 8a42f2be29c..ee9b916a76d 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" ) 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 62f788248c3..d7bf2e39cc5 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/platform/shared/mail" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" + "github.com/mattermost/mattermost/server/v8/platform/shared/mail" ) 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 4a4e8704345..57141a10d4d 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" ) 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 90e9a859b7d..948db6c8179 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" ) 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 7ef20df348e..f0e0395fcaf 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" ) 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 07146cbb766..be9f141438b 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/channels/app/plugin_api_tests" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_commands.go b/server/channels/app/plugin_commands.go index fa817f7140d..17b246fa7dd 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type PluginCommand struct { diff --git a/server/channels/app/plugin_commands_test.go b/server/channels/app/plugin_commands_test.go index 0049af38abd..dee14b35b81 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/product" ) func TestPluginCommand(t *testing.T) { @@ -43,8 +43,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type configuration struct { @@ -124,8 +124,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type configuration struct { @@ -231,8 +231,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type configuration struct { @@ -296,8 +296,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -341,8 +341,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -392,8 +392,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type configuration struct { @@ -548,8 +548,8 @@ func TestProductCommands(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/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 e060ab20d2d..56ed0ceaa24 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/public/model" - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 e6dbd82b381..78c9feffc29 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/public/model" + "github.com/mattermost/mattermost/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/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -112,8 +112,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -147,8 +147,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -218,8 +218,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_event.go b/server/channels/app/plugin_event.go index 41ec2825126..22aa1a66275 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/public/model" + "github.com/mattermost/mattermost/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 1ec801890ea..22b95dce0fe 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/public/model" - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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/public/model" - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 25542a3f797..7657ead163a 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/einterfaces/mocks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin/plugintest" + "github.com/mattermost/mattermost/server/public/plugin/utils" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/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/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -112,8 +112,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -153,8 +153,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -196,8 +196,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -240,8 +240,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -262,8 +262,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -308,8 +308,8 @@ func TestHookMessageHasBeenPosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -346,8 +346,8 @@ func TestHookMessageWillBeUpdated(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -394,8 +394,8 @@ func TestHookMessageHasBeenUpdated(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -442,8 +442,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { import ( "io" - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -487,8 +487,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { import ( "fmt" "io" - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -536,8 +536,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { import ( "io" - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -593,8 +593,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { "io" "fmt" "bytes" - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/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/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/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/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -740,8 +740,8 @@ func TestUserHasLoggedIn(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -782,8 +782,8 @@ func TestUserHasBeenCreated(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -831,7 +831,7 @@ func TestErrorString(t *testing.T) { import ( "errors" - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin" ) type MyPlugin struct { @@ -860,8 +860,8 @@ func TestErrorString(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -913,8 +913,8 @@ func TestHookContext(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -956,8 +956,8 @@ func TestActiveHooks(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" ) type MyPlugin struct { @@ -1042,8 +1042,8 @@ func TestHookMetrics(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" ) type MyPlugin struct { @@ -1129,8 +1129,8 @@ func TestHookReactionHasBeenAdded(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -1171,8 +1171,8 @@ func TestHookReactionHasBeenRemoved(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -1211,7 +1211,7 @@ func TestHookRunDataRetention(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin" ) type MyPlugin struct { @@ -1255,7 +1255,7 @@ func TestHookOnSendDailyTelemetry(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin" ) type MyPlugin struct { @@ -1298,8 +1298,8 @@ func TestHookOnCloudLimitsUpdated(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_install.go b/server/channels/app/plugin_install.go index 8c85264cab7..5f99c86bb97 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/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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/utils" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) // 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 90d4c2b1458..352d1a5e351 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) type nilReadSeeker struct { diff --git a/server/channels/app/plugin_key_value_store.go b/server/channels/app/plugin_key_value_store.go index 71c431b6d4d..25fcd13ef70 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" ) func getKeyHash(key string) string { diff --git a/server/channels/app/plugin_requests.go b/server/channels/app/plugin_requests.go index c573565bba9..2bb1750f201 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) 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 4f27a787591..d22bef437a9 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) func TestServePluginPublicRequest(t *testing.T) { diff --git a/server/channels/app/plugin_shutdown_test.go b/server/channels/app/plugin_shutdown_test.go index 34077911ac3..63cc9932e9f 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/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin" ) type MyPlugin struct { @@ -39,7 +39,7 @@ func TestPluginShutdownTest(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/plugin_signature.go b/server/channels/app/plugin_signature.go index e218bad79e4..ad90cf3faad 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) // 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 d016a6a8236..f7d6e61225d 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) func TestPluginPublicKeys(t *testing.T) { diff --git a/server/channels/app/plugin_statuses.go b/server/channels/app/plugin_statuses.go index 2405812a144..13871611e40 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/public/model" + "github.com/mattermost/mattermost/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 eddd57ca4c2..74be41170e7 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) func getHashedKey(key string) string { @@ -729,8 +729,8 @@ func TestPluginPanicLogs(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -778,7 +778,7 @@ func TestPluginStatusActivateError(t *testing.T) { import ( "errors" - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin" ) type MyPlugin struct { diff --git a/server/channels/app/post.go b/server/channels/app/post.go index c8f1b6cdd25..93a005842a4 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/platform/services/cache" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/platform/services/cache" ) const ( diff --git a/server/channels/app/post_acknowledgements.go b/server/channels/app/post_acknowledgements.go index b6933ce5c75..10fe84a7985 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 b7b6ac034eb..1ce4f4ed1ed 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/public/model" + "github.com/mattermost/mattermost/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 17e7447722c..64bd4945d71 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/public/model" + "github.com/mattermost/mattermost/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 a3d1726d55d..e47813f07bc 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/public/model" + "github.com/mattermost/mattermost/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 22083f22bcd..8ad5887ca50 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/markdown" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/platform" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/utils/imgutils" ) type linkMetadataCache struct { diff --git a/server/channels/app/post_metadata_test.go b/server/channels/app/post_metadata_test.go index 43921ab03a0..ff92c30be33 100644 --- a/server/channels/app/post_metadata_test.go +++ b/server/channels/app/post_metadata_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "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/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" "github.com/stretchr/testify/mock" "github.com/dyatlov/go-opengraph/opengraph" @@ -27,11 +27,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/v8/channels/app/platform" - "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" - "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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/platform" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost/server/v8/platform/services/imageproxy" ) func TestPreparePostListForClient(t *testing.T) { diff --git a/server/channels/app/post_persistent_notification.go b/server/channels/app/post_persistent_notification.go index 9d047e166a5..3baf5c42c4b 100644 --- a/server/channels/app/post_persistent_notification.go +++ b/server/channels/app/post_persistent_notification.go @@ -8,10 +8,10 @@ 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/request" - "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" "github.com/pkg/errors" ) diff --git a/server/channels/app/post_persistent_notification_test.go b/server/channels/app/post_persistent_notification_test.go index f4a7a5c3674..81191542b0a 100644 --- a/server/channels/app/post_persistent_notification_test.go +++ b/server/channels/app/post_persistent_notification_test.go @@ -7,9 +7,9 @@ import ( "os" "testing" - "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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + storemocks "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/server/channels/app/post_priority.go b/server/channels/app/post_priority.go index 2d7118b9b16..f43ce45cf30 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/public/model" + "github.com/mattermost/mattermost/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 cbcce306c34..46d08855c04 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" - "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" - 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/platform" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + storemocks "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/channels/testlib" + eMocks "github.com/mattermost/mattermost/server/v8/einterfaces/mocks" + "github.com/mattermost/mattermost/server/v8/platform/services/imageproxy" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine/mocks" ) func TestCreatePostDeduplicate(t *testing.T) { @@ -61,8 +61,8 @@ func TestCreatePostDeduplicate(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" ) type MyPlugin struct { @@ -110,8 +110,8 @@ func TestCreatePostDeduplicate(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" "time" ) diff --git a/server/channels/app/preference.go b/server/channels/app/preference.go index b3a56522844..0a2eacd6ac1 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/product" ) // Ensure preferences service wrapper implements `product.PreferencesService` diff --git a/server/channels/app/product.go b/server/channels/app/product.go index 4d594e4e90f..323eb103b90 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/product" ) func (s *Server) initializeProducts( diff --git a/server/channels/app/product_notices.go b/server/channels/app/product_notices.go index 6178e7da700..77fe812e555 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/config" ) const MaxRepeatViewings = 3 diff --git a/server/channels/app/product_notices_test.go b/server/channels/app/product_notices_test.go index 254d8a7e334..21e1e90f3c6 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestNoticeValidation(t *testing.T) { diff --git a/server/channels/app/product_test.go b/server/channels/app/product_test.go index 1002eedad6b..49a885e9f48 100644 --- a/server/channels/app/product_test.go +++ b/server/channels/app/product_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" - "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/config" + "github.com/mattermost/mattermost/server/v8/channels/app/platform" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/server/v8/config" ) const ( diff --git a/server/channels/app/ratelimit.go b/server/channels/app/ratelimit.go index f050be89ed8..ed750f264d7 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) type RateLimiter struct { diff --git a/server/channels/app/ratelimit_test.go b/server/channels/app/ratelimit_test.go index 7e3b45e29e0..e026640ccd9 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/public/model" + "github.com/mattermost/mattermost/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 0624a2c0aa3..98deb00f7ac 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) 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 bd17ee03c08..6add1fc68dc 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) func TestSharedChannelSyncForReactionActions(t *testing.T) { diff --git a/server/channels/app/remote_cluster.go b/server/channels/app/remote_cluster.go index 50a5a57e417..8114dbd9e01 100644 --- a/server/channels/app/remote_cluster.go +++ b/server/channels/app/remote_cluster.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" - "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/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/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 aade20cba73..d17d11a4634 100644 --- a/server/channels/app/remote_cluster_service_mock.go +++ b/server/channels/app/remote_cluster_service_mock.go @@ -6,8 +6,8 @@ package app import ( "context" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" ) // MockOptionRemoteClusterService a mock of the remote cluster service diff --git a/server/channels/app/remote_cluster_test.go b/server/channels/app/remote_cluster_test.go index b18af6cc263..41dd89f477e 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" ) func TestAddRemoteCluster(t *testing.T) { diff --git a/server/channels/app/request/context.go b/server/channels/app/request/context.go index 25555282920..29efaedeea0 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/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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) type Context struct { diff --git a/server/channels/app/role.go b/server/channels/app/role.go index aad5a692bfd..15c95b15955 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) 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 a776020c72d..04f9f9bd88d 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) type permissionInheritanceTestData struct { diff --git a/server/channels/app/saml.go b/server/channels/app/saml.go index b8ed9830d88..93b765cd757 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) const ( diff --git a/server/channels/app/scheme.go b/server/channels/app/scheme.go index 0e8cc6c68ad..e8ff7d82ac3 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 c6b4b22a466..d7926489a1b 100644 --- a/server/channels/app/searchengine.go +++ b/server/channels/app/searchengine.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/platform/services/searchengine" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine" ) func (a *App) TestElasticsearch(cfg *model.Config) *model.AppError { diff --git a/server/channels/app/security_update_check.go b/server/channels/app/security_update_check.go index fd903337434..52e64c9164c 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/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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/platform/shared/mail" ) const ( diff --git a/server/channels/app/server.go b/server/channels/app/server.go index 394aa7ee684..077a6c2cac8 100644 --- a/server/channels/app/server.go +++ b/server/channels/app/server.go @@ -27,51 +27,51 @@ 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/jobs" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs/active_users" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs/expirynotify" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs/export_delete" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs/export_process" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs/extract_content" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs/hosted_purchase_screening" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs/import_delete" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs/import_process" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs/last_accessible_file" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs/last_accessible_post" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs/migrations" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs/notify_admin" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs/plugins" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs/post_persistent_notifications" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs/product_notices" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs/resend_invitation_email" - "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/config" - "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" - "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/bleveengine" - "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/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/mail" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/templates" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/timezones" + "github.com/mattermost/mattermost/server/v8/channels/app/email" + "github.com/mattermost/mattermost/server/v8/channels/app/platform" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/app/teams" + "github.com/mattermost/mattermost/server/v8/channels/app/users" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/channels/jobs" + "github.com/mattermost/mattermost/server/v8/channels/jobs/active_users" + "github.com/mattermost/mattermost/server/v8/channels/jobs/expirynotify" + "github.com/mattermost/mattermost/server/v8/channels/jobs/export_delete" + "github.com/mattermost/mattermost/server/v8/channels/jobs/export_process" + "github.com/mattermost/mattermost/server/v8/channels/jobs/extract_content" + "github.com/mattermost/mattermost/server/v8/channels/jobs/hosted_purchase_screening" + "github.com/mattermost/mattermost/server/v8/channels/jobs/import_delete" + "github.com/mattermost/mattermost/server/v8/channels/jobs/import_process" + "github.com/mattermost/mattermost/server/v8/channels/jobs/last_accessible_file" + "github.com/mattermost/mattermost/server/v8/channels/jobs/last_accessible_post" + "github.com/mattermost/mattermost/server/v8/channels/jobs/migrations" + "github.com/mattermost/mattermost/server/v8/channels/jobs/notify_admin" + "github.com/mattermost/mattermost/server/v8/channels/jobs/plugins" + "github.com/mattermost/mattermost/server/v8/channels/jobs/post_persistent_notifications" + "github.com/mattermost/mattermost/server/v8/channels/jobs/product_notices" + "github.com/mattermost/mattermost/server/v8/channels/jobs/resend_invitation_email" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/config" + "github.com/mattermost/mattermost/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/v8/platform/services/awsmeter" + "github.com/mattermost/mattermost/server/v8/platform/services/cache" + "github.com/mattermost/mattermost/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine/bleveengine" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine/bleveengine/indexer" + "github.com/mattermost/mattermost/server/v8/platform/services/sharedchannel" + "github.com/mattermost/mattermost/server/v8/platform/services/telemetry" + "github.com/mattermost/mattermost/server/v8/platform/services/tracing" + "github.com/mattermost/mattermost/server/v8/platform/services/upgrader" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost/server/v8/platform/shared/mail" + "github.com/mattermost/mattermost/server/v8/platform/shared/templates" ) var SentryDSN = "https://9d7c9cccf549479799f880bcf4f26323@o94110.ingest.sentry.io/5212327" diff --git a/server/channels/app/server_test.go b/server/channels/app/server_test.go index 5e8fc99516d..a816c54de76 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/platform/shared/filestore" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/platform" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost/server/v8/config" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) func newServer(t *testing.T) (*Server, error) { diff --git a/server/channels/app/session.go b/server/channels/app/session.go index 69b2ccacd3a..e24c119931a 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/platform" + "github.com/mattermost/mattermost/server/v8/channels/app/users" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 e6cf6a6f6c9..34c068c509d 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/public/model" + "github.com/mattermost/mattermost/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 ecf4f77a305..b4d0043589e 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 aab7998bda2..485ae692a52 100644 --- a/server/channels/app/shared_channel_service_iface.go +++ b/server/channels/app/shared_channel_service_iface.go @@ -5,8 +5,8 @@ package app // TODO: platform: remove this and use from platform package import ( - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/platform/services/sharedchannel" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/platform/services/sharedchannel" ) // SharedChannelServiceIFace is the interface to the shared channel service diff --git a/server/channels/app/shared_channel_test.go b/server/channels/app/shared_channel_test.go index f012d65b487..6d03d6d3e0e 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestApp_CheckCanInviteToSharedChannel(t *testing.T) { diff --git a/server/channels/app/slack.go b/server/channels/app/slack.go index 88b99ee4663..b4c5a0d079e 100644 --- a/server/channels/app/slack.go +++ b/server/channels/app/slack.go @@ -13,10 +13,10 @@ 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/platform/services/slackimport" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/platform/services/slackimport" ) func (a *App) SlackImport(c *request.Context, fileData multipart.File, fileSize int64, teamID string) (*model.AppError, *bytes.Buffer) { diff --git a/server/channels/app/slack_test.go b/server/channels/app/slack_test.go index 2d06fb02875..31b35cd34bb 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/public/model" + "github.com/mattermost/mattermost/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 a7ce762db99..0e56ab99886 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) type AutoChannelCreator struct { diff --git a/server/channels/app/slashcommands/auto_constants.go b/server/channels/app/slashcommands/auto_constants.go index 420076ed276..7c4877594a5 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) const ( diff --git a/server/channels/app/slashcommands/auto_environment.go b/server/channels/app/slashcommands/auto_environment.go index 7170044ea26..9e73a20dbe0 100644 --- a/server/channels/app/slashcommands/auto_environment.go +++ b/server/channels/app/slashcommands/auto_environment.go @@ -8,10 +8,10 @@ import ( "math/rand" "time" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/app" - "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) type TestEnvironment struct { diff --git a/server/channels/app/slashcommands/auto_posts.go b/server/channels/app/slashcommands/auto_posts.go index db5de0223c9..573c9c0120c 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) type AutoPostCreator struct { diff --git a/server/channels/app/slashcommands/auto_teams.go b/server/channels/app/slashcommands/auto_teams.go index 5a6edd58d42..be6386b9103 100644 --- a/server/channels/app/slashcommands/auto_teams.go +++ b/server/channels/app/slashcommands/auto_teams.go @@ -6,8 +6,8 @@ package slashcommands import ( "context" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) type TeamEnvironment struct { diff --git a/server/channels/app/slashcommands/auto_users.go b/server/channels/app/slashcommands/auto_users.go index 9968c77aaac..d2aa7e765ad 100644 --- a/server/channels/app/slashcommands/auto_users.go +++ b/server/channels/app/slashcommands/auto_users.go @@ -8,11 +8,11 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/app" - "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) type AutoUserCreator struct { diff --git a/server/channels/app/slashcommands/command_away.go b/server/channels/app/slashcommands/command_away.go index 163266b2b89..89fa9e26076 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type AwayProvider struct { diff --git a/server/channels/app/slashcommands/command_channel_header.go b/server/channels/app/slashcommands/command_channel_header.go index f122c9de853..7996ac48fd8 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type HeaderProvider struct { diff --git a/server/channels/app/slashcommands/command_channel_header_test.go b/server/channels/app/slashcommands/command_channel_header_test.go index 0d9f3915bc8..43c8c1ca2de 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/public/model" + "github.com/mattermost/mattermost/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 01af2f07138..0cdf813637e 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type PurposeProvider struct { diff --git a/server/channels/app/slashcommands/command_channel_purpose_test.go b/server/channels/app/slashcommands/command_channel_purpose_test.go index d4cb61901cd..de428b2f9da 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/public/model" + "github.com/mattermost/mattermost/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 d85d5508e86..a84d76053a1 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type RenameProvider struct { diff --git a/server/channels/app/slashcommands/command_channel_rename_test.go b/server/channels/app/slashcommands/command_channel_rename_test.go index f755cea62ab..901015ca86c 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/public/model" + "github.com/mattermost/mattermost/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 5b77577e4b8..c8582cd5f79 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type CodeProvider struct { diff --git a/server/channels/app/slashcommands/command_code_test.go b/server/channels/app/slashcommands/command_code_test.go index b45ca224086..1ac3a73cc40 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/public/model" + "github.com/mattermost/mattermost/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 7daaad4f026..0851fb3b4e2 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type CustomStatusProvider struct { diff --git a/server/channels/app/slashcommands/command_custom_status_test.go b/server/channels/app/slashcommands/command_custom_status_test.go index a72ca28752c..aecc1dbb2dc 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/public/model" + "github.com/mattermost/mattermost/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 95c76baeeb6..ac34f47cb4a 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type DndProvider struct { diff --git a/server/channels/app/slashcommands/command_echo.go b/server/channels/app/slashcommands/command_echo.go index f43552a7c13..f2dd04e2c0c 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) var echoSem chan bool diff --git a/server/channels/app/slashcommands/command_expand_collapse.go b/server/channels/app/slashcommands/command_expand_collapse.go index 0ea064490d2..95d40f49035 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type ExpandProvider struct { diff --git a/server/channels/app/slashcommands/command_groupmsg.go b/server/channels/app/slashcommands/command_groupmsg.go index c76530a93cc..ea820fe6c8b 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type groupmsgProvider struct { diff --git a/server/channels/app/slashcommands/command_groupmsg_test.go b/server/channels/app/slashcommands/command_groupmsg_test.go index 9f936e1793e..adae67e5c88 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" ) func TestGroupMsgUsernames(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_help.go b/server/channels/app/slashcommands/command_help.go index 99fc57662af..0d1509e3781 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type HelpProvider struct { diff --git a/server/channels/app/slashcommands/command_invite.go b/server/channels/app/slashcommands/command_invite.go index 3d9d4906d5a..b2d04bcb212 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type InviteProvider struct { diff --git a/server/channels/app/slashcommands/command_invite_people.go b/server/channels/app/slashcommands/command_invite_people.go index cbd33460fc7..2bfede51f52 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type InvitePeopleProvider struct { diff --git a/server/channels/app/slashcommands/command_invite_people_test.go b/server/channels/app/slashcommands/command_invite_people_test.go index e46c3fa7165..62fc14d0597 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/public/model" + "github.com/mattermost/mattermost/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 06ad9416e8d..9a4aeffbe4d 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app" ) func TestInviteProvider(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_join.go b/server/channels/app/slashcommands/command_join.go index 7d1644c345b..9e894aadd78 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type JoinProvider struct { diff --git a/server/channels/app/slashcommands/command_join_test.go b/server/channels/app/slashcommands/command_join_test.go index 94066b0bfb9..9abfe68e1d5 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" ) func TestJoinCommandNoChannel(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_leave.go b/server/channels/app/slashcommands/command_leave.go index 42e60d3fdbc..33dc1cbc2b0 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type LeaveProvider struct { diff --git a/server/channels/app/slashcommands/command_leave_test.go b/server/channels/app/slashcommands/command_leave_test.go index 64ac1aa1c65..0d85d50192c 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/public/model" + "github.com/mattermost/mattermost/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 7e99cec8e61..18dc3ada290 100644 --- a/server/channels/app/slashcommands/command_loadtest.go +++ b/server/channels/app/slashcommands/command_loadtest.go @@ -15,12 +15,12 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/i18n" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" - "github.com/mattermost/mattermost-server/server/v8/channels/app" - "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) var usage = `Mattermost testing commands to help configure the system diff --git a/server/channels/app/slashcommands/command_logout.go b/server/channels/app/slashcommands/command_logout.go index 18acf62b602..376698b14c9 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type LogoutProvider struct { diff --git a/server/channels/app/slashcommands/command_marketplace.go b/server/channels/app/slashcommands/command_marketplace.go index 09cb882652b..1da64332793 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type MarketplaceProvider struct { diff --git a/server/channels/app/slashcommands/command_marketplace_test.go b/server/channels/app/slashcommands/command_marketplace_test.go index 4fa0686c857..b6c4c92af52 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/public/model" + "github.com/mattermost/mattermost/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 8381e3f2dc0..c11424df2de 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type MeProvider struct { diff --git a/server/channels/app/slashcommands/command_me_test.go b/server/channels/app/slashcommands/command_me_test.go index d8f426b2b25..840fcc01234 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/public/model" + "github.com/mattermost/mattermost/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 70abc5b6923..80272f1cf18 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type msgProvider struct { diff --git a/server/channels/app/slashcommands/command_msg_test.go b/server/channels/app/slashcommands/command_msg_test.go index 71c3c387bde..c8d38083640 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" ) func TestMsgProvider(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_mute.go b/server/channels/app/slashcommands/command_mute.go index 6b36782053b..4e47aa6d51e 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type MuteProvider struct { diff --git a/server/channels/app/slashcommands/command_mute_test.go b/server/channels/app/slashcommands/command_mute_test.go index b102c5301c5..24c009e0419 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" ) func TestMuteCommandNoChannel(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_offline.go b/server/channels/app/slashcommands/command_offline.go index f211451c5ef..26346e0171c 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type OfflineProvider struct { diff --git a/server/channels/app/slashcommands/command_online.go b/server/channels/app/slashcommands/command_online.go index 4eef698493d..68d7f99ceb8 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type OnlineProvider struct { diff --git a/server/channels/app/slashcommands/command_open.go b/server/channels/app/slashcommands/command_open.go index 13f4b6d80bb..00ce02add30 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" ) type OpenProvider struct { diff --git a/server/channels/app/slashcommands/command_remote.go b/server/channels/app/slashcommands/command_remote.go index 4e1061e0978..de3e9ca7edf 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) const ( diff --git a/server/channels/app/slashcommands/command_remove.go b/server/channels/app/slashcommands/command_remove.go index b82acd2c4de..e429706ccc7 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type RemoveProvider struct { diff --git a/server/channels/app/slashcommands/command_remove_test.go b/server/channels/app/slashcommands/command_remove_test.go index bbf43e9f95b..26fb30a25ba 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/public/model" + "github.com/mattermost/mattermost/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 edebdd4d738..a2d505aac89 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type SearchProvider struct { diff --git a/server/channels/app/slashcommands/command_settings.go b/server/channels/app/slashcommands/command_settings.go index 812bad4d4dc..b6710a7ef10 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type SettingsProvider struct { diff --git a/server/channels/app/slashcommands/command_share.go b/server/channels/app/slashcommands/command_share.go index fede1a96ede..a680515b9c0 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type ShareProvider struct { diff --git a/server/channels/app/slashcommands/command_share_test.go b/server/channels/app/slashcommands/command_share_test.go index 1c5cbb0b14c..8274c586841 100644 --- a/server/channels/app/slashcommands/command_share_test.go +++ b/server/channels/app/slashcommands/command_share_test.go @@ -9,14 +9,14 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/channels/testlib" - "github.com/mattermost/mattermost-server/server/v8/channels/app" - "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestShareProviderDoCommand(t *testing.T) { diff --git a/server/channels/app/slashcommands/command_shortcuts.go b/server/channels/app/slashcommands/command_shortcuts.go index 794865e686b..019c6a341ac 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type ShortcutsProvider struct { diff --git a/server/channels/app/slashcommands/command_shrug.go b/server/channels/app/slashcommands/command_shrug.go index 1150c6f58b8..2685485447e 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type ShrugProvider struct { diff --git a/server/channels/app/slashcommands/command_test.go b/server/channels/app/slashcommands/command_test.go index ca71462f087..a61a102016e 100644 --- a/server/channels/app/slashcommands/command_test.go +++ b/server/channels/app/slashcommands/command_test.go @@ -16,8 +16,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/platform/services/httpservice" ) type InfiniteReader struct { diff --git a/server/channels/app/slashcommands/helper_test.go b/server/channels/app/slashcommands/helper_test.go index fc58c636180..60e5d4d56c6 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/config" ) type TestHelper struct { diff --git a/server/channels/app/slashcommands/main_test.go b/server/channels/app/slashcommands/main_test.go index ab5797f831f..c51047df9b5 100644 --- a/server/channels/app/slashcommands/main_test.go +++ b/server/channels/app/slashcommands/main_test.go @@ -6,7 +6,7 @@ package slashcommands import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/app/slashcommands/util.go b/server/channels/app/slashcommands/util.go index d4e3be7621b..fa607d2e045 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" ) const ( diff --git a/server/channels/app/status.go b/server/channels/app/status.go index d1c5c582165..0fbc15eb180 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) // GetUserStatusesByIds used by apiV4 diff --git a/server/channels/app/status_test.go b/server/channels/app/status_test.go index 3f8c2829144..247fb8555db 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/users" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestCustomStatus(t *testing.T) { diff --git a/server/channels/app/support_packet.go b/server/channels/app/support_packet.go index 0481444c038..c1b83cb0da7 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/public/model" + "github.com/mattermost/mattermost/server/v8/config" ) 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 3377c08c9d2..09e93e1ef8b 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestCreatePluginsFile(t *testing.T) { diff --git a/server/channels/app/syncables.go b/server/channels/app/syncables.go index e2de5e779f0..785b6aca93a 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) // 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 bcce997ad1c..c1b80a90f5b 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestCreateDefaultMemberships(t *testing.T) { diff --git a/server/channels/app/team.go b/server/channels/app/team.go index aed66326d20..30f78a69ecf 100644 --- a/server/channels/app/team.go +++ b/server/channels/app/team.go @@ -18,20 +18,20 @@ import ( "sort" "strings" - fb_model "github.com/mattermost/mattermost-server/server/v8/boards/model" + fb_model "github.com/mattermost/mattermost/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" - "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/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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/email" + "github.com/mattermost/mattermost/server/v8/channels/app/imaging" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/app/teams" + "github.com/mattermost/mattermost/server/v8/channels/app/users" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" ) // teamServiceWrapper provides an implementation of `product.TeamService` to be used by products. @@ -207,7 +207,7 @@ func (a *App) shouldCreateOnboardingLinkedBoard(c request.CTX, teamId string) bo func (a *App) createOnboardingLinkedBoard(c request.CTX, teamId string) (*fb_model.Board, *model.AppError) { const defaultTemplatesTeam = "0" - // see https://github.com/mattermost/mattermost-server/server/v8/boards/blob/main/server/services/store/sqlstore/board.go#L302 + // see https://github.com/mattermost/mattermost/server/v8/boards/blob/main/server/services/store/sqlstore/board.go#L302 // and https://github.com/mattermost/mattermost-server/pull/22201#discussion_r1099536430 const defaultTemplateTitle = "Welcome to Boards!" welcomeToBoardsTemplateId := fmt.Sprintf("%x", md5.Sum([]byte(defaultTemplateTitle))) diff --git a/server/channels/app/team_test.go b/server/channels/app/team_test.go index 6240a688c30..47fb9ac8aa7 100644 --- a/server/channels/app/team_test.go +++ b/server/channels/app/team_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" - "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" - "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/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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/email" + emailmocks "github.com/mattermost/mattermost/server/v8/channels/app/email/mocks" + "github.com/mattermost/mattermost/server/v8/channels/app/teams" + "github.com/mattermost/mattermost/server/v8/channels/app/users" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) func TestCreateTeam(t *testing.T) { diff --git a/server/channels/app/teams/helper_test.go b/server/channels/app/teams/helper_test.go index ba6817596f3..a80864a030e 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/config" ) type TestHelper struct { diff --git a/server/channels/app/teams/main_test.go b/server/channels/app/teams/main_test.go index 621c97f30d9..e0f77817165 100644 --- a/server/channels/app/teams/main_test.go +++ b/server/channels/app/teams/main_test.go @@ -7,7 +7,7 @@ import ( "flag" "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/app/teams/service.go b/server/channels/app/teams/service.go index 902883da7ff..c188a96d9c7 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type TeamService struct { diff --git a/server/channels/app/teams/teams.go b/server/channels/app/teams/teams.go index bbf5b4286fc..c1ef533e154 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" ) func (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 8537fa4aae7..ab65925100f 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/public/model" + "github.com/mattermost/mattermost/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 18cf516a8ac..6ce1dd1c8c9 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) // By default the list will be (not necessarily in this order): diff --git a/server/channels/app/telemetry.go b/server/channels/app/telemetry.go index 2258d837fb2..6e3cc4604fe 100644 --- a/server/channels/app/telemetry.go +++ b/server/channels/app/telemetry.go @@ -3,7 +3,7 @@ package app -import "github.com/mattermost/mattermost-server/server/v8/platform/services/telemetry" +import "github.com/mattermost/mattermost/server/v8/platform/services/telemetry" func (s *Server) GetTelemetryService() *telemetry.TelemetryService { return s.telemetryService diff --git a/server/channels/app/terms_of_service.go b/server/channels/app/terms_of_service.go index 75630a558f8..e3f4a844718 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 7a4064ff48b..50f87871a41 100644 --- a/server/channels/app/true_up.go +++ b/server/channels/app/true_up.go @@ -11,10 +11,10 @@ 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/platform/services/telemetry" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/platform/services/telemetry" ) func pluginActivated(pluginStates map[string]*model.PluginState, pluginId string) bool { diff --git a/server/channels/app/upload.go b/server/channels/app/upload.go index 74b6a83c50c..9b1858744b6 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" ) const minFirstPartSize = 5 * 1024 * 1024 // 5MB diff --git a/server/channels/app/upload_test.go b/server/channels/app/upload_test.go index 32a7b773b23..c1a19e11da2 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost/server/v8/channels/utils/imgutils" ) func TestCreateUploadSession(t *testing.T) { diff --git a/server/channels/app/usage.go b/server/channels/app/usage.go index 99bd9610be8..fb064c0eeab 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) // GetPostsUsage returns the total posts count rounded down to the most diff --git a/server/channels/app/usage_test.go b/server/channels/app/usage_test.go index 9a561d9711d..7bfb02e0953 100644 --- a/server/channels/app/usage_test.go +++ b/server/channels/app/usage_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestGetPostsUsage(t *testing.T) { diff --git a/server/channels/app/user.go b/server/channels/app/user.go index 4539d5f8d28..c464bde84ed 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/store" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/mfa" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/email" + "github.com/mattermost/mattermost/server/v8/channels/app/imaging" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/app/users" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/v8/platform/shared/mfa" ) const ( diff --git a/server/channels/app/user_terms_of_service.go b/server/channels/app/user_terms_of_service.go index 5945a832739..4909bf8cfcf 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 6dea889cb8f..6a50a9568a0 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/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/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/einterfaces/mocks" + "github.com/mattermost/mattermost/server/public/model" + oauthgitlab "github.com/mattermost/mattermost/server/v8/channels/app/oauthproviders/gitlab" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/app/users" + "github.com/mattermost/mattermost/server/v8/channels/store" + storemocks "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost/server/v8/einterfaces" + "github.com/mattermost/mattermost/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/public/plugin" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/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 64f9fd15a4e..acf0004f4d5 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) func TestRestrictedViewMembers(t *testing.T) { diff --git a/server/channels/app/users/helper_test.go b/server/channels/app/users/helper_test.go index 3d0803608a6..05f6ca4e691 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/config" ) var initBasicOnce sync.Once diff --git a/server/channels/app/users/main_test.go b/server/channels/app/users/main_test.go index 6d731849d81..66c7c70e035 100644 --- a/server/channels/app/users/main_test.go +++ b/server/channels/app/users/main_test.go @@ -7,7 +7,7 @@ import ( "flag" "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/app/users/password.go b/server/channels/app/users/password.go index f072714ee2d..e959ede2cc7 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/public/model" + "github.com/mattermost/mattermost/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 a5ea55f74e5..d0f78f082b0 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/public/model" + "github.com/mattermost/mattermost/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 642ff5ed99c..57d608f2a4d 100644 --- a/server/channels/app/users/profile_picture.go +++ b/server/channels/app/users/profile_picture.go @@ -19,9 +19,9 @@ 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/platform/shared/filestore" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) const ( diff --git a/server/channels/app/users/service.go b/server/channels/app/users/service.go index 6ea2c203870..46ffa0042ee 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/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/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 ee51e2d55a8..122097f861b 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/public/model" + "github.com/mattermost/mattermost/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 a24d5065621..1418ee251a0 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/platform/shared/mfa" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/platform/shared/mfa" "github.com/pkg/errors" ) diff --git a/server/channels/app/users/users_test.go b/server/channels/app/users/users_test.go index ad855b715ff..cdc5b5f66a6 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/public/model" + "github.com/mattermost/mattermost/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 4be9a140ac5..e708a606d70 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/public/model" + "github.com/mattermost/mattermost/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 b2fbf24fd75..40ba3251b56 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/platform" ) // 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 cde8d48b61f..3a60aa1e61f 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app/platform" ) func TestWebConnShouldSendEvent(t *testing.T) { diff --git a/server/channels/app/web_hub.go b/server/channels/app/web_hub.go index 0d0d95ebd96..1f16f81b63f 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/platform" ) func (a *App) TotalWebsocketConnections() int { diff --git a/server/channels/app/webhook.go b/server/channels/app/webhook.go index 2b1b0f7d0cf..9f98d22ca7f 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) const ( diff --git a/server/channels/app/webhook_test.go b/server/channels/app/webhook_test.go index ba141480e48..6632cfb9652 100644 --- a/server/channels/app/webhook_test.go +++ b/server/channels/app/webhook_test.go @@ -17,9 +17,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/testlib" - "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/platform/services/httpservice" ) func TestCreateIncomingWebhookForChannel(t *testing.T) { diff --git a/server/channels/app/webhub_fuzz.go b/server/channels/app/webhub_fuzz.go index a6ab061fc6b..c195f9abc73 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) // This is a file used to fuzz test the web_hub code. @@ -41,7 +41,7 @@ import ( // 1. go get -u github.com/dvyukov/go-fuzz/go-fuzz github.com/dvyukov/go-fuzz/go-fuzz-build // 2. mv app/helper_test.go app/helper.go // (Also reduce the number of push notification workers to 1 to debug stack traces easily.) -// 3. go-fuzz-build github.com/mattermost/mattermost-server/server/v8/channels/app +// 3. go-fuzz-build github.com/mattermost/mattermost/server/v8/channels/app // 4. Generate a corpus dir. It's just a directory with files containing random data // for go-fuzz to use as an initial seed. Use the generateInitialCorpus function for that. // 5. go-fuzz -bin=app-fuzz.zip -workdir=./workdir diff --git a/server/channels/app/websocket_router.go b/server/channels/app/websocket_router.go index 783faee8cde..218261132bc 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/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/public/model" +// "github.com/mattermost/mattermost/server/public/shared/i18n" +// "github.com/mattermost/mattermost/server/public/shared/mlog" // ) // type webSocketHandler interface { diff --git a/server/channels/audit/audit.go b/server/channels/audit/audit.go index bceebd1d762..95969a7840b 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) type Audit struct { diff --git a/server/channels/audit/audit_test.go b/server/channels/audit/audit_test.go index 02f5fc46daf..db48b12c099 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 fb043e6efce..42dc1675721 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) const schedFreq = 10 * time.Minute diff --git a/server/channels/jobs/active_users/worker.go b/server/channels/jobs/active_users/worker.go index 5d421e49a6d..08e235fdcd6 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/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/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/jobs" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) const ( diff --git a/server/channels/jobs/base_schedulers.go b/server/channels/jobs/base_schedulers.go index ef49da79780..881b840a2d5 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type PeriodicScheduler struct { diff --git a/server/channels/jobs/base_workers.go b/server/channels/jobs/base_workers.go index 850adc43819..c427a81ab27 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) type SimpleWorker struct { diff --git a/server/channels/jobs/expirynotify/scheduler.go b/server/channels/jobs/expirynotify/scheduler.go index 2b63fd0b082..d7e1c2c590c 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) const schedFreq = 10 * time.Minute diff --git a/server/channels/jobs/expirynotify/worker.go b/server/channels/jobs/expirynotify/worker.go index 32b0eb1e76c..c6b32679869 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) const ( diff --git a/server/channels/jobs/export_delete/scheduler.go b/server/channels/jobs/export_delete/scheduler.go index de0fc33a941..87469e90d78 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) const schedFreq = 24 * time.Hour diff --git a/server/channels/jobs/export_delete/worker.go b/server/channels/jobs/export_delete/worker.go index 0474c229aaa..d47b54b50c3 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/platform/services/configservice" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/jobs" + "github.com/mattermost/mattermost/server/v8/platform/services/configservice" ) const jobName = "ExportDelete" diff --git a/server/channels/jobs/export_process/worker.go b/server/channels/jobs/export_process/worker.go index b567e549cd8..ec7e6d603fc 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/platform/services/configservice" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/jobs" + "github.com/mattermost/mattermost/server/v8/platform/services/configservice" ) const jobName = "ExportProcess" diff --git a/server/channels/jobs/extract_content/worker.go b/server/channels/jobs/extract_content/worker.go index 42d33cd43f6..27ea2ef1f16 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/jobs" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 6765ad45296..5db6e7adf89 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) 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 f94506b1d5c..0fc15d37e8b 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) const ( diff --git a/server/channels/jobs/import_delete/scheduler.go b/server/channels/jobs/import_delete/scheduler.go index 9e5ac1b9bc9..2ef6ea9a889 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) const schedFreq = 24 * time.Hour diff --git a/server/channels/jobs/import_delete/worker.go b/server/channels/jobs/import_delete/worker.go index 8ef7d4abcc4..680a85a4c98 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/platform/services/configservice" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/jobs" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/platform/services/configservice" ) const jobName = "ImportDelete" diff --git a/server/channels/jobs/import_process/worker.go b/server/channels/jobs/import_process/worker.go index 1989bc82fc9..db07b4e5c55 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/platform/services/configservice" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/jobs" + "github.com/mattermost/mattermost/server/v8/platform/services/configservice" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) const jobName = "ImportProcess" diff --git a/server/channels/jobs/jobs.go b/server/channels/jobs/jobs.go index 88e3381994c..3715eb17139 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" ) const ( diff --git a/server/channels/jobs/jobs_test.go b/server/channels/jobs/jobs_test.go index 53b4a3484e5..a27208fb2fa 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/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/einterfaces/mocks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost/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 3bd8f11cef7..aea282ff83e 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 beb337b3e0b..8e2000e7a08 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) 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 dab886a6151..96616b952c6 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) const ( diff --git a/server/channels/jobs/last_accessible_post/scheduler.go b/server/channels/jobs/last_accessible_post/scheduler.go index 33bf878ecdc..e8192538879 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) 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 91e53f6d814..b4ee708bec8 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) const ( diff --git a/server/channels/jobs/migrations/advanced_permissions_phase_2.go b/server/channels/jobs/migrations/advanced_permissions_phase_2.go index 114a2f7933d..18ba4355c0c 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 4941e81263b..1cca9ae498c 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) func Setup(tb testing.TB) store.Store { diff --git a/server/channels/jobs/migrations/main_test.go b/server/channels/jobs/migrations/main_test.go index abc6339e8c7..385c9bd4577 100644 --- a/server/channels/jobs/migrations/main_test.go +++ b/server/channels/jobs/migrations/main_test.go @@ -6,7 +6,7 @@ package migrations import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/jobs/migrations/migrations.go b/server/channels/jobs/migrations/migrations.go index 98805d076e7..28124bff734 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) const ( diff --git a/server/channels/jobs/migrations/migrations_test.go b/server/channels/jobs/migrations/migrations_test.go index 86fef11ff4b..5b05c95b615 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/public/model" + "github.com/mattermost/mattermost/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 b17fab301a9..f8fb33d1a0c 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/jobs" + "github.com/mattermost/mattermost/server/v8/channels/store" ) const ( diff --git a/server/channels/jobs/migrations/worker.go b/server/channels/jobs/migrations/worker.go index d6bad9dd1fc..bcbdc6e83c4 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/jobs" + "github.com/mattermost/mattermost/server/v8/channels/store" ) const ( diff --git a/server/channels/jobs/notify_admin/install_plugin_scheduler.go b/server/channels/jobs/notify_admin/install_plugin_scheduler.go index 0e525ddf993..55c88bc89d5 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) const installPluginSchedFreq = 24 * time.Hour diff --git a/server/channels/jobs/notify_admin/scheduler.go b/server/channels/jobs/notify_admin/scheduler.go index e9064dde225..3642ae5cbdc 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) const schedFreq = 24 * time.Hour diff --git a/server/channels/jobs/notify_admin/worker.go b/server/channels/jobs/notify_admin/worker.go index fe498bbc35c..d73024e7a6c 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) const ( diff --git a/server/channels/jobs/plugins/scheduler.go b/server/channels/jobs/plugins/scheduler.go index a50836f7119..bb52cfb9882 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) const schedFreq = 24 * time.Hour diff --git a/server/channels/jobs/plugins/worker.go b/server/channels/jobs/plugins/worker.go index 1df0339fb9f..96fb46ef22b 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) type AppIface interface { diff --git a/server/channels/jobs/post_persistent_notifications/scheduler.go b/server/channels/jobs/post_persistent_notifications/scheduler.go index 42d90797feb..0458a3e5e2c 100644 --- a/server/channels/jobs/post_persistent_notifications/scheduler.go +++ b/server/channels/jobs/post_persistent_notifications/scheduler.go @@ -6,8 +6,8 @@ package post_persistent_notifications import ( "time" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) type Scheduler struct { diff --git a/server/channels/jobs/post_persistent_notifications/worker.go b/server/channels/jobs/post_persistent_notifications/worker.go index 0723edb80b1..ca84b0f07a6 100644 --- a/server/channels/jobs/post_persistent_notifications/worker.go +++ b/server/channels/jobs/post_persistent_notifications/worker.go @@ -4,8 +4,8 @@ package post_persistent_notifications import ( - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) const ( diff --git a/server/channels/jobs/product_notices/scheduler.go b/server/channels/jobs/product_notices/scheduler.go index 06f35f96306..55e0324551d 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) type Scheduler struct { diff --git a/server/channels/jobs/product_notices/worker.go b/server/channels/jobs/product_notices/worker.go index 2923a70f3d1..af1ae15a70d 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/jobs" ) const jobName = "ProductNotices" diff --git a/server/channels/jobs/resend_invitation_email/worker.go b/server/channels/jobs/resend_invitation_email/worker.go index 162473d5bf5..7946ea955a5 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/platform/services/configservice" - "github.com/mattermost/mattermost-server/server/v8/platform/services/telemetry" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/jobs" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/platform/services/configservice" + "github.com/mattermost/mattermost/server/v8/platform/services/telemetry" ) const FourtyEightHoursInMillis int64 = 172800000 diff --git a/server/channels/jobs/schedulers.go b/server/channels/jobs/schedulers.go index fe8932dfa76..ce718a0a612 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) type Schedulers struct { diff --git a/server/channels/jobs/schedulers_test.go b/server/channels/jobs/schedulers_test.go index 6cfecfb414b..09356829374 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" ) type MockScheduler struct { diff --git a/server/channels/jobs/server.go b/server/channels/jobs/server.go index 2dcaf515f21..1f80cc5038c 100644 --- a/server/channels/jobs/server.go +++ b/server/channels/jobs/server.go @@ -7,10 +7,10 @@ import ( "sync" "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/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/platform/services/configservice" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/v8/platform/services/configservice" ) type JobServer struct { diff --git a/server/channels/jobs/workers.go b/server/channels/jobs/workers.go index 7e06449495a..a945fd091d9 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/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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/platform/services/configservice" ) type Workers struct { diff --git a/server/channels/manualtesting/manual_testing.go b/server/channels/manualtesting/manual_testing.go index dd3c748983f..9c2a7f562f6 100644 --- a/server/channels/manualtesting/manual_testing.go +++ b/server/channels/manualtesting/manual_testing.go @@ -13,14 +13,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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/api4" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/slashcommands" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/channels/web" ) // 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 97988758b95..969f432f5e6 100644 --- a/server/channels/manualtesting/test_autolink.go +++ b/server/channels/manualtesting/test_autolink.go @@ -8,8 +8,8 @@ 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const linkPostText = ` diff --git a/server/channels/product/api.go b/server/channels/product/api.go index 4a2a98912b1..4334d6ba284 100644 --- a/server/channels/product/api.go +++ b/server/channels/product/api.go @@ -8,12 +8,12 @@ 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/platform/shared/filestore" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" - fb_model "github.com/mattermost/mattermost-server/server/v8/boards/model" + fb_model "github.com/mattermost/mattermost/server/v8/boards/model" ) // RouterService enables registering the product router to the server. After registering the diff --git a/server/channels/product/hooks.go b/server/channels/product/hooks.go index 53c3f23d89b..f0e82c1b875 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/public/plugin" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/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 ed3ca3f73be..e744f116b86 100644 --- a/server/channels/store/layer_generators/opentracing_layer.go.tmpl +++ b/server/channels/store/layer_generators/opentracing_layer.go.tmpl @@ -10,9 +10,9 @@ import ( "context" "time" - "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/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/platform/services/tracing" + "github.com/mattermost/mattermost/server/v8/channels/store" "github.com/opentracing/opentracing-go/ext" spanlog "github.com/opentracing/opentracing-go/log" ) diff --git a/server/channels/store/layer_generators/retry_layer.go.tmpl b/server/channels/store/layer_generators/retry_layer.go.tmpl index 680d9098936..4a0872dcb5f 100644 --- a/server/channels/store/layer_generators/retry_layer.go.tmpl +++ b/server/channels/store/layer_generators/retry_layer.go.tmpl @@ -12,8 +12,8 @@ import ( "time" "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/public/model" + "github.com/mattermost/mattermost/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 cf6f0d9a350..daef4c61da5 100644 --- a/server/channels/store/layer_generators/timer_layer.go.tmpl +++ b/server/channels/store/layer_generators/timer_layer.go.tmpl @@ -10,9 +10,9 @@ import ( "context" "time" - "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" + "github.com/mattermost/mattermost/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type {{.Name}} struct { diff --git a/server/channels/store/localcachelayer/channel_layer.go b/server/channels/store/localcachelayer/channel_layer.go index 05fda221c18..41501de9b8c 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type LocalCacheChannelStore struct { diff --git a/server/channels/store/localcachelayer/channel_layer_test.go b/server/channels/store/localcachelayer/channel_layer_test.go index 3a000f25f9f..b3efa39e6f2 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestChannelStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/emoji_layer.go b/server/channels/store/localcachelayer/emoji_layer.go index 2ca9581a87a..93039de03cb 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" ) type LocalCacheEmojiStore struct { diff --git a/server/channels/store/localcachelayer/emoji_layer_test.go b/server/channels/store/localcachelayer/emoji_layer_test.go index a4d4d3b4e84..3c1e7cb0add 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) 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 474741cd89a..9728677236a 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 1d04e0aacdd..a298d0b0a30 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestFileInfoStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/layer.go b/server/channels/store/localcachelayer/layer.go index 326320563ea..412c28b1817 100644 --- a/server/channels/store/localcachelayer/layer.go +++ b/server/channels/store/localcachelayer/layer.go @@ -7,10 +7,10 @@ import ( "runtime" "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/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/v8/platform/services/cache" ) const ( diff --git a/server/channels/store/localcachelayer/layer_test.go b/server/channels/store/localcachelayer/layer_test.go index 3518905f316..040f915d24a 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) type storeType struct { diff --git a/server/channels/store/localcachelayer/main_test.go b/server/channels/store/localcachelayer/main_test.go index 618bd48d6a7..787dd1d594a 100644 --- a/server/channels/store/localcachelayer/main_test.go +++ b/server/channels/store/localcachelayer/main_test.go @@ -10,13 +10,13 @@ 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/platform/services/cache" - cachemocks "github.com/mattermost/mattermost-server/server/v8/platform/services/cache/mocks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/platform/services/cache" + cachemocks "github.com/mattermost/mattermost/server/v8/platform/services/cache/mocks" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/store/localcachelayer/post_layer.go b/server/channels/store/localcachelayer/post_layer.go index dfd921c0a63..621515f21f3 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type LocalCachePostStore struct { diff --git a/server/channels/store/localcachelayer/post_layer_test.go b/server/channels/store/localcachelayer/post_layer_test.go index d1304a9eea3..213b4c8541f 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestPostStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/reaction_layer.go b/server/channels/store/localcachelayer/reaction_layer.go index b8d1a2f4619..0e25033a8f5 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type LocalCacheReactionStore struct { diff --git a/server/channels/store/localcachelayer/reaction_layer_test.go b/server/channels/store/localcachelayer/reaction_layer_test.go index f7b099e866c..bddf67040a0 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestReactionStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/role_layer.go b/server/channels/store/localcachelayer/role_layer.go index 6062bd7489a..5a21fb70aa1 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type LocalCacheRoleStore struct { diff --git a/server/channels/store/localcachelayer/role_layer_test.go b/server/channels/store/localcachelayer/role_layer_test.go index 148d8a65e65..e5053fac777 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestRoleStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/scheme_layer.go b/server/channels/store/localcachelayer/scheme_layer.go index 58ccc2a0f5b..2bb5c5d171b 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type LocalCacheSchemeStore struct { diff --git a/server/channels/store/localcachelayer/scheme_layer_test.go b/server/channels/store/localcachelayer/scheme_layer_test.go index 7c71e3ab6a2..98b520d7eca 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestSchemeStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/team_layer.go b/server/channels/store/localcachelayer/team_layer.go index 90c98b081bd..6588ca6467e 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type LocalCacheTeamStore struct { diff --git a/server/channels/store/localcachelayer/team_layer_test.go b/server/channels/store/localcachelayer/team_layer_test.go index 2a32f2fdd6d..1bba1c7c26b 100644 --- a/server/channels/store/localcachelayer/team_layer_test.go +++ b/server/channels/store/localcachelayer/team_layer_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestTeamStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/terms_of_service_layer.go b/server/channels/store/localcachelayer/terms_of_service_layer.go index 76b84323beb..2244dc9be29 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 46d717d87e8..a6e5ad12336 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestTermsOfServiceStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/user_layer.go b/server/channels/store/localcachelayer/user_layer.go index e003ee9b075..9aa7f61b9cf 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" ) type LocalCacheUserStore struct { diff --git a/server/channels/store/localcachelayer/user_layer_test.go b/server/channels/store/localcachelayer/user_layer_test.go index b7e2b602c9d..19e74641295 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestUserStore(t *testing.T) { diff --git a/server/channels/store/localcachelayer/webhook_layer.go b/server/channels/store/localcachelayer/webhook_layer.go index 4f682dbe0be..124b5308c04 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type LocalCacheWebhookStore struct { diff --git a/server/channels/store/localcachelayer/webhook_layer_test.go b/server/channels/store/localcachelayer/webhook_layer_test.go index 6c796500f83..608d4754fed 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestWebhookStore(t *testing.T) { diff --git a/server/channels/store/opentracinglayer/opentracinglayer.go b/server/channels/store/opentracinglayer/opentracinglayer.go index c112573ec16..a2e911d5f68 100644 --- a/server/channels/store/opentracinglayer/opentracinglayer.go +++ b/server/channels/store/opentracinglayer/opentracinglayer.go @@ -10,9 +10,9 @@ 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/platform/services/tracing" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/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 09d2d42d4c2..e39ff6dc79b 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" "github.com/pkg/errors" ) diff --git a/server/channels/store/retrylayer/retrylayer_test.go b/server/channels/store/retrylayer/retrylayer_test.go index 21b7459d8ce..5489f2fd036 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func genStore() *mocks.Store { diff --git a/server/channels/store/searchlayer/channel_layer.go b/server/channels/store/searchlayer/channel_layer.go index 0e894649e43..3078371e584 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/platform/services/searchengine" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine" ) type SearchChannelStore struct { diff --git a/server/channels/store/searchlayer/file_info_layer.go b/server/channels/store/searchlayer/file_info_layer.go index 68a42f605c9..0cc417a18b1 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/platform/services/searchengine" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine" ) type SearchFileInfoStore struct { diff --git a/server/channels/store/searchlayer/layer.go b/server/channels/store/searchlayer/layer.go index 239403f62cf..950459fdbe1 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/platform/services/searchengine" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine" ) type SearchStore struct { diff --git a/server/channels/store/searchlayer/layer_test.go b/server/channels/store/searchlayer/layer_test.go index 512adeb7888..ac4fd3737f2 100644 --- a/server/channels/store/searchlayer/layer_test.go +++ b/server/channels/store/searchlayer/layer_test.go @@ -8,12 +8,12 @@ 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/platform/services/searchengine" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/searchlayer" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine" ) // Test to verify race condition on UpdateConfig. The test must run with -race flag in order to verify diff --git a/server/channels/store/searchlayer/post_layer.go b/server/channels/store/searchlayer/post_layer.go index 7035d50bc98..f5bec29669a 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/platform/services/searchengine" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine" ) type SearchPostStore struct { diff --git a/server/channels/store/searchlayer/team_layer.go b/server/channels/store/searchlayer/team_layer.go index a5f70eb36bb..412e4756079 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/public/model" + store "github.com/mattermost/mattermost/server/v8/channels/store" ) type SearchTeamStore struct { diff --git a/server/channels/store/searchlayer/user_layer.go b/server/channels/store/searchlayer/user_layer.go index c28a6bb1a4e..2534b05af34 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/platform/services/searchengine" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine" ) type SearchUserStore struct { diff --git a/server/channels/store/searchtest/channel_layer.go b/server/channels/store/searchtest/channel_layer.go index 8eca86d12e9..60fc8d3dcc7 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) var searchChannelStoreTests = []searchTest{ diff --git a/server/channels/store/searchtest/file_info_layer.go b/server/channels/store/searchtest/file_info_layer.go index 47e770374d7..fef24a0655a 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) var searchFileInfoStoreTests = []searchTest{ diff --git a/server/channels/store/searchtest/helper.go b/server/channels/store/searchtest/helper.go index 3050aead5b4..4340fce70f6 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SearchTestHelper struct { diff --git a/server/channels/store/searchtest/post_layer.go b/server/channels/store/searchtest/post_layer.go index c0e95c69f87..59129b770f7 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) var searchPostStoreTests = []searchTest{ diff --git a/server/channels/store/searchtest/testlib.go b/server/channels/store/searchtest/testlib.go index 470caa31132..3a6c257bbac 100644 --- a/server/channels/store/searchtest/testlib.go +++ b/server/channels/store/searchtest/testlib.go @@ -6,8 +6,8 @@ package searchtest import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) const ( diff --git a/server/channels/store/searchtest/user_layer.go b/server/channels/store/searchtest/user_layer.go index a66cf85028e..b035f021f33 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) var searchUserStoreTests = []searchTest{ diff --git a/server/channels/store/sqlstore/adapters.go b/server/channels/store/sqlstore/adapters.go index 9875a27d2c8..8a82f8a329b 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/public/shared/mlog" + "github.com/mattermost/mattermost/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 c56ee8b69e9..941e9b4e606 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SqlAuditStore struct { diff --git a/server/channels/store/sqlstore/audit_store_test.go b/server/channels/store/sqlstore/audit_store_test.go index 42051657172..f7b07d363ad 100644 --- a/server/channels/store/sqlstore/audit_store_test.go +++ b/server/channels/store/sqlstore/audit_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestAuditStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/bot_store.go b/server/channels/store/sqlstore/bot_store.go index 1f4f88d8a4d..4564977f700 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/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) // bot is a subset of the model.Bot type, omitting the model.User fields. diff --git a/server/channels/store/sqlstore/bot_store_test.go b/server/channels/store/sqlstore/bot_store_test.go index 725fc814f6f..f39a00048be 100644 --- a/server/channels/store/sqlstore/bot_store_test.go +++ b/server/channels/store/sqlstore/bot_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestBotStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/channel_member_history_store.go b/server/channels/store/sqlstore/channel_member_history_store.go index 8851fa20907..ee98cb0b0ff 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SqlChannelMemberHistoryStore struct { diff --git a/server/channels/store/sqlstore/channel_member_history_store_test.go b/server/channels/store/sqlstore/channel_member_history_store_test.go index 645faf5f914..df4002ab103 100644 --- a/server/channels/store/sqlstore/channel_member_history_store_test.go +++ b/server/channels/store/sqlstore/channel_member_history_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestChannelMemberHistoryStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/channel_store.go b/server/channels/store/sqlstore/channel_store.go index d8b05c976bd..79aecc0f02e 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/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/einterfaces" - "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/v8/platform/services/cache" ) const ( diff --git a/server/channels/store/sqlstore/channel_store_categories.go b/server/channels/store/sqlstore/channel_store_categories.go index b75e2099ddd..21aba6ed101 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) // dbSelecter is an interface used to enable some internal store methods diff --git a/server/channels/store/sqlstore/channel_store_categories_test.go b/server/channels/store/sqlstore/channel_store_categories_test.go index 1514b1ac98a..73ba6a1fc76 100644 --- a/server/channels/store/sqlstore/channel_store_categories_test.go +++ b/server/channels/store/sqlstore/channel_store_categories_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestChannelStoreCategories(t *testing.T) { diff --git a/server/channels/store/sqlstore/channel_store_test.go b/server/channels/store/sqlstore/channel_store_test.go index efcf02ee224..ae32bf83625 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/searchtest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) 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 f8a4195e482..c1f50e74f92 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type sqlClusterDiscoveryStore struct { diff --git a/server/channels/store/sqlstore/cluster_discovery_store_test.go b/server/channels/store/sqlstore/cluster_discovery_store_test.go index b17cc39ba6b..79b94628656 100644 --- a/server/channels/store/sqlstore/cluster_discovery_store_test.go +++ b/server/channels/store/sqlstore/cluster_discovery_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestClusterDiscoveryStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/command_store.go b/server/channels/store/sqlstore/command_store.go index bb9ae5b1cf9..2245815f0a1 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SqlCommandStore struct { diff --git a/server/channels/store/sqlstore/command_store_test.go b/server/channels/store/sqlstore/command_store_test.go index 7d735611930..e3e7e0b1a91 100644 --- a/server/channels/store/sqlstore/command_store_test.go +++ b/server/channels/store/sqlstore/command_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestCommandStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/command_webhook_store.go b/server/channels/store/sqlstore/command_webhook_store.go index d9bc6219e3d..e485d51594e 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SqlCommandWebhookStore struct { diff --git a/server/channels/store/sqlstore/command_webhook_store_test.go b/server/channels/store/sqlstore/command_webhook_store_test.go index 9e36d26e59a..07d41eba7a2 100644 --- a/server/channels/store/sqlstore/command_webhook_store_test.go +++ b/server/channels/store/sqlstore/command_webhook_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestCommandWebhookStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/compliance_store.go b/server/channels/store/sqlstore/compliance_store.go index 8f66e7cea36..356fd3bfc42 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SqlComplianceStore struct { diff --git a/server/channels/store/sqlstore/compliance_store_test.go b/server/channels/store/sqlstore/compliance_store_test.go index 9e6df0304eb..adea96c5e95 100644 --- a/server/channels/store/sqlstore/compliance_store_test.go +++ b/server/channels/store/sqlstore/compliance_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestComplianceStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/draft_store.go b/server/channels/store/sqlstore/draft_store.go index 70314869167..0996b60b898 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/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/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) type SqlDraftStore struct { diff --git a/server/channels/store/sqlstore/draft_store_test.go b/server/channels/store/sqlstore/draft_store_test.go index f767026621a..fc70a6a1b3f 100644 --- a/server/channels/store/sqlstore/draft_store_test.go +++ b/server/channels/store/sqlstore/draft_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestDraftStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/emoji_store.go b/server/channels/store/sqlstore/emoji_store.go index 11c7dd55722..9500749770c 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/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) type SqlEmojiStore struct { diff --git a/server/channels/store/sqlstore/emoji_store_test.go b/server/channels/store/sqlstore/emoji_store_test.go index a0e5ec46dcb..4c43991d880 100644 --- a/server/channels/store/sqlstore/emoji_store_test.go +++ b/server/channels/store/sqlstore/emoji_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestEmojiStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/file_info_store.go b/server/channels/store/sqlstore/file_info_store.go index 2a90fab52d2..801e235a85b 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/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/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) type fileInfoWithChannelID struct { diff --git a/server/channels/store/sqlstore/file_info_store_test.go b/server/channels/store/sqlstore/file_info_store_test.go index 53f67be47cc..d7916e18637 100644 --- a/server/channels/store/sqlstore/file_info_store_test.go +++ b/server/channels/store/sqlstore/file_info_store_test.go @@ -6,8 +6,8 @@ package sqlstore import ( "testing" - "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/v8/channels/store/searchtest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestFileInfoStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/group_store.go b/server/channels/store/sqlstore/group_store.go index b0415cbdda9..0d5d0cbbec5 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type selectType int diff --git a/server/channels/store/sqlstore/group_store_test.go b/server/channels/store/sqlstore/group_store_test.go index e03ab780afe..a473ea8165d 100644 --- a/server/channels/store/sqlstore/group_store_test.go +++ b/server/channels/store/sqlstore/group_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestGroupStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/integrity.go b/server/channels/store/sqlstore/integrity.go index 965adab0122..8baf37433c8 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 e0b24c073d1..a10c8ddaa46 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 ac7eecc3fe1..1afb340bfbd 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) const ( diff --git a/server/channels/store/sqlstore/job_store_test.go b/server/channels/store/sqlstore/job_store_test.go index a7028984df7..52dca0dcda4 100644 --- a/server/channels/store/sqlstore/job_store_test.go +++ b/server/channels/store/sqlstore/job_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestJobStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/license_store.go b/server/channels/store/sqlstore/license_store.go index 88c97154d30..545518224bc 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) // SqlLicenseStore encapsulates the database writes and reads for diff --git a/server/channels/store/sqlstore/license_store_test.go b/server/channels/store/sqlstore/license_store_test.go index 9b9f2aaf710..1ce38f48860 100644 --- a/server/channels/store/sqlstore/license_store_test.go +++ b/server/channels/store/sqlstore/license_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestLicenseStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/link_metadata_store.go b/server/channels/store/sqlstore/link_metadata_store.go index b6f22d1ed38..dcb0f57e3ac 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SqlLinkMetadataStore struct { diff --git a/server/channels/store/sqlstore/link_metadata_store_test.go b/server/channels/store/sqlstore/link_metadata_store_test.go index f5c4dc4fc4e..954e1704cbc 100644 --- a/server/channels/store/sqlstore/link_metadata_store_test.go +++ b/server/channels/store/sqlstore/link_metadata_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestLinkMetadataStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/main_test.go b/server/channels/store/sqlstore/main_test.go index fede40f23b9..9bf6f91d38e 100644 --- a/server/channels/store/sqlstore/main_test.go +++ b/server/channels/store/sqlstore/main_test.go @@ -6,8 +6,8 @@ package sqlstore_test import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/sqlstore" - "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/store/sqlstore/notify_admin_store.go b/server/channels/store/sqlstore/notify_admin_store.go index 2e246dd376c..959d123b335 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SqlNotifyAdminStore struct { diff --git a/server/channels/store/sqlstore/notify_admin_store_test.go b/server/channels/store/sqlstore/notify_admin_store_test.go index 5737f3d030c..f13d8f57c0d 100644 --- a/server/channels/store/sqlstore/notify_admin_store_test.go +++ b/server/channels/store/sqlstore/notify_admin_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestNotifyAdminStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/oauth_store.go b/server/channels/store/sqlstore/oauth_store.go index 7f88783667b..c0eae5aaddb 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SqlOAuthStore struct { diff --git a/server/channels/store/sqlstore/oauth_store_test.go b/server/channels/store/sqlstore/oauth_store_test.go index d7b528514ab..f32eab32bc9 100644 --- a/server/channels/store/sqlstore/oauth_store_test.go +++ b/server/channels/store/sqlstore/oauth_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestOAuthStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/plugin_store.go b/server/channels/store/sqlstore/plugin_store.go index d76efd334a5..a7f5ad61c1a 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) const ( diff --git a/server/channels/store/sqlstore/plugin_store_test.go b/server/channels/store/sqlstore/plugin_store_test.go index cc5d9a38845..441c0ac2afd 100644 --- a/server/channels/store/sqlstore/plugin_store_test.go +++ b/server/channels/store/sqlstore/plugin_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestPluginStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/post_acknowledgements_store.go b/server/channels/store/sqlstore/post_acknowledgements_store.go index b7d9646004d..79703178ba2 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SqlPostAcknowledgementStore struct { diff --git a/server/channels/store/sqlstore/post_acknowledgements_store_test.go b/server/channels/store/sqlstore/post_acknowledgements_store_test.go index 55a80af132d..c2fa5ddb797 100644 --- a/server/channels/store/sqlstore/post_acknowledgements_store_test.go +++ b/server/channels/store/sqlstore/post_acknowledgements_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestPostAcknowledgementsStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/post_persistent_notification_store.go b/server/channels/store/sqlstore/post_persistent_notification_store.go index e8225986439..fb43eefc24d 100644 --- a/server/channels/store/sqlstore/post_persistent_notification_store.go +++ b/server/channels/store/sqlstore/post_persistent_notification_store.go @@ -6,8 +6,8 @@ package sqlstore import ( "database/sql" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/store" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" sq "github.com/mattermost/squirrel" "github.com/pkg/errors" ) diff --git a/server/channels/store/sqlstore/post_persistent_notification_store_test.go b/server/channels/store/sqlstore/post_persistent_notification_store_test.go index 9c655560dcb..867f4f294b3 100644 --- a/server/channels/store/sqlstore/post_persistent_notification_store_test.go +++ b/server/channels/store/sqlstore/post_persistent_notification_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestPostPersistentNotificationStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/post_priority_store.go b/server/channels/store/sqlstore/post_priority_store.go index 50bf8e236a6..507a8001873 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SqlPostPriorityStore struct { diff --git a/server/channels/store/sqlstore/post_priority_store_test.go b/server/channels/store/sqlstore/post_priority_store_test.go index 093394f3e7f..c1f66f80dc6 100644 --- a/server/channels/store/sqlstore/post_priority_store_test.go +++ b/server/channels/store/sqlstore/post_priority_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestPostPriorityStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/post_store.go b/server/channels/store/sqlstore/post_store.go index 59d7d7ac3df..c470ba8a8d6 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/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/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/searchlayer" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) type SqlPostStore struct { diff --git a/server/channels/store/sqlstore/post_store_test.go b/server/channels/store/sqlstore/post_store_test.go index 72fdc510430..c3334b5ec08 100644 --- a/server/channels/store/sqlstore/post_store_test.go +++ b/server/channels/store/sqlstore/post_store_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "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/v8/channels/store/searchtest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestPostStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/preference_store.go b/server/channels/store/sqlstore/preference_store.go index 8be241ac975..78fe05726c0 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SqlPreferenceStore struct { diff --git a/server/channels/store/sqlstore/preference_store_test.go b/server/channels/store/sqlstore/preference_store_test.go index 1eba7430c8b..98c4ed96e09 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) 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 3f84a0660d4..ef01aefeaf0 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SqlProductNoticesStore struct { diff --git a/server/channels/store/sqlstore/product_notices_store_test.go b/server/channels/store/sqlstore/product_notices_store_test.go index f30f7e15a29..171ef69842e 100644 --- a/server/channels/store/sqlstore/product_notices_store_test.go +++ b/server/channels/store/sqlstore/product_notices_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestProductNoticesStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/reaction_store.go b/server/channels/store/sqlstore/reaction_store.go index 826c61f4b7b..cefa57f71d4 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" "github.com/pkg/errors" ) diff --git a/server/channels/store/sqlstore/reaction_store_test.go b/server/channels/store/sqlstore/reaction_store_test.go index e9ceb95df43..3a2ddd10056 100644 --- a/server/channels/store/sqlstore/reaction_store_test.go +++ b/server/channels/store/sqlstore/reaction_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestReactionStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/remote_cluster_store.go b/server/channels/store/sqlstore/remote_cluster_store.go index 5c3ae258d8e..a9ce36aed9a 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type sqlRemoteClusterStore struct { diff --git a/server/channels/store/sqlstore/remote_cluster_store_test.go b/server/channels/store/sqlstore/remote_cluster_store_test.go index 097343c42e3..000ada31ae7 100644 --- a/server/channels/store/sqlstore/remote_cluster_store_test.go +++ b/server/channels/store/sqlstore/remote_cluster_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestRemoteClusterStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/retention_policy_store.go b/server/channels/store/sqlstore/retention_policy_store.go index bb68cd2d40f..4ddc4a79def 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/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) type SqlRetentionPolicyStore struct { diff --git a/server/channels/store/sqlstore/retention_policy_store_test.go b/server/channels/store/sqlstore/retention_policy_store_test.go index 5ea674a5abf..53de26ff20e 100644 --- a/server/channels/store/sqlstore/retention_policy_store_test.go +++ b/server/channels/store/sqlstore/retention_policy_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestRetentionPolicyStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/role_store.go b/server/channels/store/sqlstore/role_store.go index f73a30aa65d..327c2e65b7f 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SqlRoleStore struct { diff --git a/server/channels/store/sqlstore/role_store_test.go b/server/channels/store/sqlstore/role_store_test.go index c96bcb7dc19..cbbe8e6e270 100644 --- a/server/channels/store/sqlstore/role_store_test.go +++ b/server/channels/store/sqlstore/role_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestRoleStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/scheme_store.go b/server/channels/store/sqlstore/scheme_store.go index 00be81f1842..5800d76d5a0 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) const ( diff --git a/server/channels/store/sqlstore/scheme_store_test.go b/server/channels/store/sqlstore/scheme_store_test.go index cef93521934..8bd5d8fc46b 100644 --- a/server/channels/store/sqlstore/scheme_store_test.go +++ b/server/channels/store/sqlstore/scheme_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestSchemeStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/session_store.go b/server/channels/store/sqlstore/session_store.go index 35301e92732..be99f1282fd 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) const ( diff --git a/server/channels/store/sqlstore/session_store_test.go b/server/channels/store/sqlstore/session_store_test.go index 52d94b98f36..acae901a70b 100644 --- a/server/channels/store/sqlstore/session_store_test.go +++ b/server/channels/store/sqlstore/session_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestSessionStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/shared_channel_store.go b/server/channels/store/sqlstore/shared_channel_store.go index 27545a73eec..a374460efdc 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" sq "github.com/mattermost/squirrel" "github.com/pkg/errors" diff --git a/server/channels/store/sqlstore/shared_channel_store_test.go b/server/channels/store/sqlstore/shared_channel_store_test.go index 1133184659f..f5aea6de6d8 100644 --- a/server/channels/store/sqlstore/shared_channel_store_test.go +++ b/server/channels/store/sqlstore/shared_channel_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestSharedChannelStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/sqlx_wrapper.go b/server/channels/store/sqlstore/sqlx_wrapper.go index 8a6d9f65cdb..701705a6d07 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) type StoreTestWrapper struct { diff --git a/server/channels/store/sqlstore/sqlx_wrapper_test.go b/server/channels/store/sqlstore/sqlx_wrapper_test.go index 388c23421c9..91751007770 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/public/model" + "github.com/mattermost/mattermost/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 b8300ee1b5f..590e5e92ee2 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SqlStatusStore struct { diff --git a/server/channels/store/sqlstore/status_store_test.go b/server/channels/store/sqlstore/status_store_test.go index a40b93c9a61..a6f1d9a454f 100644 --- a/server/channels/store/sqlstore/status_store_test.go +++ b/server/channels/store/sqlstore/status_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestStatusStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/store.go b/server/channels/store/sqlstore/store.go index a8a97b0d824..e5cd249f153 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/store" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/db" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) type migrationDirection string @@ -118,7 +118,7 @@ type SqlStoreStores struct { type SqlStore struct { // rrCounter and srCounter should be kept first. - // See https://github.com/mattermost/mattermost-server/server/v8/channels/pull/7281 + // See https://github.com/mattermost/mattermost/server/v8/channels/pull/7281 rrCounter int64 srCounter int64 diff --git a/server/channels/store/sqlstore/store_test.go b/server/channels/store/sqlstore/store_test.go index 5f2ce542d88..e591a6a144e 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/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/einterfaces/mocks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/v8/channels/db" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/searchtest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/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 8cfe2195301..14af66ec9a8 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) type SqlSystemStore struct { diff --git a/server/channels/store/sqlstore/system_store_test.go b/server/channels/store/sqlstore/system_store_test.go index 8ac69416ea1..6a817c4f462 100644 --- a/server/channels/store/sqlstore/system_store_test.go +++ b/server/channels/store/sqlstore/system_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestSystemStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/team_store.go b/server/channels/store/sqlstore/team_store.go index 92e75391430..2b5e7f49678 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) const ( diff --git a/server/channels/store/sqlstore/team_store_test.go b/server/channels/store/sqlstore/team_store_test.go index 4167e136d38..ded07d850a0 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) 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 0fc1f4c070d..d47ffefe9e4 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/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) type SqlTermsOfServiceStore struct { diff --git a/server/channels/store/sqlstore/terms_of_service_store_test.go b/server/channels/store/sqlstore/terms_of_service_store_test.go index a9b209adf88..4772f786198 100644 --- a/server/channels/store/sqlstore/terms_of_service_store_test.go +++ b/server/channels/store/sqlstore/terms_of_service_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestTermsOfServiceStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/thread_store.go b/server/channels/store/sqlstore/thread_store.go index 7ca6b6fe42d..4ba954252ec 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) // JoinedThread allows querying the Threads + Posts table in a single query, before looking up diff --git a/server/channels/store/sqlstore/thread_store_test.go b/server/channels/store/sqlstore/thread_store_test.go index ded1cdc88c1..3a388ce094b 100644 --- a/server/channels/store/sqlstore/thread_store_test.go +++ b/server/channels/store/sqlstore/thread_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestThreadStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/tokens_store.go b/server/channels/store/sqlstore/tokens_store.go index 5720321f0cb..988025f6dd0 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SqlTokenStore struct { diff --git a/server/channels/store/sqlstore/tokens_store_test.go b/server/channels/store/sqlstore/tokens_store_test.go index b8a35a94157..4c6ae891960 100644 --- a/server/channels/store/sqlstore/tokens_store_test.go +++ b/server/channels/store/sqlstore/tokens_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestTokensStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/true_up_review_store.go b/server/channels/store/sqlstore/true_up_review_store.go index 484d8c35382..4c5a0a3c572 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) // SqlLicenseStore encapsulates the database writes and reads for diff --git a/server/channels/store/sqlstore/true_up_review_store_test.go b/server/channels/store/sqlstore/true_up_review_store_test.go index 2f824b20cfc..115ae91498f 100644 --- a/server/channels/store/sqlstore/true_up_review_store_test.go +++ b/server/channels/store/sqlstore/true_up_review_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestTrueUpReviewStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/upload_session_store.go b/server/channels/store/sqlstore/upload_session_store.go index f0aadd5dddb..0c9e643861b 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SqlUploadSessionStore struct { diff --git a/server/channels/store/sqlstore/upload_session_store_test.go b/server/channels/store/sqlstore/upload_session_store_test.go index 2db3de136c0..38facf7ef99 100644 --- a/server/channels/store/sqlstore/upload_session_store_test.go +++ b/server/channels/store/sqlstore/upload_session_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestUploadSessionStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/user_access_token_store.go b/server/channels/store/sqlstore/user_access_token_store.go index 132e43e5a73..2e31def814f 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SqlUserAccessTokenStore struct { diff --git a/server/channels/store/sqlstore/user_access_token_store_test.go b/server/channels/store/sqlstore/user_access_token_store_test.go index 61ad42c4295..425732589b2 100644 --- a/server/channels/store/sqlstore/user_access_token_store_test.go +++ b/server/channels/store/sqlstore/user_access_token_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestUserAccessTokenStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/user_store.go b/server/channels/store/sqlstore/user_store.go index 94e2a434cd6..167da125941 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/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/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) const ( diff --git a/server/channels/store/sqlstore/user_store_test.go b/server/channels/store/sqlstore/user_store_test.go index 56076ab1e51..338722ad9c2 100644 --- a/server/channels/store/sqlstore/user_store_test.go +++ b/server/channels/store/sqlstore/user_store_test.go @@ -6,8 +6,8 @@ package sqlstore import ( "testing" - "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/v8/channels/store/searchtest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestUserStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/user_terms_of_service.go b/server/channels/store/sqlstore/user_terms_of_service.go index 30bf0e4f920..8226f253c6b 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type SqlUserTermsOfServiceStore struct { diff --git a/server/channels/store/sqlstore/user_terms_of_service_store_test.go b/server/channels/store/sqlstore/user_terms_of_service_store_test.go index d14a74eead5..cc30e833158 100644 --- a/server/channels/store/sqlstore/user_terms_of_service_store_test.go +++ b/server/channels/store/sqlstore/user_terms_of_service_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestUserTermsOfServiceStore(t *testing.T) { diff --git a/server/channels/store/sqlstore/utils.go b/server/channels/store/sqlstore/utils.go index 5dd83bad99b..24db76dbdc6 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 109f27dc35f..d110803841f 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/public/model" + "github.com/mattermost/mattermost/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 39debbd92cf..e912b440cb2 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/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) type SqlWebhookStore struct { diff --git a/server/channels/store/sqlstore/webhook_store_test.go b/server/channels/store/sqlstore/webhook_store_test.go index e03720dd63e..261643d3818 100644 --- a/server/channels/store/sqlstore/webhook_store_test.go +++ b/server/channels/store/sqlstore/webhook_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" ) func TestWebhookStore(t *testing.T) { diff --git a/server/channels/store/store.go b/server/channels/store/store.go index cfed05ce2b9..7be7d778fb9 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/product" ) type StoreResult struct { diff --git a/server/channels/store/storetest/audit_store.go b/server/channels/store/storetest/audit_store.go index 2bd78073568..a70abf32d13 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 6e842afe5d5..47e79bba67a 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 a244539e216..fdae4aaf455 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 5dc0be429d4..debd6cb6d75 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/timezones" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) type SqlStore interface { diff --git a/server/channels/store/storetest/channel_store_categories.go b/server/channels/store/storetest/channel_store_categories.go index abc75219f3c..d8d226f7fe6 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 a930f3731ff..3cd68b9d600 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 603f0cd07d9..5096a419330 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 b6cde7d9773..5f42fca4944 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 929fcc4bb0c..059abe43b88 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 aa977e2d0cd..d98adab0454 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 74ee426cc2b..de449f228f9 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 17dc79fb95c..bd39d0fa0f8 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" "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 3906f8a566c..a1c100c4004 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" "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 2c570076793..a36ed750039 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) 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 94ce665401f..4ef27ee0595 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 089d05c7c89..8705a0e127f 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 67a6d6be07e..8bcf76a7418 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) // 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 35b0a7aceb3..63a8d254972 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/public/model" + model "github.com/mattermost/mattermost/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 dffe0c65691..da0140e85c7 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/public/model" + model "github.com/mattermost/mattermost/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 687e76a15cd..14b37d2e71e 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/public/model" + model "github.com/mattermost/mattermost/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 f9e9c798ae1..fc1e9eed2b9 100644 --- a/server/channels/store/storetest/mocks/ChannelStore.go +++ b/server/channels/store/storetest/mocks/ChannelStore.go @@ -7,10 +7,10 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" - store "github.com/mattermost/mattermost-server/server/v8/channels/store" + store "github.com/mattermost/mattermost/server/v8/channels/store" time "time" ) diff --git a/server/channels/store/storetest/mocks/ClusterDiscoveryStore.go b/server/channels/store/storetest/mocks/ClusterDiscoveryStore.go index 4cda05e3db0..3f6a41de033 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/public/model" + model "github.com/mattermost/mattermost/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 1e3b2c9d10c..09f4f52f766 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/public/model" + model "github.com/mattermost/mattermost/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 ab2160ca9ee..09845d74e9a 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/public/model" + model "github.com/mattermost/mattermost/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 98dd1cc2bea..2e16d490243 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/public/model" + model "github.com/mattermost/mattermost/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 a06af3944cb..51941427775 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/public/model" + model "github.com/mattermost/mattermost/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 256abbd111a..f9cfe28f03b 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/public/model" + model "github.com/mattermost/mattermost/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 dfc6214ae80..fd10afe000f 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/public/model" + model "github.com/mattermost/mattermost/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 0263339056f..40b45cb805c 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/public/model" + model "github.com/mattermost/mattermost/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 ad9d51882ae..e2b2f90ad99 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/public/model" + model "github.com/mattermost/mattermost/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 6b208cc3417..155c2de9679 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/public/model" + model "github.com/mattermost/mattermost/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 00e096508e5..a7224bc5750 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/public/model" + model "github.com/mattermost/mattermost/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 5575bb3e4d3..53027f8b52e 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/public/model" + model "github.com/mattermost/mattermost/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 cfefc25bab7..080b23236e0 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/public/model" + model "github.com/mattermost/mattermost/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 134339a393e..d14c45295fc 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/public/model" + model "github.com/mattermost/mattermost/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 3d02e535fec..637fdfa317a 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/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/store/storetest/mocks/PostPersistentNotificationStore.go b/server/channels/store/storetest/mocks/PostPersistentNotificationStore.go index 85ba4550710..b616516d7d1 100644 --- a/server/channels/store/storetest/mocks/PostPersistentNotificationStore.go +++ b/server/channels/store/storetest/mocks/PostPersistentNotificationStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/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 d0fd7890105..7192385adaf 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/public/model" + model "github.com/mattermost/mattermost/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 796e6040afd..336c9eb6faa 100644 --- a/server/channels/store/storetest/mocks/PostStore.go +++ b/server/channels/store/storetest/mocks/PostStore.go @@ -7,10 +7,10 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" - store "github.com/mattermost/mattermost-server/server/v8/channels/store" + store "github.com/mattermost/mattermost/server/v8/channels/store" ) // PostStore is an autogenerated mock type for the PostStore type diff --git a/server/channels/store/storetest/mocks/PreferenceStore.go b/server/channels/store/storetest/mocks/PreferenceStore.go index 49fc7484628..df570597dc7 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/public/model" + model "github.com/mattermost/mattermost/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 76ba28e32bb..3cd63083e79 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/public/model" + model "github.com/mattermost/mattermost/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 5e4cdc8797c..4fd5c577347 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/public/model" + model "github.com/mattermost/mattermost/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 9d79cbaca6f..0cb4737cbd1 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/public/model" + model "github.com/mattermost/mattermost/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 26e528636f6..73b7ef791e4 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/public/model" + model "github.com/mattermost/mattermost/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 593152acd37..f24a4e04161 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/public/model" + model "github.com/mattermost/mattermost/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 7eaf6556c11..0dabbdb1402 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/public/model" + model "github.com/mattermost/mattermost/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 0869dbd841b..fe2fe137157 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/public/model" + model "github.com/mattermost/mattermost/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 26688f01ef9..ecfc3834fd1 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/public/model" + model "github.com/mattermost/mattermost/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 5213740bbeb..d5842212618 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/public/model" + model "github.com/mattermost/mattermost/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 3ed4cc4fd7c..2a50f246e08 100644 --- a/server/channels/store/storetest/mocks/Store.go +++ b/server/channels/store/storetest/mocks/Store.go @@ -7,12 +7,12 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" sql "database/sql" - store "github.com/mattermost/mattermost-server/server/v8/channels/store" + store "github.com/mattermost/mattermost/server/v8/channels/store" time "time" ) diff --git a/server/channels/store/storetest/mocks/SystemStore.go b/server/channels/store/storetest/mocks/SystemStore.go index 04b253682b6..0b3ad711bac 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/public/model" + model "github.com/mattermost/mattermost/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 6323434f13e..3c29f783129 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/public/model" + model "github.com/mattermost/mattermost/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 ba4912247b2..ce810e2efd6 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/public/model" + model "github.com/mattermost/mattermost/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 b56e6278389..72d9b6206dd 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/public/model" + store "github.com/mattermost/mattermost/server/v8/channels/store" 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 6485025e651..54e3e788946 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/public/model" + model "github.com/mattermost/mattermost/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 5d978fdf4ba..38e419341fb 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/public/model" + model "github.com/mattermost/mattermost/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 374467ada0e..267d50c160b 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/public/model" + model "github.com/mattermost/mattermost/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 65fa30e2f1a..2d86b142198 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/public/model" + model "github.com/mattermost/mattermost/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 77493f4ed37..e4ccace99dc 100644 --- a/server/channels/store/storetest/mocks/UserStore.go +++ b/server/channels/store/storetest/mocks/UserStore.go @@ -7,10 +7,10 @@ package mocks import ( context "context" - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" - store "github.com/mattermost/mattermost-server/server/v8/channels/store" + store "github.com/mattermost/mattermost/server/v8/channels/store" ) // UserStore is an autogenerated mock type for the UserStore type diff --git a/server/channels/store/storetest/mocks/UserTermsOfServiceStore.go b/server/channels/store/storetest/mocks/UserTermsOfServiceStore.go index 088ddcaeeb7..bf3eebd906e 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/public/model" + model "github.com/mattermost/mattermost/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 27a444d59e5..28c31103b10 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/public/model" + model "github.com/mattermost/mattermost/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 fa035d71826..b13980d2375 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) const PluginIdJenkins = "jenkins" diff --git a/server/channels/store/storetest/oauth_store.go b/server/channels/store/storetest/oauth_store.go index 7060fc3b259..d58fb84af04 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 585d4ec0dd4..2eda0172963 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 ba03f11bf95..8392fb5c340 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) func TestPostAcknowledgementsStore(t *testing.T, ss store.Store, s SqlStore) { diff --git a/server/channels/store/storetest/post_persistent_notification_store.go b/server/channels/store/storetest/post_persistent_notification_store.go index 7542954ea36..1c8bb54ad2b 100644 --- a/server/channels/store/storetest/post_persistent_notification_store.go +++ b/server/channels/store/storetest/post_persistent_notification_store.go @@ -7,8 +7,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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/channels/store/storetest/post_priority_store.go b/server/channels/store/storetest/post_priority_store.go index 9ac572d0e12..b162812574d 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 e9da558e797..ad0001a197b 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) 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 af9d9ec391d..8cf55985349 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 6dbf464d698..68ad7f1bcac 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 c7456365ef9..5f1ae8efe86 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/retrylayer" ) 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 d787d1aea8c..82965a7ba20 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" "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 5be50d51db2..9787997c05a 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 f1ef0c5ac53..efbaf6f58ba 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 4b3478f3402..5423015a797 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 4fca204d64b..e6e86a33c6c 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) const ( diff --git a/server/channels/store/storetest/settings.go b/server/channels/store/storetest/settings.go index 3f29e3beed0..49a9deed43a 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 8fb5c7be737..f56b52d88f8 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 e676c851bd6..494d973b40f 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 eb7101e8cff..2aa1a4f5d0a 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) // 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 71d945184a6..904206e9ccc 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/public/model" + "github.com/mattermost/mattermost/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 3ed49b29ff1..2513b37a598 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 78ea7939b4e..bffb3cda9e0 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 ea294ad6dfa..328e03920b0 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 8480884a465..e09ab99cc38 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 3fffd09c46c..26d6de7a46a 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 cee20ece3a2..c2cde1dd166 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) 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 e2dfac7eb76..21e11d46c23 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 6a8309c0205..fad63163d77 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 1b325ebd746..2ae28bb9f67 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) const ( diff --git a/server/channels/store/storetest/user_terms_of_service.go b/server/channels/store/storetest/user_terms_of_service.go index cee19ca4ed7..3ffe1d7c0b2 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 f6d4f787249..eb8c7c17b21 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/public/model" + "github.com/mattermost/mattermost/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 df12162574d..d9ffcb2704b 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" ) 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 c301c651dce..7ae4829b898 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/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/store" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) type TimerLayer struct { diff --git a/server/channels/testlib/cluster.go b/server/channels/testlib/cluster.go index 2b3a58f3955..273189fa46c 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/public/model" - "github.com/mattermost/mattermost-server/server/v8/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) type FakeClusterInterface struct { diff --git a/server/channels/testlib/helper.go b/server/channels/testlib/helper.go index ff61dc0f0ae..a5b431d43b2 100644 --- a/server/channels/testlib/helper.go +++ b/server/channels/testlib/helper.go @@ -13,13 +13,13 @@ 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/platform/services/searchengine" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/searchlayer" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine" ) type MainHelper struct { diff --git a/server/channels/testlib/resources.go b/server/channels/testlib/resources.go index 5f20f18dd50..d9cd279071c 100644 --- a/server/channels/testlib/resources.go +++ b/server/channels/testlib/resources.go @@ -12,10 +12,10 @@ 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/platform/shared/filestore" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/utils" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) const ( diff --git a/server/channels/testlib/store.go b/server/channels/testlib/store.go index 77bcded7d93..b34b04523f7 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) type TestStore struct { diff --git a/server/channels/utils/api.go b/server/channels/utils/api.go index 9ffbd4b2137..8f1af8830d3 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" ) func CheckOrigin(r *http.Request, allowedOrigins string) bool { diff --git a/server/channels/utils/api_test.go b/server/channels/utils/api_test.go index c817c810c79..18f77f50282 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestRenderWebError(t *testing.T) { diff --git a/server/channels/utils/archive_test.go b/server/channels/utils/archive_test.go index ae769a0f2b5..febd321719f 100644 --- a/server/channels/utils/archive_test.go +++ b/server/channels/utils/archive_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) func TestSanitizePath(t *testing.T) { diff --git a/server/channels/utils/i18n.go b/server/channels/utils/i18n.go index 41f9ff6881f..b40eb8babbc 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/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) // this functions loads translations from filesystem if they are not diff --git a/server/channels/utils/imgutils/gif_test.go b/server/channels/utils/imgutils/gif_test.go index f837f6485a8..6f889d6a58c 100644 --- a/server/channels/utils/imgutils/gif_test.go +++ b/server/channels/utils/imgutils/gif_test.go @@ -12,7 +12,7 @@ import ( "path/filepath" "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/server/channels/utils/license.go b/server/channels/utils/license.go index b85d7d5c52f..17956b89586 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) var LicenseValidator LicenseValidatorIface diff --git a/server/channels/utils/license_test.go b/server/channels/utils/license_test.go index 9e64fee8feb..96fce2bd2e4 100644 --- a/server/channels/utils/license_test.go +++ b/server/channels/utils/license_test.go @@ -9,7 +9,7 @@ import ( "os" "testing" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/channels/utils/merge_test.go b/server/channels/utils/merge_test.go index bc3ceb3419e..d900658bd6e 100644 --- a/server/channels/utils/merge_test.go +++ b/server/channels/utils/merge_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) // Test merging maps alone. This isolates the complexity of merging maps from merging maps recursively in diff --git a/server/channels/utils/mocks/LicenseValidatorIface.go b/server/channels/utils/mocks/LicenseValidatorIface.go index c9d3ae5dafe..928c76bbc10 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/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/channels/utils/subpath.go b/server/channels/utils/subpath.go index 880de68de07..3e4be926dc1 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) // 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 25319550fe9..caa52382b13 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) 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 91121ddf1cd..72e41459a31 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type StaticConfigService struct { diff --git a/server/channels/utils/testutils/testutils.go b/server/channels/utils/testutils/testutils.go index 9d766e23a1c..646d96ed7a6 100644 --- a/server/channels/utils/testutils/testutils.go +++ b/server/channels/utils/testutils/testutils.go @@ -14,9 +14,9 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/channels/utils" - "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) func ReadTestFile(name string) ([]byte, error) { diff --git a/server/channels/utils/utils.go b/server/channels/utils/utils.go index 88b4ca10069..4f257536aa4 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/public/model" + "github.com/mattermost/mattermost/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 feec45fc4ca..85f73a02fbd 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) type Context struct { diff --git a/server/channels/web/context_test.go b/server/channels/web/context_test.go index c4dbc6c8865..a294d96a26a 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestRequireHookId(t *testing.T) { diff --git a/server/channels/web/handlers.go b/server/channels/web/handlers.go index d9b20fe9c97..576dd77dbda 100644 --- a/server/channels/web/handlers.go +++ b/server/channels/web/handlers.go @@ -19,15 +19,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/platform/services/tracing" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + app_opentracing "github.com/mattermost/mattermost/server/v8/channels/app/opentracing" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store/opentracinglayer" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/platform/services/tracing" ) 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 924262068ed..75290038259 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func handlerForHTTPErrors(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/server/channels/web/main_test.go b/server/channels/web/main_test.go index 06e4b6935ac..a06d6600ddb 100644 --- a/server/channels/web/main_test.go +++ b/server/channels/web/main_test.go @@ -6,7 +6,7 @@ package web import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/channels/web/oauth.go b/server/channels/web/oauth.go index d5dd8731cb4..21e2eca3fb6 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) func (w *Web) InitOAuth() { diff --git a/server/channels/web/oauth_test.go b/server/channels/web/oauth_test.go index 34525aafed4..b90c8f6a44d 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/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/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) func TestOAuthComplete_AccessDenied(t *testing.T) { diff --git a/server/channels/web/params.go b/server/channels/web/params.go index 16b6e17ef85..4de487ee9b2 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) const ( diff --git a/server/channels/web/params_test.go b/server/channels/web/params_test.go index d1c4eb7db26..591daf421c6 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestGetPerPageFromQuery(t *testing.T) { diff --git a/server/channels/web/saml.go b/server/channels/web/saml.go index 4df1e8fab1f..e72b0c8bf32 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) const maxSAMLResponseSize = 2 * 1024 * 1024 // 2MB diff --git a/server/channels/web/static.go b/server/channels/web/static.go index af7d78cabe3..dd8cbd8eb06 100644 --- a/server/channels/web/static.go +++ b/server/channels/web/static.go @@ -15,11 +15,11 @@ 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/platform/shared/templates" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost/server/v8/platform/shared/templates" ) var robotsTxt = []byte("User-agent: *\nDisallow: /\n") diff --git a/server/channels/web/unsupported_browser.go b/server/channels/web/unsupported_browser.go index fc3ea2fe26b..59d25699663 100644 --- a/server/channels/web/unsupported_browser.go +++ b/server/channels/web/unsupported_browser.go @@ -8,8 +8,8 @@ import ( "github.com/avct/uasurfer" - "github.com/mattermost/mattermost-server/server/v8/channels/app/request" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/templates" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/platform/shared/templates" ) // MattermostApp describes downloads for the Mattermost App diff --git a/server/channels/web/web.go b/server/channels/web/web.go index 4b6b5ba0bb7..9c7640ba22c 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) type Web struct { diff --git a/server/channels/web/web_test.go b/server/channels/web/web_test.go index f8db91f917d..e65f701ac5c 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin/utils" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store/localcachelayer" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/config" ) var apiClient *model.Client4 @@ -205,7 +205,7 @@ func TestStaticFilesRequest(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin" ) type MyPlugin struct { @@ -292,7 +292,7 @@ func TestPublicFilesRequest(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin" ) type MyPlugin struct { diff --git a/server/channels/web/webhook.go b/server/channels/web/webhook.go index 2f845511ab6..845c48b79d5 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 3e02efa4da5..567e8861bb4 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestIncomingWebhook(t *testing.T) { diff --git a/server/channels/wsapi/api.go b/server/channels/wsapi/api.go index fcfa5b07fdc..eb747f9d419 100644 --- a/server/channels/wsapi/api.go +++ b/server/channels/wsapi/api.go @@ -4,8 +4,8 @@ package wsapi import ( - "github.com/mattermost/mattermost-server/server/v8/channels/app" - "github.com/mattermost/mattermost-server/server/v8/channels/app/platform" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/platform" ) type API struct { diff --git a/server/channels/wsapi/status.go b/server/channels/wsapi/status.go index 8e81eaa04c5..c1751219481 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) func (api *API) InitStatus() { diff --git a/server/channels/wsapi/system.go b/server/channels/wsapi/system.go index 16cfbd23e2c..c2e1f5ffd12 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func (api *API) InitSystem() { diff --git a/server/channels/wsapi/user.go b/server/channels/wsapi/user.go index 99a53384460..b407025bcd3 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) func (api *API) InitUser() { diff --git a/server/channels/wsapi/websocket_handler.go b/server/channels/wsapi/websocket_handler.go index 891989e18d8..3a3a8b5af6f 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/platform" ) 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 10cf30b46e9..d7561685904 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/api4" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) var coverprofileCounters map[string]int = make(map[string]int) diff --git a/server/cmd/mattermost/commands/db.go b/server/cmd/mattermost/commands/db.go index 387d203d808..6e8801b33c4 100644 --- a/server/cmd/mattermost/commands/db.go +++ b/server/cmd/mattermost/commands/db.go @@ -10,10 +10,10 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "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/sqlstore" - "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/config" ) var DbCmd = &cobra.Command{ diff --git a/server/cmd/mattermost/commands/export.go b/server/cmd/mattermost/commands/export.go index ba4eb9ebec2..8278d6b4a89 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/audit" "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 4baaad3f1ff..cca109331c2 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/public/model" + "github.com/mattermost/mattermost/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 96016a7658f..2c62f432d97 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/audit" ) var ImportCmd = &cobra.Command{ diff --git a/server/cmd/mattermost/commands/init.go b/server/cmd/mattermost/commands/init.go index 0faf65c3a5a..83699170b11 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/config" ) 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 9e42728a8ef..18a544b4651 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/audit" + "github.com/mattermost/mattermost/server/v8/config" ) var JobserverCmd = &cobra.Command{ diff --git a/server/cmd/mattermost/commands/main_test.go b/server/cmd/mattermost/commands/main_test.go index 897e05e48ef..90444e4c5d1 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/api4" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) // 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 3c5030efb7a..5f73ba05012 100644 --- a/server/cmd/mattermost/commands/server.go +++ b/server/cmd/mattermost/commands/server.go @@ -15,14 +15,14 @@ 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" - "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/channels/wsapi" - "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/api4" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/manualtesting" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/channels/web" + "github.com/mattermost/mattermost/server/v8/channels/wsapi" + "github.com/mattermost/mattermost/server/v8/config" ) var serverCmd = &cobra.Command{ diff --git a/server/cmd/mattermost/commands/server_test.go b/server/cmd/mattermost/commands/server_test.go index d8eaf66e8f3..f13be02f166 100644 --- a/server/cmd/mattermost/commands/server_test.go +++ b/server/cmd/mattermost/commands/server_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/channels/jobs" - "github.com/mattermost/mattermost-server/server/v8/config" + "github.com/mattermost/mattermost/server/v8/channels/jobs" + "github.com/mattermost/mattermost/server/v8/config" ) const ( diff --git a/server/cmd/mattermost/commands/test.go b/server/cmd/mattermost/commands/test.go index 5e6d5e80c00..6d645aeff72 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/api4" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/wsapi" ) var TestCmd = &cobra.Command{ diff --git a/server/cmd/mattermost/commands/utils.go b/server/cmd/mattermost/commands/utils.go index 7062558b5fc..163aab8170c 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/public/model" + "github.com/mattermost/mattermost/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 807ce59caa1..5a5a5f160db 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) var VersionCmd = &cobra.Command{ diff --git a/server/cmd/mattermost/main.go b/server/cmd/mattermost/main.go index f8876f4a485..1201fcf7e9c 100644 --- a/server/cmd/mattermost/main.go +++ b/server/cmd/mattermost/main.go @@ -6,18 +6,18 @@ package main import ( "os" - "github.com/mattermost/mattermost-server/server/v8/cmd/mattermost/commands" + "github.com/mattermost/mattermost/server/v8/cmd/mattermost/commands" // Import and register app layer slash commands - _ "github.com/mattermost/mattermost-server/server/v8/channels/app/slashcommands" + _ "github.com/mattermost/mattermost/server/v8/channels/app/slashcommands" // Plugins - _ "github.com/mattermost/mattermost-server/server/v8/channels/app/oauthproviders/gitlab" + _ "github.com/mattermost/mattermost/server/v8/channels/app/oauthproviders/gitlab" // Enterprise Imports - _ "github.com/mattermost/mattermost-server/server/v8/channels/imports" + _ "github.com/mattermost/mattermost/server/v8/channels/imports" // Blank imports for each product to register themselves - _ "github.com/mattermost/mattermost-server/server/v8/boards/product" - _ "github.com/mattermost/mattermost-server/server/v8/playbooks/product" + _ "github.com/mattermost/mattermost/server/v8/boards/product" + _ "github.com/mattermost/mattermost/server/v8/playbooks/product" ) func main() { diff --git a/server/cmd/mmctl/client/client.go b/server/cmd/mmctl/client/client.go index 449a4cc278c..c40eaf13407 100644 --- a/server/cmd/mmctl/client/client.go +++ b/server/cmd/mmctl/client/client.go @@ -8,7 +8,7 @@ import ( "io" "net/http" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type Client interface { diff --git a/server/cmd/mmctl/commands/auth.go b/server/cmd/mmctl/commands/auth.go index 59479f5eca1..212c86eb5a6 100644 --- a/server/cmd/mmctl/commands/auth.go +++ b/server/cmd/mmctl/commands/auth.go @@ -17,9 +17,9 @@ import ( "github.com/spf13/viper" "golang.org/x/term" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) var AuthCmd = &cobra.Command{ diff --git a/server/cmd/mmctl/commands/auth_e2e_test.go b/server/cmd/mmctl/commands/auth_e2e_test.go index c6aefeb8d21..fc0e210498a 100644 --- a/server/cmd/mmctl/commands/auth_e2e_test.go +++ b/server/cmd/mmctl/commands/auth_e2e_test.go @@ -6,7 +6,7 @@ package commands import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) func (s *MmctlE2ETestSuite) TestAuthLoginWithTrailingSlashInInstanceURL() { diff --git a/server/cmd/mmctl/commands/auth_utils.go b/server/cmd/mmctl/commands/auth_utils.go index 75a0da159d3..16029881089 100644 --- a/server/cmd/mmctl/commands/auth_utils.go +++ b/server/cmd/mmctl/commands/auth_utils.go @@ -15,7 +15,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/viper" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) const ( diff --git a/server/cmd/mmctl/commands/bot.go b/server/cmd/mmctl/commands/bot.go index f18d76f9890..76d8323687b 100644 --- a/server/cmd/mmctl/commands/bot.go +++ b/server/cmd/mmctl/commands/bot.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/hashicorp/go-multierror" "github.com/pkg/errors" diff --git a/server/cmd/mmctl/commands/bot_e2e_test.go b/server/cmd/mmctl/commands/bot_e2e_test.go index fedb417ac53..b7718198688 100644 --- a/server/cmd/mmctl/commands/bot_e2e_test.go +++ b/server/cmd/mmctl/commands/bot_e2e_test.go @@ -6,10 +6,10 @@ package commands import ( "fmt" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/bot_test.go b/server/cmd/mmctl/commands/bot_test.go index 2fe1c916d32..f45c6fa2529 100644 --- a/server/cmd/mmctl/commands/bot_test.go +++ b/server/cmd/mmctl/commands/bot_test.go @@ -8,9 +8,9 @@ import ( "errors" gomock "github.com/golang/mock/gomock" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/channel.go b/server/cmd/mmctl/commands/channel.go index 7efc94c9aac..edb4effba4a 100644 --- a/server/cmd/mmctl/commands/channel.go +++ b/server/cmd/mmctl/commands/channel.go @@ -8,11 +8,11 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/web" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/web" "github.com/hashicorp/go-multierror" "github.com/pkg/errors" diff --git a/server/cmd/mmctl/commands/channel_e2e_test.go b/server/cmd/mmctl/commands/channel_e2e_test.go index 714cf1469db..3da8db96d38 100644 --- a/server/cmd/mmctl/commands/channel_e2e_test.go +++ b/server/cmd/mmctl/commands/channel_e2e_test.go @@ -8,14 +8,14 @@ import ( "sort" "github.com/hashicorp/go-multierror" - "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/app" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/api4" + "github.com/mattermost/mattermost/server/v8/channels/app" "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) func (s *MmctlE2ETestSuite) TestListChannelsCmdF() { diff --git a/server/cmd/mmctl/commands/channel_test.go b/server/cmd/mmctl/commands/channel_test.go index c65d811ecad..a6d70ea4097 100644 --- a/server/cmd/mmctl/commands/channel_test.go +++ b/server/cmd/mmctl/commands/channel_test.go @@ -9,10 +9,10 @@ import ( "net/http" "github.com/hashicorp/go-multierror" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/web" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/web" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/server/cmd/mmctl/commands/channel_users.go b/server/cmd/mmctl/commands/channel_users.go index 8ea84787e00..d87b954a24d 100644 --- a/server/cmd/mmctl/commands/channel_users.go +++ b/server/cmd/mmctl/commands/channel_users.go @@ -9,10 +9,10 @@ import ( "github.com/hashicorp/go-multierror" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/channel_users_e2e_test.go b/server/cmd/mmctl/commands/channel_users_e2e_test.go index a690c8936de..30e11f65b81 100644 --- a/server/cmd/mmctl/commands/channel_users_e2e_test.go +++ b/server/cmd/mmctl/commands/channel_users_e2e_test.go @@ -6,13 +6,13 @@ package commands import ( "fmt" - "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/app" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/api4" + "github.com/mattermost/mattermost/server/v8/channels/app" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) func (s *MmctlE2ETestSuite) TestChannelUsersAddCmdF() { diff --git a/server/cmd/mmctl/commands/channel_users_test.go b/server/cmd/mmctl/commands/channel_users_test.go index bfdce46a469..332689f08ed 100644 --- a/server/cmd/mmctl/commands/channel_users_test.go +++ b/server/cmd/mmctl/commands/channel_users_test.go @@ -8,10 +8,10 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/channelargs.go b/server/cmd/mmctl/commands/channelargs.go index 68af5094693..9d83cfe705a 100644 --- a/server/cmd/mmctl/commands/channelargs.go +++ b/server/cmd/mmctl/commands/channelargs.go @@ -10,9 +10,9 @@ import ( "strings" "github.com/hashicorp/go-multierror" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" ) const channelArgSeparator = ":" diff --git a/server/cmd/mmctl/commands/channelargs_test.go b/server/cmd/mmctl/commands/channelargs_test.go index a50fa7889a0..6e9f00dff5a 100644 --- a/server/cmd/mmctl/commands/channelargs_test.go +++ b/server/cmd/mmctl/commands/channelargs_test.go @@ -9,7 +9,7 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func (s *MmctlUnitTestSuite) TestGetChannelArgs() { diff --git a/server/cmd/mmctl/commands/command.go b/server/cmd/mmctl/commands/command.go index e7bcc89f84e..f76c3b1b1a6 100644 --- a/server/cmd/mmctl/commands/command.go +++ b/server/cmd/mmctl/commands/command.go @@ -11,11 +11,11 @@ import ( "strings" "github.com/hashicorp/go-multierror" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) var CommandCmd = &cobra.Command{ diff --git a/server/cmd/mmctl/commands/command_e2e_test.go b/server/cmd/mmctl/commands/command_e2e_test.go index f1a0078bd03..de1fc8afdd3 100644 --- a/server/cmd/mmctl/commands/command_e2e_test.go +++ b/server/cmd/mmctl/commands/command_e2e_test.go @@ -7,12 +7,12 @@ import ( "context" "fmt" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/api4" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/api4" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) func (s *MmctlE2ETestSuite) TestListCommandCmd() { diff --git a/server/cmd/mmctl/commands/command_test.go b/server/cmd/mmctl/commands/command_test.go index c57d2eca258..ac5fa27ffe3 100644 --- a/server/cmd/mmctl/commands/command_test.go +++ b/server/cmd/mmctl/commands/command_test.go @@ -11,9 +11,9 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/commandargs.go b/server/cmd/mmctl/commands/commandargs.go index 5d96bcbcc5d..e3a1b7d6826 100644 --- a/server/cmd/mmctl/commands/commandargs.go +++ b/server/cmd/mmctl/commands/commandargs.go @@ -7,9 +7,9 @@ import ( "context" "strings" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) // getCommandFromCommandArg retrieves a Command by command id or team:trigger. diff --git a/server/cmd/mmctl/commands/config.go b/server/cmd/mmctl/commands/config.go index 64d0a0674e8..57d3cf2bdaa 100644 --- a/server/cmd/mmctl/commands/config.go +++ b/server/cmd/mmctl/commands/config.go @@ -14,11 +14,11 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/server/cmd/mmctl/commands/config_e2e_test.go b/server/cmd/mmctl/commands/config_e2e_test.go index 9b51a0655b7..edac8330499 100644 --- a/server/cmd/mmctl/commands/config_e2e_test.go +++ b/server/cmd/mmctl/commands/config_e2e_test.go @@ -7,11 +7,11 @@ import ( "io/ioutil" "os" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) func (s *MmctlE2ETestSuite) TestConfigResetCmdE2E() { diff --git a/server/cmd/mmctl/commands/config_test.go b/server/cmd/mmctl/commands/config_test.go index 7feed7d83c2..680d7e09acd 100644 --- a/server/cmd/mmctl/commands/config_test.go +++ b/server/cmd/mmctl/commands/config_test.go @@ -13,11 +13,11 @@ import ( "os" "testing" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) const ( diff --git a/server/cmd/mmctl/commands/enterprise.go b/server/cmd/mmctl/commands/enterprise.go index a401d6d10a7..96cdea220d1 100644 --- a/server/cmd/mmctl/commands/enterprise.go +++ b/server/cmd/mmctl/commands/enterprise.go @@ -13,8 +13,8 @@ import ( _ "github.com/hashicorp/memberlist" _ "github.com/mattermost/gosaml2" _ "github.com/mattermost/ldap" - _ "github.com/mattermost/mattermost-server/server/v8/channels/imports" - _ "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + _ "github.com/mattermost/mattermost/server/v8/channels/imports" + _ "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" _ "github.com/mattermost/rsc/qr" _ "github.com/prometheus/client_golang/prometheus" _ "github.com/prometheus/client_golang/prometheus/collectors" diff --git a/server/cmd/mmctl/commands/errors.go b/server/cmd/mmctl/commands/errors.go index e5c180ac5da..eb931a78381 100644 --- a/server/cmd/mmctl/commands/errors.go +++ b/server/cmd/mmctl/commands/errors.go @@ -7,7 +7,7 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) // ErrEntityNotFound is thrown when an entity (user, team, etc.) diff --git a/server/cmd/mmctl/commands/export.go b/server/cmd/mmctl/commands/export.go index 2223a9f38fd..a9cfb351a27 100644 --- a/server/cmd/mmctl/commands/export.go +++ b/server/cmd/mmctl/commands/export.go @@ -9,10 +9,10 @@ import ( "io" "os" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/export_e2e_test.go b/server/cmd/mmctl/commands/export_e2e_test.go index 5a2de1ea22a..55ea15c95af 100644 --- a/server/cmd/mmctl/commands/export_e2e_test.go +++ b/server/cmd/mmctl/commands/export_e2e_test.go @@ -10,11 +10,11 @@ import ( "path/filepath" "time" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/utils" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/utils" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/export_test.go b/server/cmd/mmctl/commands/export_test.go index dd9f3e7d5ee..abe50ccd560 100644 --- a/server/cmd/mmctl/commands/export_test.go +++ b/server/cmd/mmctl/commands/export_test.go @@ -8,9 +8,9 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/extract.go b/server/cmd/mmctl/commands/extract.go index 2584aeedab6..bd0fee2d8df 100644 --- a/server/cmd/mmctl/commands/extract.go +++ b/server/cmd/mmctl/commands/extract.go @@ -9,10 +9,10 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/extract_e2e_test.go b/server/cmd/mmctl/commands/extract_e2e_test.go index e25f40a5137..65da74eabcb 100644 --- a/server/cmd/mmctl/commands/extract_e2e_test.go +++ b/server/cmd/mmctl/commands/extract_e2e_test.go @@ -9,10 +9,10 @@ import ( "path/filepath" "time" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/group.go b/server/cmd/mmctl/commands/group.go index 3721e0e0300..5f3c48753a2 100644 --- a/server/cmd/mmctl/commands/group.go +++ b/server/cmd/mmctl/commands/group.go @@ -7,10 +7,10 @@ import ( "context" "net/http" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/server/cmd/mmctl/commands/group_e2e_test.go b/server/cmd/mmctl/commands/group_e2e_test.go index ca1ab6cb992..a359c0e6f58 100644 --- a/server/cmd/mmctl/commands/group_e2e_test.go +++ b/server/cmd/mmctl/commands/group_e2e_test.go @@ -4,12 +4,12 @@ package commands import ( - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/api4" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/api4" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) func (s *MmctlE2ETestSuite) TestChannelGroupEnableCmd() { diff --git a/server/cmd/mmctl/commands/group_test.go b/server/cmd/mmctl/commands/group_test.go index 5c98d16f16b..ff1259b5f1b 100644 --- a/server/cmd/mmctl/commands/group_test.go +++ b/server/cmd/mmctl/commands/group_test.go @@ -8,10 +8,10 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/import.go b/server/cmd/mmctl/commands/import.go index 21af5f45561..114549ba8bd 100644 --- a/server/cmd/mmctl/commands/import.go +++ b/server/cmd/mmctl/commands/import.go @@ -13,12 +13,12 @@ import ( "text/template" "time" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/commands/importer" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/commands/importer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) var ImportCmd = &cobra.Command{ diff --git a/server/cmd/mmctl/commands/import_e2e_test.go b/server/cmd/mmctl/commands/import_e2e_test.go index e39cd5fc62d..7eff0621f38 100644 --- a/server/cmd/mmctl/commands/import_e2e_test.go +++ b/server/cmd/mmctl/commands/import_e2e_test.go @@ -9,10 +9,10 @@ import ( "path/filepath" "time" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/import_test.go b/server/cmd/mmctl/commands/import_test.go index df7dade3c61..4520ee504a2 100644 --- a/server/cmd/mmctl/commands/import_test.go +++ b/server/cmd/mmctl/commands/import_test.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func (s *MmctlUnitTestSuite) TestImportListAvailableCmdF() { diff --git a/server/cmd/mmctl/commands/importer/validate.go b/server/cmd/mmctl/commands/importer/validate.go index f40fe37d4b9..d24843a4cce 100644 --- a/server/cmd/mmctl/commands/importer/validate.go +++ b/server/cmd/mmctl/commands/importer/validate.go @@ -25,11 +25,11 @@ import ( "text/template" "time" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/app/imports" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/imports" _ "golang.org/x/image/webp" // image decoder - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) const ( diff --git a/server/cmd/mmctl/commands/init.go b/server/cmd/mmctl/commands/init.go index ca8e7cf8ec7..1f6c995e005 100644 --- a/server/cmd/mmctl/commands/init.go +++ b/server/cmd/mmctl/commands/init.go @@ -18,10 +18,10 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) var ( diff --git a/server/cmd/mmctl/commands/init_test.go b/server/cmd/mmctl/commands/init_test.go index fc505870ed6..3203742a4ac 100644 --- a/server/cmd/mmctl/commands/init_test.go +++ b/server/cmd/mmctl/commands/init_test.go @@ -14,7 +14,7 @@ import ( "testing" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/stretchr/testify/require" ) diff --git a/server/cmd/mmctl/commands/integrity.go b/server/cmd/mmctl/commands/integrity.go index b653d6cb4f4..c19a58f5d95 100644 --- a/server/cmd/mmctl/commands/integrity.go +++ b/server/cmd/mmctl/commands/integrity.go @@ -9,10 +9,10 @@ import ( "github.com/hashicorp/go-multierror" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/integrity_test.go b/server/cmd/mmctl/commands/integrity_test.go index 6a987e09182..630249b9a10 100644 --- a/server/cmd/mmctl/commands/integrity_test.go +++ b/server/cmd/mmctl/commands/integrity_test.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/go-multierror" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/ldap.go b/server/cmd/mmctl/commands/ldap.go index f6bf832ccbd..f19eecdbf4b 100644 --- a/server/cmd/mmctl/commands/ldap.go +++ b/server/cmd/mmctl/commands/ldap.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) var LdapCmd = &cobra.Command{ diff --git a/server/cmd/mmctl/commands/ldap_e2e_test.go b/server/cmd/mmctl/commands/ldap_e2e_test.go index 2665dde4fdb..deccccd633b 100644 --- a/server/cmd/mmctl/commands/ldap_e2e_test.go +++ b/server/cmd/mmctl/commands/ldap_e2e_test.go @@ -7,13 +7,13 @@ import ( "os" "time" - "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/utils/testutils" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/api4" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) func configForLdap(th *api4.TestHelper) { diff --git a/server/cmd/mmctl/commands/ldap_test.go b/server/cmd/mmctl/commands/ldap_test.go index de9ce5829cc..ae2e673702f 100644 --- a/server/cmd/mmctl/commands/ldap_test.go +++ b/server/cmd/mmctl/commands/ldap_test.go @@ -7,10 +7,10 @@ import ( "context" "net/http" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/license.go b/server/cmd/mmctl/commands/license.go index 338180ebbc2..cb49a0c7c1b 100644 --- a/server/cmd/mmctl/commands/license.go +++ b/server/cmd/mmctl/commands/license.go @@ -8,8 +8,8 @@ import ( "errors" "io/ioutil" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/license_e2e_test.go b/server/cmd/mmctl/commands/license_e2e_test.go index dc9abf968c1..d7277b0ccac 100644 --- a/server/cmd/mmctl/commands/license_e2e_test.go +++ b/server/cmd/mmctl/commands/license_e2e_test.go @@ -8,11 +8,11 @@ import ( "io/ioutil" "os" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) func (s *MmctlE2ETestSuite) TestRemoveLicenseCmd() { diff --git a/server/cmd/mmctl/commands/license_test.go b/server/cmd/mmctl/commands/license_test.go index 3e8c239c931..ee48cf37573 100644 --- a/server/cmd/mmctl/commands/license_test.go +++ b/server/cmd/mmctl/commands/license_test.go @@ -9,11 +9,11 @@ import ( "net/http" "os" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) const ( diff --git a/server/cmd/mmctl/commands/logs.go b/server/cmd/mmctl/commands/logs.go index 2fdd2aa85f1..2c76cce6809 100644 --- a/server/cmd/mmctl/commands/logs.go +++ b/server/cmd/mmctl/commands/logs.go @@ -14,9 +14,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer/human" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer/human" ) var LogsCmd = &cobra.Command{ diff --git a/server/cmd/mmctl/commands/logs_e2e_test.go b/server/cmd/mmctl/commands/logs_e2e_test.go index 8560e4a9deb..8658b741d0d 100644 --- a/server/cmd/mmctl/commands/logs_e2e_test.go +++ b/server/cmd/mmctl/commands/logs_e2e_test.go @@ -4,7 +4,7 @@ package commands import ( - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/logs_test.go b/server/cmd/mmctl/commands/logs_test.go index 5894ce1f4c5..91c42806182 100644 --- a/server/cmd/mmctl/commands/logs_test.go +++ b/server/cmd/mmctl/commands/logs_test.go @@ -11,11 +11,11 @@ import ( "os" "strings" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" ) const ( diff --git a/server/cmd/mmctl/commands/main_test.go b/server/cmd/mmctl/commands/main_test.go index b0181b3af41..16a8d667342 100644 --- a/server/cmd/mmctl/commands/main_test.go +++ b/server/cmd/mmctl/commands/main_test.go @@ -9,8 +9,8 @@ package commands import ( "testing" - "github.com/mattermost/mattermost-server/server/v8/channels/api4" - "github.com/mattermost/mattermost-server/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/channels/api4" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) func TestMain(m *testing.M) { diff --git a/server/cmd/mmctl/commands/mmctl_test.go b/server/cmd/mmctl/commands/mmctl_test.go index b5d0a84cad3..37492c6f1ac 100644 --- a/server/cmd/mmctl/commands/mmctl_test.go +++ b/server/cmd/mmctl/commands/mmctl_test.go @@ -4,14 +4,14 @@ package commands import ( - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/mocks" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/mocks" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/golang/mock/gomock" "github.com/stretchr/testify/suite" - "github.com/mattermost/mattermost-server/server/v8/channels/api4" + "github.com/mattermost/mattermost/server/v8/channels/api4" ) var EnableEnterpriseTests string diff --git a/server/cmd/mmctl/commands/permission_role_test.go b/server/cmd/mmctl/commands/permission_role_test.go index e5819fec9c5..b35b3f70e35 100644 --- a/server/cmd/mmctl/commands/permission_role_test.go +++ b/server/cmd/mmctl/commands/permission_role_test.go @@ -10,9 +10,9 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/hashicorp/go-multierror" "github.com/spf13/cobra" diff --git a/server/cmd/mmctl/commands/permissions.go b/server/cmd/mmctl/commands/permissions.go index 90781dda2d0..2f70ed5971f 100644 --- a/server/cmd/mmctl/commands/permissions.go +++ b/server/cmd/mmctl/commands/permissions.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/permissions_e2e_test.go b/server/cmd/mmctl/commands/permissions_e2e_test.go index 57abcedd0d6..455a8885d96 100644 --- a/server/cmd/mmctl/commands/permissions_e2e_test.go +++ b/server/cmd/mmctl/commands/permissions_e2e_test.go @@ -6,10 +6,10 @@ package commands import ( "context" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/permissions_reset_e2e_test.go b/server/cmd/mmctl/commands/permissions_reset_e2e_test.go index 580b4aad43a..722c6ff2294 100644 --- a/server/cmd/mmctl/commands/permissions_reset_e2e_test.go +++ b/server/cmd/mmctl/commands/permissions_reset_e2e_test.go @@ -8,10 +8,10 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func (s *MmctlE2ETestSuite) TestResetPermissionsCmd() { diff --git a/server/cmd/mmctl/commands/permissions_role.go b/server/cmd/mmctl/commands/permissions_role.go index b7c06394695..b59c4feefb5 100644 --- a/server/cmd/mmctl/commands/permissions_role.go +++ b/server/cmd/mmctl/commands/permissions_role.go @@ -10,10 +10,10 @@ import ( "strings" "text/tabwriter" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/hashicorp/go-multierror" "github.com/spf13/cobra" diff --git a/server/cmd/mmctl/commands/permissions_role_e2e_test.go b/server/cmd/mmctl/commands/permissions_role_e2e_test.go index ced8919eea2..8041a46f1f2 100644 --- a/server/cmd/mmctl/commands/permissions_role_e2e_test.go +++ b/server/cmd/mmctl/commands/permissions_role_e2e_test.go @@ -4,10 +4,10 @@ package commands import ( - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/permissions_test.go b/server/cmd/mmctl/commands/permissions_test.go index cc1a9ff9a16..4d109bf5242 100644 --- a/server/cmd/mmctl/commands/permissions_test.go +++ b/server/cmd/mmctl/commands/permissions_test.go @@ -10,7 +10,7 @@ import ( gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/plugin.go b/server/cmd/mmctl/commands/plugin.go index 9298fa8cbe0..1e1b76e7681 100644 --- a/server/cmd/mmctl/commands/plugin.go +++ b/server/cmd/mmctl/commands/plugin.go @@ -7,8 +7,8 @@ import ( "context" "os" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/hashicorp/go-multierror" "github.com/pkg/errors" diff --git a/server/cmd/mmctl/commands/plugin_e2e_test.go b/server/cmd/mmctl/commands/plugin_e2e_test.go index 118df455305..21fee105a57 100644 --- a/server/cmd/mmctl/commands/plugin_e2e_test.go +++ b/server/cmd/mmctl/commands/plugin_e2e_test.go @@ -8,15 +8,15 @@ import ( "os" "github.com/hashicorp/go-multierror" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" "path/filepath" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) func (s *MmctlE2ETestSuite) TestPluginAddCmd() { diff --git a/server/cmd/mmctl/commands/plugin_marketplace.go b/server/cmd/mmctl/commands/plugin_marketplace.go index e62aedf4398..cdc4b96a06d 100644 --- a/server/cmd/mmctl/commands/plugin_marketplace.go +++ b/server/cmd/mmctl/commands/plugin_marketplace.go @@ -6,10 +6,10 @@ package commands import ( "context" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/server/cmd/mmctl/commands/plugin_marketplace_e2e_test.go b/server/cmd/mmctl/commands/plugin_marketplace_e2e_test.go index 8059781a79e..3c8ede33e6f 100644 --- a/server/cmd/mmctl/commands/plugin_marketplace_e2e_test.go +++ b/server/cmd/mmctl/commands/plugin_marketplace_e2e_test.go @@ -4,11 +4,11 @@ package commands import ( - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) func (s *MmctlE2ETestSuite) TestPluginMarketplaceInstallCmd() { diff --git a/server/cmd/mmctl/commands/plugin_marketplace_test.go b/server/cmd/mmctl/commands/plugin_marketplace_test.go index 5c474299370..3129715ae7e 100644 --- a/server/cmd/mmctl/commands/plugin_marketplace_test.go +++ b/server/cmd/mmctl/commands/plugin_marketplace_test.go @@ -6,10 +6,10 @@ package commands import ( "context" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/plugin_test.go b/server/cmd/mmctl/commands/plugin_test.go index b961e7d5bd0..1397b70d2ff 100644 --- a/server/cmd/mmctl/commands/plugin_test.go +++ b/server/cmd/mmctl/commands/plugin_test.go @@ -12,10 +12,10 @@ import ( "github.com/golang/mock/gomock" "github.com/hashicorp/go-multierror" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/post.go b/server/cmd/mmctl/commands/post.go index 3db6505704c..74c9c18e5c1 100644 --- a/server/cmd/mmctl/commands/post.go +++ b/server/cmd/mmctl/commands/post.go @@ -9,10 +9,10 @@ import ( "fmt" "time" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/hashicorp/go-multierror" "github.com/pkg/errors" diff --git a/server/cmd/mmctl/commands/post_e2e_test.go b/server/cmd/mmctl/commands/post_e2e_test.go index d556495cc33..2a9fc606f26 100644 --- a/server/cmd/mmctl/commands/post_e2e_test.go +++ b/server/cmd/mmctl/commands/post_e2e_test.go @@ -6,10 +6,10 @@ package commands import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func (s *MmctlE2ETestSuite) TestPostListCmd() { diff --git a/server/cmd/mmctl/commands/post_test.go b/server/cmd/mmctl/commands/post_test.go index ea95a263b8e..ca5f76dd2df 100644 --- a/server/cmd/mmctl/commands/post_test.go +++ b/server/cmd/mmctl/commands/post_test.go @@ -7,11 +7,11 @@ import ( "context" "time" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) func (s *MmctlUnitTestSuite) TestPostCreateCmdF() { diff --git a/server/cmd/mmctl/commands/roles.go b/server/cmd/mmctl/commands/roles.go index f2baaab892c..080dc806438 100644 --- a/server/cmd/mmctl/commands/roles.go +++ b/server/cmd/mmctl/commands/roles.go @@ -9,10 +9,10 @@ import ( "strings" "github.com/hashicorp/go-multierror" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/roles_test.go b/server/cmd/mmctl/commands/roles_test.go index 266ef574d39..0985802347a 100644 --- a/server/cmd/mmctl/commands/roles_test.go +++ b/server/cmd/mmctl/commands/roles_test.go @@ -8,10 +8,10 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/root.go b/server/cmd/mmctl/commands/root.go index f583ea77d4f..9d115900951 100644 --- a/server/cmd/mmctl/commands/root.go +++ b/server/cmd/mmctl/commands/root.go @@ -12,9 +12,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) func Run(args []string) error { diff --git a/server/cmd/mmctl/commands/saml.go b/server/cmd/mmctl/commands/saml.go index a4d5e2a0dea..935d22f6c68 100644 --- a/server/cmd/mmctl/commands/saml.go +++ b/server/cmd/mmctl/commands/saml.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/saml_test.go b/server/cmd/mmctl/commands/saml_test.go index 28153016ea4..4e0eeb97f17 100644 --- a/server/cmd/mmctl/commands/saml_test.go +++ b/server/cmd/mmctl/commands/saml_test.go @@ -6,9 +6,9 @@ package commands import ( "context" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/sampledata.go b/server/cmd/mmctl/commands/sampledata.go index 02e12dc0d04..0b1e0c5315a 100644 --- a/server/cmd/mmctl/commands/sampledata.go +++ b/server/cmd/mmctl/commands/sampledata.go @@ -15,14 +15,14 @@ import ( "sort" "time" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/v8/channels/app/imports" - "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/channels/app/imports" + "github.com/mattermost/mattermost/server/v8/channels/utils" - "github.com/mattermost/mattermost-server/server/public/model" - pUtils "github.com/mattermost/mattermost-server/server/public/utils" + "github.com/mattermost/mattermost/server/public/model" + pUtils "github.com/mattermost/mattermost/server/public/utils" "github.com/icrowley/fake" "github.com/spf13/cobra" diff --git a/server/cmd/mmctl/commands/sampledata_test.go b/server/cmd/mmctl/commands/sampledata_test.go index 608a3671c1b..8a14d7ab971 100644 --- a/server/cmd/mmctl/commands/sampledata_test.go +++ b/server/cmd/mmctl/commands/sampledata_test.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "os" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/sampledata_util.go b/server/cmd/mmctl/commands/sampledata_util.go index 7dc2af9511c..ab8a0520281 100644 --- a/server/cmd/mmctl/commands/sampledata_util.go +++ b/server/cmd/mmctl/commands/sampledata_util.go @@ -11,9 +11,9 @@ import ( "strings" "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/imports" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/imports" "github.com/icrowley/fake" ) diff --git a/server/cmd/mmctl/commands/system.go b/server/cmd/mmctl/commands/system.go index 9d1817cccf4..93d8d4edcf5 100644 --- a/server/cmd/mmctl/commands/system.go +++ b/server/cmd/mmctl/commands/system.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) var SystemCmd = &cobra.Command{ diff --git a/server/cmd/mmctl/commands/system_e2e_test.go b/server/cmd/mmctl/commands/system_e2e_test.go index 438196b64a0..a9de1f6f8c3 100644 --- a/server/cmd/mmctl/commands/system_e2e_test.go +++ b/server/cmd/mmctl/commands/system_e2e_test.go @@ -6,10 +6,10 @@ package commands import ( "time" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/system_test.go b/server/cmd/mmctl/commands/system_test.go index 326fceb4013..66e72f67e0a 100644 --- a/server/cmd/mmctl/commands/system_test.go +++ b/server/cmd/mmctl/commands/system_test.go @@ -9,10 +9,10 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/team.go b/server/cmd/mmctl/commands/team.go index 822cbd7e11c..332708605f6 100644 --- a/server/cmd/mmctl/commands/team.go +++ b/server/cmd/mmctl/commands/team.go @@ -10,10 +10,10 @@ import ( "sort" "github.com/hashicorp/go-multierror" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/team_e2e_test.go b/server/cmd/mmctl/commands/team_e2e_test.go index 881a8872e65..ce6004fafcf 100644 --- a/server/cmd/mmctl/commands/team_e2e_test.go +++ b/server/cmd/mmctl/commands/team_e2e_test.go @@ -11,10 +11,10 @@ import ( "github.com/spf13/cobra" "github.com/hashicorp/go-multierror" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) func (s *MmctlE2ETestSuite) TestRenameTeamCmdF() { diff --git a/server/cmd/mmctl/commands/team_test.go b/server/cmd/mmctl/commands/team_test.go index fadcc475816..57ed42f21d1 100644 --- a/server/cmd/mmctl/commands/team_test.go +++ b/server/cmd/mmctl/commands/team_test.go @@ -10,9 +10,9 @@ import ( "net/http" "github.com/hashicorp/go-multierror" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/team_users.go b/server/cmd/mmctl/commands/team_users.go index 73925d2d6b4..d13c0bb141d 100644 --- a/server/cmd/mmctl/commands/team_users.go +++ b/server/cmd/mmctl/commands/team_users.go @@ -9,11 +9,11 @@ import ( "fmt" "github.com/hashicorp/go-multierror" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) var TeamUsersCmd = &cobra.Command{ diff --git a/server/cmd/mmctl/commands/team_users_e2e_test.go b/server/cmd/mmctl/commands/team_users_e2e_test.go index 4c2255f032e..a8d5b36b890 100644 --- a/server/cmd/mmctl/commands/team_users_e2e_test.go +++ b/server/cmd/mmctl/commands/team_users_e2e_test.go @@ -6,12 +6,12 @@ import ( "fmt" "github.com/hashicorp/go-multierror" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/channels/api4" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/api4" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) func (s *MmctlE2ETestSuite) TestTeamUserAddCmd() { diff --git a/server/cmd/mmctl/commands/team_users_test.go b/server/cmd/mmctl/commands/team_users_test.go index 4d896f2f168..3bc727ac52d 100644 --- a/server/cmd/mmctl/commands/team_users_test.go +++ b/server/cmd/mmctl/commands/team_users_test.go @@ -7,10 +7,10 @@ import ( "errors" "net/http" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) func (s *MmctlUnitTestSuite) TestTeamUsersArchiveCmd() { diff --git a/server/cmd/mmctl/commands/teamargs.go b/server/cmd/mmctl/commands/teamargs.go index fc79cc04255..d5e0dc3004e 100644 --- a/server/cmd/mmctl/commands/teamargs.go +++ b/server/cmd/mmctl/commands/teamargs.go @@ -9,9 +9,9 @@ import ( "fmt" "github.com/hashicorp/go-multierror" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" ) func getTeamsFromTeamArgs(c client.Client, teamArgs []string) []*model.Team { diff --git a/server/cmd/mmctl/commands/teamargs_test.go b/server/cmd/mmctl/commands/teamargs_test.go index 89cd0d2dfd3..cb3bf0a19b9 100644 --- a/server/cmd/mmctl/commands/teamargs_test.go +++ b/server/cmd/mmctl/commands/teamargs_test.go @@ -8,7 +8,7 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" ) diff --git a/server/cmd/mmctl/commands/token.go b/server/cmd/mmctl/commands/token.go index b029774e84f..b453bf4ce62 100644 --- a/server/cmd/mmctl/commands/token.go +++ b/server/cmd/mmctl/commands/token.go @@ -7,8 +7,8 @@ import ( "context" "net/http" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/server/cmd/mmctl/commands/token_e2e_test.go b/server/cmd/mmctl/commands/token_e2e_test.go index d4a1ab8404c..85da6d99646 100644 --- a/server/cmd/mmctl/commands/token_e2e_test.go +++ b/server/cmd/mmctl/commands/token_e2e_test.go @@ -6,11 +6,11 @@ package commands import ( "fmt" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) func (s *MmctlE2ETestSuite) TestTokenGenerateForUserCmd() { diff --git a/server/cmd/mmctl/commands/token_test.go b/server/cmd/mmctl/commands/token_test.go index 3d61f096ba6..ccbc39a8b9a 100644 --- a/server/cmd/mmctl/commands/token_test.go +++ b/server/cmd/mmctl/commands/token_test.go @@ -8,10 +8,10 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/user.go b/server/cmd/mmctl/commands/user.go index 97a825c5215..3a3f5de89bc 100644 --- a/server/cmd/mmctl/commands/user.go +++ b/server/cmd/mmctl/commands/user.go @@ -10,10 +10,10 @@ import ( "io/ioutil" "net/http" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/hashicorp/go-multierror" "github.com/pkg/errors" diff --git a/server/cmd/mmctl/commands/user_e2e_test.go b/server/cmd/mmctl/commands/user_e2e_test.go index d85c825aa22..6d0fb28c3da 100644 --- a/server/cmd/mmctl/commands/user_e2e_test.go +++ b/server/cmd/mmctl/commands/user_e2e_test.go @@ -8,11 +8,11 @@ import ( "net/http" "github.com/hashicorp/go-multierror" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) func (s *MmctlE2ETestSuite) TestUserActivateCmd() { diff --git a/server/cmd/mmctl/commands/user_test.go b/server/cmd/mmctl/commands/user_test.go index 323f55df1ff..b8b03c7bff6 100644 --- a/server/cmd/mmctl/commands/user_test.go +++ b/server/cmd/mmctl/commands/user_test.go @@ -13,9 +13,9 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/hashicorp/go-multierror" "github.com/pkg/errors" diff --git a/server/cmd/mmctl/commands/userargs.go b/server/cmd/mmctl/commands/userargs.go index dbbd4322d97..f899faaff13 100644 --- a/server/cmd/mmctl/commands/userargs.go +++ b/server/cmd/mmctl/commands/userargs.go @@ -10,9 +10,9 @@ import ( "strings" "github.com/hashicorp/go-multierror" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" ) func getUsersFromUserArgs(c client.Client, userArgs []string) []*model.User { diff --git a/server/cmd/mmctl/commands/userargs_test.go b/server/cmd/mmctl/commands/userargs_test.go index 11cc615b343..ae2dd49ee32 100644 --- a/server/cmd/mmctl/commands/userargs_test.go +++ b/server/cmd/mmctl/commands/userargs_test.go @@ -7,10 +7,10 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" ) func (s *MmctlUnitTestSuite) TestGetUserFromArgs() { diff --git a/server/cmd/mmctl/commands/utils.go b/server/cmd/mmctl/commands/utils.go index 700127b4020..5560c1c849b 100644 --- a/server/cmd/mmctl/commands/utils.go +++ b/server/cmd/mmctl/commands/utils.go @@ -11,7 +11,7 @@ import ( "os" "path/filepath" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" ) diff --git a/server/cmd/mmctl/commands/version.go b/server/cmd/mmctl/commands/version.go index b5a2956765f..5b2dd991ff4 100644 --- a/server/cmd/mmctl/commands/version.go +++ b/server/cmd/mmctl/commands/version.go @@ -7,8 +7,8 @@ import ( "fmt" "runtime" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/commands/webhook.go b/server/cmd/mmctl/commands/webhook.go index 1d896ee7cb4..be8d9f4bde4 100644 --- a/server/cmd/mmctl/commands/webhook.go +++ b/server/cmd/mmctl/commands/webhook.go @@ -6,10 +6,10 @@ package commands import ( "context" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/client" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/client" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/server/cmd/mmctl/commands/webhook_e2e_test.go b/server/cmd/mmctl/commands/webhook_e2e_test.go index 5409835124c..4e5e06ee046 100644 --- a/server/cmd/mmctl/commands/webhook_e2e_test.go +++ b/server/cmd/mmctl/commands/webhook_e2e_test.go @@ -6,9 +6,9 @@ package commands import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func (s *MmctlE2ETestSuite) TestCreateIncomingWebhookCmd() { diff --git a/server/cmd/mmctl/commands/webhook_test.go b/server/cmd/mmctl/commands/webhook_test.go index 9c255dcbd94..ba59d8a3b12 100644 --- a/server/cmd/mmctl/commands/webhook_test.go +++ b/server/cmd/mmctl/commands/webhook_test.go @@ -8,10 +8,10 @@ import ( "net/http" "strconv" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/printer" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer" "github.com/spf13/cobra" ) diff --git a/server/cmd/mmctl/mmctl.go b/server/cmd/mmctl/mmctl.go index 36cfbf9f5d5..2b94312d181 100644 --- a/server/cmd/mmctl/mmctl.go +++ b/server/cmd/mmctl/mmctl.go @@ -8,7 +8,7 @@ import ( _ "github.com/golang/mock/mockgen/model" - "github.com/mattermost/mattermost-server/server/v8/cmd/mmctl/commands" + "github.com/mattermost/mattermost/server/v8/cmd/mmctl/commands" ) func main() { diff --git a/server/cmd/mmctl/mocks/client_mock.go b/server/cmd/mmctl/mocks/client_mock.go index 3c1a566c4bf..a73a6e6fc47 100644 --- a/server/cmd/mmctl/mocks/client_mock.go +++ b/server/cmd/mmctl/mocks/client_mock.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/cmd/mmctl/client (interfaces: Client) +// Source: github.com/mattermost/mattermost/server/v8/cmd/mmctl/client (interfaces: Client) // Package mocks is a generated GoMock package. package mocks @@ -14,7 +14,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" ) // MockClient is a mock of Client interface. diff --git a/server/cmd/mmctl/printer/human/entry.go b/server/cmd/mmctl/printer/human/entry.go index 76473eb0e23..4a1bf2542e8 100644 --- a/server/cmd/mmctl/printer/human/entry.go +++ b/server/cmd/mmctl/printer/human/entry.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) type LogEntry struct { diff --git a/server/cmd/mmctl/printer/human/parser.go b/server/cmd/mmctl/printer/human/parser.go index 241721b61d7..fd16259bfe4 100644 --- a/server/cmd/mmctl/printer/human/parser.go +++ b/server/cmd/mmctl/printer/human/parser.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) func ParseLogMessage(msg string) LogEntry { diff --git a/server/config/client.go b/server/config/client.go index b4adc9201aa..b2ed9b2886f 100644 --- a/server/config/client.go +++ b/server/config/client.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/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 8d0fb679b05..56b9ddb3f11 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestGetClientConfig(t *testing.T) { diff --git a/server/config/common_test.go b/server/config/common_test.go index 2663a214082..980b8cdb5fd 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/public/model" + "github.com/mattermost/mattermost/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 8991dd0df49..84141440711 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" "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 72f9ed4bd5c..e525f6c6a40 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func getDsn(driver string, source string) string { diff --git a/server/config/diff.go b/server/config/diff.go index 095cf677c16..ab744844c09 100644 --- a/server/config/diff.go +++ b/server/config/diff.go @@ -7,7 +7,7 @@ import ( "fmt" "reflect" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type ConfigDiffs []ConfigDiff diff --git a/server/config/diff_test.go b/server/config/diff_test.go index 047c515131a..4f9d8cdf4fe 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/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/stretchr/testify/require" ) diff --git a/server/config/emitter.go b/server/config/emitter.go index 11d1ff6aca9..327a7c3a857 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 41a04839338..a5128c8b890 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) func TestEmitter(t *testing.T) { diff --git a/server/config/environment.go b/server/config/environment.go index 807af6272f1..576769cd868 100644 --- a/server/config/environment.go +++ b/server/config/environment.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func GetEnvironment() map[string]string { diff --git a/server/config/environment_test.go b/server/config/environment_test.go index 1973aa0eef3..c387c6f7178 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func modifiedDefault(modify func(*model.Config)) *model.Config { diff --git a/server/config/file.go b/server/config/file.go index f293406323c..40910bc7648 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) var ( diff --git a/server/config/file_test.go b/server/config/file_test.go index 64c888e0ac3..db696e0311e 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) func setupConfigFile(t *testing.T, cfg *model.Config) (string, func()) { diff --git a/server/config/logconfigsrc.go b/server/config/logconfigsrc.go index a6f4e433d07..4f63ec1a844 100644 --- a/server/config/logconfigsrc.go +++ b/server/config/logconfigsrc.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/config/logger.go b/server/config/logger.go index 09e53c70cdc..dbac4aad2e1 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) const ( diff --git a/server/config/logger_test.go b/server/config/logger_test.go index fc8474edf2c..d415fd6b120 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) func TestMloggerConfigFromAuditConfig(t *testing.T) { diff --git a/server/config/main_test.go b/server/config/main_test.go index ddbbd0e9cb2..e33b4570f1b 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/testlib" ) var mainHelper *testlib.MainHelper diff --git a/server/config/memory.go b/server/config/memory.go index bfc5a92610c..24434a35e44 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/public/model" + "github.com/mattermost/mattermost/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 bf7d5d353b4..e69efe4396d 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type cleanUpFn func(store *Store) diff --git a/server/config/store.go b/server/config/store.go index b56e5c251c1..3353ebeb374 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/i18n" - "github.com/mattermost/mattermost-server/server/public/utils" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/utils" ) var ( diff --git a/server/config/utils.go b/server/config/utils.go index fe840ad0832..ba8de8de956 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) // 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 5485360735b..435e13b92f9 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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) func TestDesanitize(t *testing.T) { diff --git a/server/einterfaces/account_migration.go b/server/einterfaces/account_migration.go index 6fc83901819..ccbf52df221 100644 --- a/server/einterfaces/account_migration.go +++ b/server/einterfaces/account_migration.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type AccountMigrationInterface interface { diff --git a/server/einterfaces/cloud.go b/server/einterfaces/cloud.go index 15e4a5bb0d2..edc897c39d2 100644 --- a/server/einterfaces/cloud.go +++ b/server/einterfaces/cloud.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type CloudInterface interface { diff --git a/server/einterfaces/cluster.go b/server/einterfaces/cluster.go index 71beb8adab3..488e6a8b69c 100644 --- a/server/einterfaces/cluster.go +++ b/server/einterfaces/cluster.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type ClusterMessageHandler func(msg *model.ClusterMessage) diff --git a/server/einterfaces/compliance.go b/server/einterfaces/compliance.go index 02e28c4e25a..4409ed2d7dc 100644 --- a/server/einterfaces/compliance.go +++ b/server/einterfaces/compliance.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type ComplianceInterface interface { diff --git a/server/einterfaces/data_retention.go b/server/einterfaces/data_retention.go index 2ba81e635b6..a7a4c37efaa 100644 --- a/server/einterfaces/data_retention.go +++ b/server/einterfaces/data_retention.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type DataRetentionInterface interface { diff --git a/server/einterfaces/jobs/cloud_interface.go b/server/einterfaces/jobs/cloud_interface.go index 731c91a4628..15214355cc5 100644 --- a/server/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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type CloudJobInterface interface { diff --git a/server/einterfaces/jobs/data_retention.go b/server/einterfaces/jobs/data_retention.go index 8952e86ea0d..2a1e4b6a2a4 100644 --- a/server/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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type DataRetentionJobInterface interface { diff --git a/server/einterfaces/jobs/elasticsearch.go b/server/einterfaces/jobs/elasticsearch.go index dd78e901709..892880579e4 100644 --- a/server/einterfaces/jobs/elasticsearch.go +++ b/server/einterfaces/jobs/elasticsearch.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type ElasticsearchIndexerInterface interface { diff --git a/server/einterfaces/jobs/indexer_interface.go b/server/einterfaces/jobs/indexer_interface.go index bfa6a14707c..7367536b26f 100644 --- a/server/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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type IndexerJobInterface interface { diff --git a/server/einterfaces/jobs/ldap_sync.go b/server/einterfaces/jobs/ldap_sync.go index 331e257d0c6..bc1b20c7fb8 100644 --- a/server/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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type LdapSyncInterface interface { diff --git a/server/einterfaces/jobs/message_export.go b/server/einterfaces/jobs/message_export.go index 470cd2fce2c..b33d07585dd 100644 --- a/server/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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type MessageExportJobInterface interface { diff --git a/server/einterfaces/ldap.go b/server/einterfaces/ldap.go index da225a77bc8..2e2bbdfed2a 100644 --- a/server/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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type LdapInterface interface { diff --git a/server/einterfaces/license.go b/server/einterfaces/license.go index 87fa2fc6c85..93b22b5a15b 100644 --- a/server/einterfaces/license.go +++ b/server/einterfaces/license.go @@ -3,7 +3,7 @@ package einterfaces -import "github.com/mattermost/mattermost-server/server/public/model" +import "github.com/mattermost/mattermost/server/public/model" type LicenseInterface interface { CanStartTrial() (bool, error) diff --git a/server/einterfaces/message_export.go b/server/einterfaces/message_export.go index 34efe3342e2..9ee0f150f10 100644 --- a/server/einterfaces/message_export.go +++ b/server/einterfaces/message_export.go @@ -6,7 +6,7 @@ package einterfaces import ( "context" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type MessageExportInterface interface { diff --git a/server/einterfaces/metrics.go b/server/einterfaces/metrics.go index 66124185269..57984754793 100644 --- a/server/einterfaces/metrics.go +++ b/server/einterfaces/metrics.go @@ -6,8 +6,8 @@ package einterfaces import ( "database/sql" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) type MetricsInterface interface { diff --git a/server/einterfaces/mfa.go b/server/einterfaces/mfa.go index 204c907c68b..f98494fd00e 100644 --- a/server/einterfaces/mfa.go +++ b/server/einterfaces/mfa.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type MfaInterface interface { diff --git a/server/einterfaces/mocks/AccountMigrationInterface.go b/server/einterfaces/mocks/AccountMigrationInterface.go index 41f24d4fe60..508aa1982b9 100644 --- a/server/einterfaces/mocks/AccountMigrationInterface.go +++ b/server/einterfaces/mocks/AccountMigrationInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/AppContextInterface.go b/server/einterfaces/mocks/AppContextInterface.go index f1154207521..d97ff048915 100644 --- a/server/einterfaces/mocks/AppContextInterface.go +++ b/server/einterfaces/mocks/AppContextInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/CloudInterface.go b/server/einterfaces/mocks/CloudInterface.go index ea58d0ad1d8..74541356ae6 100644 --- a/server/einterfaces/mocks/CloudInterface.go +++ b/server/einterfaces/mocks/CloudInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/CloudJobInterface.go b/server/einterfaces/mocks/CloudJobInterface.go index 64554964eb2..9a609ff6374 100644 --- a/server/einterfaces/mocks/CloudJobInterface.go +++ b/server/einterfaces/mocks/CloudJobInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/ClusterInterface.go b/server/einterfaces/mocks/ClusterInterface.go index 14017fb1869..9530431f585 100644 --- a/server/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/einterfaces" + einterfaces "github.com/mattermost/mattermost/server/v8/einterfaces" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" ) // ClusterInterface is an autogenerated mock type for the ClusterInterface type diff --git a/server/einterfaces/mocks/ClusterMessageHandler.go b/server/einterfaces/mocks/ClusterMessageHandler.go index 3e01adcefa4..6eeab343bbf 100644 --- a/server/einterfaces/mocks/ClusterMessageHandler.go +++ b/server/einterfaces/mocks/ClusterMessageHandler.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/ComplianceInterface.go b/server/einterfaces/mocks/ComplianceInterface.go index 8558c76ff13..e94424f3e43 100644 --- a/server/einterfaces/mocks/ComplianceInterface.go +++ b/server/einterfaces/mocks/ComplianceInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/DataRetentionInterface.go b/server/einterfaces/mocks/DataRetentionInterface.go index f7ac4b2b4c9..ea03a72b203 100644 --- a/server/einterfaces/mocks/DataRetentionInterface.go +++ b/server/einterfaces/mocks/DataRetentionInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/DataRetentionJobInterface.go b/server/einterfaces/mocks/DataRetentionJobInterface.go index a734fa2346e..ea4bd29a692 100644 --- a/server/einterfaces/mocks/DataRetentionJobInterface.go +++ b/server/einterfaces/mocks/DataRetentionJobInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/ElasticsearchAggregatorInterface.go b/server/einterfaces/mocks/ElasticsearchAggregatorInterface.go index 6d838946d3f..09a59bdaa35 100644 --- a/server/einterfaces/mocks/ElasticsearchAggregatorInterface.go +++ b/server/einterfaces/mocks/ElasticsearchAggregatorInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/ElasticsearchFixChannelIndexInterface.go b/server/einterfaces/mocks/ElasticsearchFixChannelIndexInterface.go index 42ee06a610c..c1e51575290 100644 --- a/server/einterfaces/mocks/ElasticsearchFixChannelIndexInterface.go +++ b/server/einterfaces/mocks/ElasticsearchFixChannelIndexInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/ElasticsearchIndexerInterface.go b/server/einterfaces/mocks/ElasticsearchIndexerInterface.go index 49ab7b1d2a5..7b6a0dd66bc 100644 --- a/server/einterfaces/mocks/ElasticsearchIndexerInterface.go +++ b/server/einterfaces/mocks/ElasticsearchIndexerInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/IndexerJobInterface.go b/server/einterfaces/mocks/IndexerJobInterface.go index 19b0f469f7c..1c0a6c4cbc8 100644 --- a/server/einterfaces/mocks/IndexerJobInterface.go +++ b/server/einterfaces/mocks/IndexerJobInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/LdapInterface.go b/server/einterfaces/mocks/LdapInterface.go index 7c6bdc8f310..32e9ab2bd92 100644 --- a/server/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/public/model" + request "github.com/mattermost/mattermost/server/v8/channels/app/request" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/LdapSyncInterface.go b/server/einterfaces/mocks/LdapSyncInterface.go index 8edcc942656..c5329297cba 100644 --- a/server/einterfaces/mocks/LdapSyncInterface.go +++ b/server/einterfaces/mocks/LdapSyncInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/LicenseInterface.go b/server/einterfaces/mocks/LicenseInterface.go index ad84699bccc..44606c59068 100644 --- a/server/einterfaces/mocks/LicenseInterface.go +++ b/server/einterfaces/mocks/LicenseInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/MessageExportInterface.go b/server/einterfaces/mocks/MessageExportInterface.go index ff64cce685b..e2066bcda23 100644 --- a/server/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/public/model" + model "github.com/mattermost/mattermost/server/public/model" ) // MessageExportInterface is an autogenerated mock type for the MessageExportInterface type diff --git a/server/einterfaces/mocks/MessageExportJobInterface.go b/server/einterfaces/mocks/MessageExportJobInterface.go index f9beca7333a..b39003ac3a3 100644 --- a/server/einterfaces/mocks/MessageExportJobInterface.go +++ b/server/einterfaces/mocks/MessageExportJobInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/MetricsInterface.go b/server/einterfaces/mocks/MetricsInterface.go index f1b802aa34b..058ec05a1d4 100644 --- a/server/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/public/model" + model "github.com/mattermost/mattermost/server/public/model" sql "database/sql" ) diff --git a/server/einterfaces/mocks/MfaInterface.go b/server/einterfaces/mocks/MfaInterface.go index da43bdac5a2..c2ae8a52a6c 100644 --- a/server/einterfaces/mocks/MfaInterface.go +++ b/server/einterfaces/mocks/MfaInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/NotificationInterface.go b/server/einterfaces/mocks/NotificationInterface.go index 0376f10e8ff..267acd6eb23 100644 --- a/server/einterfaces/mocks/NotificationInterface.go +++ b/server/einterfaces/mocks/NotificationInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/OAuthProvider.go b/server/einterfaces/mocks/OAuthProvider.go index 9d9dc543d43..c46d7be8e67 100644 --- a/server/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/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/ResendInvitationEmailJobInterface.go b/server/einterfaces/mocks/ResendInvitationEmailJobInterface.go index 969e2485fe6..4d915ad284c 100644 --- a/server/einterfaces/mocks/ResendInvitationEmailJobInterface.go +++ b/server/einterfaces/mocks/ResendInvitationEmailJobInterface.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/SamlInterface.go b/server/einterfaces/mocks/SamlInterface.go index 6fe5d2a30aa..3e9de0f0931 100644 --- a/server/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/public/model" + request "github.com/mattermost/mattermost/server/v8/channels/app/request" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/notification.go b/server/einterfaces/notification.go index 0759b8ea3f8..421713be4ff 100644 --- a/server/einterfaces/notification.go +++ b/server/einterfaces/notification.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type NotificationInterface interface { diff --git a/server/einterfaces/oauthproviders.go b/server/einterfaces/oauthproviders.go index bf58d71f980..1e74d87aa5b 100644 --- a/server/einterfaces/oauthproviders.go +++ b/server/einterfaces/oauthproviders.go @@ -6,7 +6,7 @@ package einterfaces import ( "io" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type OAuthProvider interface { diff --git a/server/einterfaces/saml.go b/server/einterfaces/saml.go index 72404b8257e..35dfd3fedef 100644 --- a/server/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/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/request" ) type SamlInterface interface { diff --git a/server/go.mod b/server/go.mod index cd4dc879e78..bfffbfa7384 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,4 +1,4 @@ -module github.com/mattermost/mattermost-server/server/v8 +module github.com/mattermost/mattermost/server/v8 go 1.19 @@ -46,7 +46,7 @@ require ( 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/mattermost/server/public v0.0.0-00010101000000-000000000000 github.com/mattermost/morph v1.0.5-0.20230511171014-e76e25978d56 github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0 github.com/mattermost/squirrel v0.2.0 @@ -255,4 +255,4 @@ exclude ( github.com/willf/bitset v1.2.0 ) -replace github.com/mattermost/mattermost-server/server/public => ./public +replace github.com/mattermost/mattermost/server/public => ./public diff --git a/server/platform/services/awsmeter/awsmeter.go b/server/platform/services/awsmeter/awsmeter.go index 784adf05461..d3b0b09d1d4 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" ) type AwsMeter struct { diff --git a/server/platform/services/awsmeter/awsmeter_test.go b/server/platform/services/awsmeter/awsmeter_test.go index a68d120c2ce..c9b20a6f037 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) type mockMarketplaceMeteringClient struct { diff --git a/server/platform/services/cache/cache.go b/server/platform/services/cache/cache.go index 771825b7a44..9e2530b0d98 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/public/model" + "github.com/mattermost/mattermost/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 1bebedc16b6..36a92d93d46 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/public/model" + "github.com/mattermost/mattermost/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 030878c9e92..85759dc5960 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) // LRUStriped keeps LRU caches in buckets in order to lower mutex contention. diff --git a/server/platform/services/cache/lru_striped_bench_test.go b/server/platform/services/cache/lru_striped_bench_test.go index 8b88accf0bf..0f6f4dc03f1 100644 --- a/server/platform/services/cache/lru_striped_bench_test.go +++ b/server/platform/services/cache/lru_striped_bench_test.go @@ -11,7 +11,7 @@ import ( "github.com/cespare/xxhash/v2" - "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" + "github.com/mattermost/mattermost/server/v8/platform/services/cache" ) const ( diff --git a/server/platform/services/cache/lru_striped_test.go b/server/platform/services/cache/lru_striped_test.go index 0aeeb4f99bb..0ae27706a75 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/public/model" + "github.com/mattermost/mattermost/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 4d536153b94..4ccfcaf7819 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func TestLRU(t *testing.T) { diff --git a/server/platform/services/cache/mocks/Provider.go b/server/platform/services/cache/mocks/Provider.go index 3fb26fb355a..d9f82e2585d 100644 --- a/server/platform/services/cache/mocks/Provider.go +++ b/server/platform/services/cache/mocks/Provider.go @@ -5,7 +5,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - cache "github.com/mattermost/mattermost-server/server/v8/platform/services/cache" + cache "github.com/mattermost/mattermost/server/v8/platform/services/cache" ) // Provider is an autogenerated mock type for the Provider type diff --git a/server/platform/services/cache/provider.go b/server/platform/services/cache/provider.go index d6767b5e915..31e4c839c5f 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/public/model" + "github.com/mattermost/mattermost/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 4dd3ddca78f..e25981528be 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/public/model" + "github.com/mattermost/mattermost/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 c9eabab5f8d..f8874b7f58f 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/public/model" + "github.com/mattermost/mattermost/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 02677b18f70..6cc978faa87 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) type combineExtractor struct { diff --git a/server/platform/services/docextractor/docextractor_test.go b/server/platform/services/docextractor/docextractor_test.go index aa17f1fbb81..7cad5445e08 100644 --- a/server/platform/services/docextractor/docextractor_test.go +++ b/server/platform/services/docextractor/docextractor_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" ) func TestExtract(t *testing.T) { diff --git a/server/platform/services/docextractor/pdf_test.go b/server/platform/services/docextractor/pdf_test.go index b6eea1a410a..e191ed52921 100644 --- a/server/platform/services/docextractor/pdf_test.go +++ b/server/platform/services/docextractor/pdf_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" ) func TestPdfEmptyFile(t *testing.T) { diff --git a/server/platform/services/httpservice/httpservice.go b/server/platform/services/httpservice/httpservice.go index 6572b0f1b9b..9a2b941a266 100644 --- a/server/platform/services/httpservice/httpservice.go +++ b/server/platform/services/httpservice/httpservice.go @@ -10,7 +10,7 @@ import ( "time" "unicode" - "github.com/mattermost/mattermost-server/server/v8/platform/services/configservice" + "github.com/mattermost/mattermost/server/v8/platform/services/configservice" ) // HTTPService wraps the functionality for making http requests to provide some improvements to the default client diff --git a/server/platform/services/imageproxy/atmos_camo_test.go b/server/platform/services/imageproxy/atmos_camo_test.go index 6a6f4dd4a35..4ada5cd0141 100644 --- a/server/platform/services/imageproxy/atmos_camo_test.go +++ b/server/platform/services/imageproxy/atmos_camo_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/v8/channels/utils/testutils" - "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost/server/v8/platform/services/httpservice" ) func makeTestAtmosCamoProxy() *ImageProxy { diff --git a/server/platform/services/imageproxy/imageproxy.go b/server/platform/services/imageproxy/imageproxy.go index 834f70444c6..f9e5d6e13f8 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/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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/platform/services/configservice" + "github.com/mattermost/mattermost/server/v8/platform/services/httpservice" ) 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 78f73c691cd..d1ac69c8c15 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/public/shared/mlog" + "github.com/mattermost/mattermost/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 48b6a325826..59c82cc7e03 100644 --- a/server/platform/services/imageproxy/local_test.go +++ b/server/platform/services/imageproxy/local_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/v8/channels/utils/testutils" - "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost/server/v8/platform/services/httpservice" ) func makeTestLocalProxy() *ImageProxy { diff --git a/server/platform/services/marketplace/client.go b/server/platform/services/marketplace/client.go index c1158c4589b..4165b427898 100644 --- a/server/platform/services/marketplace/client.go +++ b/server/platform/services/marketplace/client.go @@ -12,8 +12,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/platform/services/httpservice" ) // Client is the programmatic interface to the marketplace server API. diff --git a/server/platform/services/remotecluster/invitation.go b/server/platform/services/remotecluster/invitation.go index 4621eea8d87..76f1eeb13e4 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/public/model" + "github.com/mattermost/mattermost/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 5a8c6fe0767..37c7d24b8a3 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/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/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) type mockServer struct { diff --git a/server/platform/services/remotecluster/ping.go b/server/platform/services/remotecluster/ping.go index f5f9d321982..30f3bc8255f 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 57c2db30dd8..73978b03bbc 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) const ( diff --git a/server/platform/services/remotecluster/recv.go b/server/platform/services/remotecluster/recv.go index f2cff44c7d3..a501a8cb09d 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 abfe3da343c..9d3a3921736 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) const ( diff --git a/server/platform/services/remotecluster/sendfile.go b/server/platform/services/remotecluster/sendfile.go index c5d1a7ca0f6..ec89f92a2a4 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/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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) 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 fcad9e4303b..51ec410e83f 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 02fd90622f8..3b9b98ebd3d 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 c1770f17465..a200297332e 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) const ( diff --git a/server/platform/services/remotecluster/service.go b/server/platform/services/remotecluster/service.go index 4d44a94d2f3..e9b1b07f78e 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/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/einterfaces" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/einterfaces" ) const ( diff --git a/server/platform/services/remotecluster/service_test.go b/server/platform/services/remotecluster/service_test.go index 26404f12e3a..9e20377c757 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/public/model" + "github.com/mattermost/mattermost/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 5a422baa1b9..2fb503b9362 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 0f08707e9b0..3e166723ec0 100644 --- a/server/platform/services/searchengine/bleveengine/bleve_test.go +++ b/server/platform/services/searchengine/bleveengine/bleve_test.go @@ -11,13 +11,13 @@ 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/platform/services/searchengine" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/searchlayer" + "github.com/mattermost/mattermost/server/v8/channels/store/searchtest" + "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/testlib" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine" ) type BleveEngineTestSuite struct { diff --git a/server/platform/services/searchengine/bleveengine/common.go b/server/platform/services/searchengine/bleveengine/common.go index f99509fadf1..0ec62e76dfa 100644 --- a/server/platform/services/searchengine/bleveengine/common.go +++ b/server/platform/services/searchengine/bleveengine/common.go @@ -6,8 +6,8 @@ package bleveengine import ( "strings" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine" ) type BLVChannel struct { diff --git a/server/platform/services/searchengine/bleveengine/indexer/indexing_job.go b/server/platform/services/searchengine/bleveengine/indexer/indexing_job.go index b2bcdaac120..33e4da6c70b 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/platform/services/searchengine/bleveengine" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/jobs" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine/bleveengine" ) 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 9a053de0e7e..50f434d367b 100644 --- a/server/platform/services/searchengine/bleveengine/indexer/indexing_job_test.go +++ b/server/platform/services/searchengine/bleveengine/indexer/indexing_job_test.go @@ -10,11 +10,11 @@ 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/platform/services/searchengine/bleveengine" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/jobs" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/utils/testutils" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine/bleveengine" ) func TestBleveIndexer(t *testing.T) { diff --git a/server/platform/services/searchengine/bleveengine/search.go b/server/platform/services/searchengine/bleveengine/search.go index 95c9209c6cc..e762c9ab1b0 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 8cae337b13a..47199bc8567 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/public/model" + "github.com/mattermost/mattermost/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 449b29033de..730f4c1be39 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/public/model" + "github.com/mattermost/mattermost/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 bb83e573a54..00b31f0229c 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/public/model" + model "github.com/mattermost/mattermost/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 1fd77dec197..67e52462ef7 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/public/model" + "github.com/mattermost/mattermost/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 7139ff408ef..422385fe252 100644 --- a/server/platform/services/searchengine/searchengine_test.go +++ b/server/platform/services/searchengine/searchengine_test.go @@ -6,8 +6,8 @@ package searchengine import ( "testing" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/platform/services/searchengine/mocks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine/mocks" "github.com/stretchr/testify/assert" ) diff --git a/server/platform/services/searchengine/utils.go b/server/platform/services/searchengine/utils.go index 4e19c698e9a..b523780c8e5 100644 --- a/server/platform/services/searchengine/utils.go +++ b/server/platform/services/searchengine/utils.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "github.com/mattermost/mattermost-server/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) var EmailRegex = regexp.MustCompile(`^[^\s"]+@[^\s"]+$`) diff --git a/server/platform/services/sharedchannel/attachment.go b/server/platform/services/sharedchannel/attachment.go index ee365afdde2..b9ddfbb03be 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/platform/services/remotecluster" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" ) // 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 74e458b2ae6..df83cabde5a 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/platform/services/remotecluster" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" ) // 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 20abcaa15ec..e55345ffa9b 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) 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 a81cef48fe8..8579a8960af 100644 --- a/server/platform/services/sharedchannel/mock_AppIface_test.go +++ b/server/platform/services/sharedchannel/mock_AppIface_test.go @@ -5,12 +5,12 @@ package sharedchannel import ( - filestore "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + filestore "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" - request "github.com/mattermost/mattermost-server/server/v8/channels/app/request" + request "github.com/mattermost/mattermost/server/v8/channels/app/request" ) // MockAppIface is an autogenerated mock type for the AppIface type diff --git a/server/platform/services/sharedchannel/mock_ServerIface_test.go b/server/platform/services/sharedchannel/mock_ServerIface_test.go index 5a30e16d661..b017fb8a27f 100644 --- a/server/platform/services/sharedchannel/mock_ServerIface_test.go +++ b/server/platform/services/sharedchannel/mock_ServerIface_test.go @@ -5,14 +5,14 @@ package sharedchannel import ( - mlog "github.com/mattermost/mattermost-server/server/public/shared/mlog" + mlog "github.com/mattermost/mattermost/server/public/shared/mlog" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" - remotecluster "github.com/mattermost/mattermost-server/server/v8/platform/services/remotecluster" + remotecluster "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" - store "github.com/mattermost/mattermost-server/server/v8/channels/store" + store "github.com/mattermost/mattermost/server/v8/channels/store" ) // MockServerIface is an autogenerated mock type for the ServerIface type diff --git a/server/platform/services/sharedchannel/msg.go b/server/platform/services/sharedchannel/msg.go index 1d38d38b599..7644b9938a8 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/public/model" + "github.com/mattermost/mattermost/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 f491e81c4ac..e827f12dfe8 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/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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) var ( diff --git a/server/platform/services/sharedchannel/permalink_test.go b/server/platform/services/sharedchannel/permalink_test.go index e278b609010..7dbbd4dfbf1 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/public/model" + "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) func TestProcessPermalinkToRemote(t *testing.T) { diff --git a/server/platform/services/sharedchannel/service.go b/server/platform/services/sharedchannel/service.go index bd1cce750e8..23621b57122 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/platform/services/remotecluster" - "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" + "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) const ( diff --git a/server/platform/services/sharedchannel/sync_recv.go b/server/platform/services/sharedchannel/sync_recv.go index b0a79733cd6..d28ddf7d749 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/platform/services/remotecluster" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" ) 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 1a3e67c4bbc..9e125848a15 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/platform/services/remotecluster" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" ) type syncTask struct { diff --git a/server/platform/services/sharedchannel/sync_send_remote.go b/server/platform/services/sharedchannel/sync_send_remote.go index 167c4a25b3a..c539b796032 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/platform/services/remotecluster" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" ) type sendSyncMsgResultFunc func(syncResp SyncResponse, err error) diff --git a/server/platform/services/sharedchannel/util.go b/server/platform/services/sharedchannel/util.go index b4ccb07c320..1b106cda3a6 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/public/model" + "github.com/mattermost/mattermost/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 f3b1c66e8c3..d6e820ab67a 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/public/shared/mlog" + "github.com/mattermost/mattermost/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 66689420fe8..eeab1219fdb 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 fd29c829901..f8d75970ad4 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" ) type slackChannel struct { diff --git a/server/platform/services/slackimport/slackimport_test.go b/server/platform/services/slackimport/slackimport_test.go index 8611a6e2fb5..d4e3f2a8a51 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestSlackConvertTimeStamp(t *testing.T) { diff --git a/server/platform/services/telemetry/mocks/ServerIface.go b/server/platform/services/telemetry/mocks/ServerIface.go index f480a8fe273..98e48cc9ca2 100644 --- a/server/platform/services/telemetry/mocks/ServerIface.go +++ b/server/platform/services/telemetry/mocks/ServerIface.go @@ -7,14 +7,14 @@ package mocks import ( context "context" - httpservice "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" + httpservice "github.com/mattermost/mattermost/server/v8/platform/services/httpservice" mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" - plugin "github.com/mattermost/mattermost-server/server/public/plugin" + plugin "github.com/mattermost/mattermost/server/public/plugin" - product "github.com/mattermost/mattermost-server/server/v8/channels/product" + product "github.com/mattermost/mattermost/server/v8/channels/product" ) // ServerIface is an autogenerated mock type for the ServerIface type diff --git a/server/platform/services/telemetry/telemetry.go b/server/platform/services/telemetry/telemetry.go index e7b478af683..fa59e9a31ef 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/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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/server/v8/channels/store" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost/server/v8/platform/services/marketplace" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine" ) const ( diff --git a/server/platform/services/telemetry/telemetry_test.go b/server/platform/services/telemetry/telemetry_test.go index 53ca9396bdc..13a2cff9ab7 100644 --- a/server/platform/services/telemetry/telemetry_test.go +++ b/server/platform/services/telemetry/telemetry_test.go @@ -20,16 +20,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/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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin/plugintest" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/product" + storeMocks "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" + "github.com/mattermost/mattermost/server/v8/config" + "github.com/mattermost/mattermost/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost/server/v8/platform/services/searchengine" + "github.com/mattermost/mattermost/server/v8/platform/services/telemetry/mocks" ) type FakeConfigService struct { diff --git a/server/platform/services/tracing/tracing.go b/server/platform/services/tracing/tracing.go index 27269d551d2..928d5d02287 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/public/shared/mlog" + "github.com/mattermost/mattermost/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 e164e46bc13..0bbc031ed02 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 1ac2797c13d..07cade3c700 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/public/model" + "github.com/mattermost/mattermost/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 cbbe86d04c7..6e7ab761c24 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/public/plugin" + "github.com/mattermost/mattermost/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 982321d7932..aaa4a1be969 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/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin" ) var ( diff --git a/server/platform/shared/driver/objects.go b/server/platform/shared/driver/objects.go index 5827e8900ec..12bf6f92f1d 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/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin" ) type wrapperTx struct { diff --git a/server/platform/shared/filestore/filesstore.go b/server/platform/shared/filestore/filesstore.go index 4578e776886..62e6402c234 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/public/model" + "github.com/mattermost/mattermost/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 6f7bfe1c0ad..ce926342ba5 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) func randomString() string { diff --git a/server/platform/shared/filestore/localstore.go b/server/platform/shared/filestore/localstore.go index 2c181c54134..d8c28d581c6 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/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/platform/shared/filestore/mocks/FileBackend.go b/server/platform/shared/filestore/mocks/FileBackend.go index a12156a569d..9a37de979f4 100644 --- a/server/platform/shared/filestore/mocks/FileBackend.go +++ b/server/platform/shared/filestore/mocks/FileBackend.go @@ -7,7 +7,7 @@ package mocks import ( io "io" - filestore "github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore" + filestore "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" mock "github.com/stretchr/testify/mock" diff --git a/server/platform/shared/filestore/s3store.go b/server/platform/shared/filestore/s3store.go index f382932f796..07acfb0c85a 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/public/shared/mlog" + "github.com/mattermost/mattermost/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 b780f8e61eb..60359b5069b 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/public/model" + "github.com/mattermost/mattermost/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 317e0432510..1825256bfe9 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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/platform/shared/mfa/mfa_test.go b/server/platform/shared/mfa/mfa_test.go index cd031532b3b..b771d79f228 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/public/plugin/plugintest/mock" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) func TestGenerateSecret(t *testing.T) { diff --git a/server/platform/shared/templates/templates.go b/server/platform/shared/templates/templates.go index 392c3f3dc40..c440136a9a5 100644 --- a/server/platform/shared/templates/templates.go +++ b/server/platform/shared/templates/templates.go @@ -13,7 +13,7 @@ import ( "github.com/fsnotify/fsnotify" - "github.com/mattermost/mattermost-server/server/v8/channels/utils/fileutils" + "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) // Container represents a set of templates that can be render diff --git a/server/playbooks/client/client.go b/server/playbooks/client/client.go index e86b84573e7..c5e19a1771b 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/public/model" + "github.com/mattermost/mattermost/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 15180477c43..fe7d2990d34 100644 --- a/server/playbooks/client/doc_test.go +++ b/server/playbooks/client/doc_test.go @@ -8,8 +8,8 @@ import ( "fmt" "log" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/playbooks/client" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/client" ) func Example() { diff --git a/server/playbooks/client/playbook_runs_test.go b/server/playbooks/client/playbook_runs_test.go index b5d51a4b357..015250d89f8 100644 --- a/server/playbooks/client/playbook_runs_test.go +++ b/server/playbooks/client/playbook_runs_test.go @@ -8,8 +8,8 @@ import ( "fmt" "log" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/playbooks/client" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/client" ) func ExamplePlaybookRunService_Get() { diff --git a/server/playbooks/client/playbooks_test.go b/server/playbooks/client/playbooks_test.go index a6c89064575..c3f46df4cbc 100644 --- a/server/playbooks/client/playbooks_test.go +++ b/server/playbooks/client/playbooks_test.go @@ -8,8 +8,8 @@ import ( "fmt" "log" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/playbooks/client" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/client" ) func ExamplePlaybooksService_Get() { diff --git a/server/playbooks/product/api_adapter.go b/server/playbooks/product/api_adapter.go index ca8664a031f..968d2535006 100644 --- a/server/playbooks/product/api_adapter.go +++ b/server/playbooks/product/api_adapter.go @@ -14,12 +14,12 @@ 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/playbooks/server/app" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" + "github.com/mattermost/mattermost/server/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" ) // normalizeAppError returns a truly nil error if appErr is nil diff --git a/server/playbooks/product/imports/playbooks_imports.go b/server/playbooks/product/imports/playbooks_imports.go index 4e8a5aeaa52..4a92bf66203 100644 --- a/server/playbooks/product/imports/playbooks_imports.go +++ b/server/playbooks/product/imports/playbooks_imports.go @@ -6,5 +6,5 @@ package imports import ( // Needed to ensure the init() method in the Playbooks product is run. // This file is copied to the mmserver imports package via makefile. - _ "github.com/mattermost/mattermost-server/server/v8/playbooks/product" + _ "github.com/mattermost/mattermost/server/v8/playbooks/product" ) diff --git a/server/playbooks/product/logrus.go b/server/playbooks/product/logrus.go index 71f6ed72bfb..aae38e06f21 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/public/shared/mlog" + "github.com/mattermost/mattermost/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 d645a1e634d..c8c5db64ed9 100644 --- a/server/playbooks/product/playbooks_product.go +++ b/server/playbooks/product/playbooks_product.go @@ -9,23 +9,23 @@ import ( "os" "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/playbooks/product/pluginapi/cluster" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/api" - "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/command" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/enterprise" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/metrics" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" - "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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/shared/mlog" + mmapp "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/product" + "github.com/mattermost/mattermost/server/v8/playbooks/product/pluginapi/cluster" + "github.com/mattermost/mattermost/server/v8/playbooks/server/api" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/bot" + "github.com/mattermost/mattermost/server/v8/playbooks/server/command" + "github.com/mattermost/mattermost/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost/server/v8/playbooks/server/enterprise" + "github.com/mattermost/mattermost/server/v8/playbooks/server/metrics" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" + "github.com/mattermost/mattermost/server/v8/playbooks/server/scheduler" + "github.com/mattermost/mattermost/server/v8/playbooks/server/sqlstore" + "github.com/mattermost/mattermost/server/v8/playbooks/server/telemetry" "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 7d8f69bea2a..7de02f11a36 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/public/model" + "github.com/mattermost/mattermost/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 7f7dca33aec..b29c786d0dd 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/public/model" + "github.com/mattermost/mattermost/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 854a31fd3ed..68c315e4f97 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/public/model" + "github.com/mattermost/mattermost/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 ea7d12c96b3..fd7a6b09142 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) const ( diff --git a/server/playbooks/server/api/actions.go b/server/playbooks/server/api/actions.go index 6047ecff62e..06336651042 100644 --- a/server/playbooks/server/api/actions.go +++ b/server/playbooks/server/api/actions.go @@ -9,8 +9,8 @@ import ( "net/http" "net/url" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" "github.com/gorilla/mux" diff --git a/server/playbooks/server/api/api.go b/server/playbooks/server/api/api.go index dc36fd606df..294dce4afc7 100644 --- a/server/playbooks/server/api/api.go +++ b/server/playbooks/server/api/api.go @@ -10,7 +10,7 @@ import ( "github.com/sirupsen/logrus" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost/server/v8/playbooks/server/config" ) // MaxRequestSize is the size limit for any incoming request diff --git a/server/playbooks/server/api/bot.go b/server/playbooks/server/api/bot.go index 1d66b27b1d5..158247b5515 100644 --- a/server/playbooks/server/api/bot.go +++ b/server/playbooks/server/api/bot.go @@ -13,11 +13,11 @@ import ( "github.com/sirupsen/logrus" "github.com/gorilla/mux" - "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" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/bot" + "github.com/mattermost/mattermost/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" ) type BotHandler struct { diff --git a/server/playbooks/server/api/categories.go b/server/playbooks/server/api/categories.go index 1dcf5903b7f..b9945baefe3 100644 --- a/server/playbooks/server/api/categories.go +++ b/server/playbooks/server/api/categories.go @@ -9,9 +9,9 @@ import ( "net/http" "github.com/gorilla/mux" - "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/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/api/graphql.go b/server/playbooks/server/api/graphql.go index d12211bdd07..e67e7253773 100644 --- a/server/playbooks/server/api/graphql.go +++ b/server/playbooks/server/api/graphql.go @@ -12,9 +12,9 @@ import ( "github.com/gorilla/mux" "github.com/graph-gophers/dataloader/v7" graphql "github.com/graph-gophers/graphql-go" - "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" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/api/graphql_loader_favorite.go b/server/playbooks/server/api/graphql_loader_favorite.go index 325513f5211..970152842c4 100644 --- a/server/playbooks/server/api/graphql_loader_favorite.go +++ b/server/playbooks/server/api/graphql_loader_favorite.go @@ -7,7 +7,7 @@ import ( "context" "github.com/graph-gophers/dataloader/v7" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" ) type favoriteInfo struct { diff --git a/server/playbooks/server/api/graphql_loader_playbook.go b/server/playbooks/server/api/graphql_loader_playbook.go index 95032810c92..2259b4ce0a7 100644 --- a/server/playbooks/server/api/graphql_loader_playbook.go +++ b/server/playbooks/server/api/graphql_loader_playbook.go @@ -7,7 +7,7 @@ import ( "context" "github.com/graph-gophers/dataloader/v7" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" ) type playbookInfo struct { diff --git a/server/playbooks/server/api/graphql_playbook.go b/server/playbooks/server/api/graphql_playbook.go index 128dbb51626..8b2d01b3392 100644 --- a/server/playbooks/server/api/graphql_playbook.go +++ b/server/playbooks/server/api/graphql_playbook.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/api/graphql_root_playbook.go b/server/playbooks/server/api/graphql_root_playbook.go index 0953d5b39c2..60f3b816692 100644 --- a/server/playbooks/server/api/graphql_root_playbook.go +++ b/server/playbooks/server/api/graphql_root_playbook.go @@ -7,8 +7,8 @@ import ( "context" "encoding/json" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 34bdd950553..7c4b590915d 100644 --- a/server/playbooks/server/api/graphql_root_run.go +++ b/server/playbooks/server/api/graphql_root_run.go @@ -6,9 +6,9 @@ package api import ( "context" - "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/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/client" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/api/graphql_run.go b/server/playbooks/server/api/graphql_run.go index 9f8e2356350..80cb46d0d09 100644 --- a/server/playbooks/server/api/graphql_run.go +++ b/server/playbooks/server/api/graphql_run.go @@ -7,7 +7,7 @@ import ( "context" "strconv" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/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 94cd7793659..9f5cec008ff 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/public/model" + "github.com/mattermost/mattermost/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 ee245dee7a6..05319027f01 100644 --- a/server/playbooks/server/api/playbook_runs.go +++ b/server/playbooks/server/api/playbook_runs.go @@ -14,14 +14,14 @@ import ( "time" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/playbooks/client" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/client" "github.com/pkg/errors" - "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/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/bot" + "github.com/mattermost/mattermost/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" ) // PlaybookRunHandler is the API handler. diff --git a/server/playbooks/server/api/playbooks.go b/server/playbooks/server/api/playbooks.go index 39c939f4eed..f23fddbfefe 100644 --- a/server/playbooks/server/api/playbooks.go +++ b/server/playbooks/server/api/playbooks.go @@ -12,10 +12,10 @@ import ( "strings" "github.com/gorilla/mux" - "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" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/api/settings.go b/server/playbooks/server/api/settings.go index a9a33f389ba..c6e787c664d 100644 --- a/server/playbooks/server/api/settings.go +++ b/server/playbooks/server/api/settings.go @@ -7,9 +7,9 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/playbooks/client" - "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/v8/playbooks/client" + "github.com/mattermost/mattermost/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" ) // SettingsHandler is the API handler. diff --git a/server/playbooks/server/api/signal.go b/server/playbooks/server/api/signal.go index 17c20b571e3..f6afa135050 100644 --- a/server/playbooks/server/api/signal.go +++ b/server/playbooks/server/api/signal.go @@ -9,9 +9,9 @@ import ( "net/http" "github.com/gorilla/mux" - "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/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/api/stats.go b/server/playbooks/server/api/stats.go index 76bfd546ee3..b6c343b0d36 100644 --- a/server/playbooks/server/api/stats.go +++ b/server/playbooks/server/api/stats.go @@ -8,13 +8,13 @@ import ( "net/http" "net/url" - "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/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" "gopkg.in/guregu/null.v4" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore" + "github.com/mattermost/mattermost/server/v8/playbooks/server/sqlstore" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/api/telemetry.go b/server/playbooks/server/api/telemetry.go index c7e28db181a..6f979e3001f 100644 --- a/server/playbooks/server/api/telemetry.go +++ b/server/playbooks/server/api/telemetry.go @@ -10,9 +10,9 @@ import ( "github.com/gorilla/mux" "github.com/pkg/errors" - "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/playbooks" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/bot" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" ) // TelemetryHandler is the API handler. diff --git a/server/playbooks/server/api/urls.go b/server/playbooks/server/api/urls.go index 4260230f6d0..aee71ec815a 100644 --- a/server/playbooks/server/api/urls.go +++ b/server/playbooks/server/api/urls.go @@ -8,8 +8,8 @@ import ( "net/url" "path" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 b0997cc7e95..8ef8f87d835 100644 --- a/server/playbooks/server/api_actions_test.go +++ b/server/playbooks/server/api_actions_test.go @@ -8,8 +8,8 @@ import ( "net/http" "testing" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/playbooks/client" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 35d6139970a..f97063fa940 100644 --- a/server/playbooks/server/api_bot_test.go +++ b/server/playbooks/server/api_bot_test.go @@ -9,7 +9,7 @@ import ( "net/http" "testing" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/stretchr/testify/assert" ) diff --git a/server/playbooks/server/api_graphql_playbooks_test.go b/server/playbooks/server/api_graphql_playbooks_test.go index 35dbae76203..26c8a0aca50 100644 --- a/server/playbooks/server/api_graphql_playbooks_test.go +++ b/server/playbooks/server/api_graphql_playbooks_test.go @@ -12,9 +12,9 @@ import ( "testing" "github.com/graph-gophers/graphql-go" - "github.com/mattermost/mattermost-server/server/v8/playbooks/client" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/api" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/client" + "github.com/mattermost/mattermost/server/v8/playbooks/server/api" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/server/playbooks/server/api_graphql_runs_test.go b/server/playbooks/server/api_graphql_runs_test.go index e7332d5ef2f..0d3ab08420d 100644 --- a/server/playbooks/server/api_graphql_runs_test.go +++ b/server/playbooks/server/api_graphql_runs_test.go @@ -11,10 +11,10 @@ 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/playbooks/client" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/playbooks/client" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/playbooks/server/api_playbooks_test.go b/server/playbooks/server/api_playbooks_test.go index 9bef0092eda..057d9056896 100644 --- a/server/playbooks/server/api_playbooks_test.go +++ b/server/playbooks/server/api_playbooks_test.go @@ -13,9 +13,9 @@ import ( "strings" "testing" - "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/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/client" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/server/playbooks/server/api_runs_test.go b/server/playbooks/server/api_runs_test.go index 1622d934409..31cd4fcb406 100644 --- a/server/playbooks/server/api_runs_test.go +++ b/server/playbooks/server/api_runs_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "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/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/client" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/playbooks/server/api_settings_test.go b/server/playbooks/server/api_settings_test.go index 0f2eb0dd5ec..061b2db50e1 100644 --- a/server/playbooks/server/api_settings_test.go +++ b/server/playbooks/server/api_settings_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "github.com/mattermost/mattermost-server/server/v8/playbooks/client" + "github.com/mattermost/mattermost/server/v8/playbooks/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/server/playbooks/server/api_stats_test.go b/server/playbooks/server/api_stats_test.go index a705342e153..7d97503e2cb 100644 --- a/server/playbooks/server/api_stats_test.go +++ b/server/playbooks/server/api_stats_test.go @@ -9,7 +9,7 @@ import ( "net/http" "testing" - "github.com/mattermost/mattermost-server/server/v8/playbooks/client" + "github.com/mattermost/mattermost/server/v8/playbooks/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gopkg.in/guregu/null.v4" diff --git a/server/playbooks/server/app/action.go b/server/playbooks/server/app/action.go index c5692dff13b..ea29d51e1c6 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/public/model" +import "github.com/mattermost/mattermost/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 01ddee4eb39..1e0f99d6a89 100644 --- a/server/playbooks/server/app/actions_service.go +++ b/server/playbooks/server/app/actions_service.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "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" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/server/bot" + "github.com/mattermost/mattermost/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/server/playbooks/server/app/category_service.go b/server/playbooks/server/app/category_service.go index 2f9acb7fca7..f94a9040aab 100644 --- a/server/playbooks/server/app/category_service.go +++ b/server/playbooks/server/app/category_service.go @@ -6,8 +6,8 @@ package app import ( "database/sql" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/app/mocks/mock_job_once_scheduler.go b/server/playbooks/server/app/mocks/mock_job_once_scheduler.go index 9ae41d0ba17..1970435543a 100644 --- a/server/playbooks/server/app/mocks/mock_job_once_scheduler.go +++ b/server/playbooks/server/app/mocks/mock_job_once_scheduler.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/playbooks/server/app (interfaces: JobOnceScheduler) +// Source: github.com/mattermost/mattermost/server/v8/playbooks/server/app (interfaces: JobOnceScheduler) // Package mock_app is a generated GoMock package. package mock_app @@ -12,7 +12,7 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - cluster "github.com/mattermost/mattermost-server/server/v8/playbooks/product/pluginapi/cluster" + cluster "github.com/mattermost/mattermost/server/v8/playbooks/product/pluginapi/cluster" ) // MockJobOnceScheduler is a mock of JobOnceScheduler interface. diff --git a/server/playbooks/server/app/permissions_service.go b/server/playbooks/server/app/permissions_service.go index f5eddf1aa83..fa3d87ea5be 100644 --- a/server/playbooks/server/app/permissions_service.go +++ b/server/playbooks/server/app/permissions_service.go @@ -7,9 +7,9 @@ import ( "reflect" "strings" - "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/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/server/playbooks/server/app/playbook.go b/server/playbooks/server/app/playbook.go index a85d1983be1..c87eb0ca41f 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/public/model" + "github.com/mattermost/mattermost/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 0032df4e13b..057a450c44e 100644 --- a/server/playbooks/server/app/playbook_run.go +++ b/server/playbooks/server/app/playbook_run.go @@ -10,10 +10,10 @@ import ( "gopkg.in/guregu/null.v4" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/server/v8/playbooks/product/pluginapi/cluster" + "github.com/mattermost/mattermost/server/v8/playbooks/product/pluginapi/cluster" ) const ( diff --git a/server/playbooks/server/app/playbook_run_service.go b/server/playbooks/server/app/playbook_run_service.go index ae69ebb776f..aa501748de4 100644 --- a/server/playbooks/server/app/playbook_run_service.go +++ b/server/playbooks/server/app/playbook_run_service.go @@ -16,14 +16,14 @@ import ( "github.com/sirupsen/logrus" stripmd "github.com/writeas/go-strip-markdown" - "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" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/metrics" - "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/public/model" + "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/v8/playbooks/server/bot" + "github.com/mattermost/mattermost/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost/server/v8/playbooks/server/httptools" + "github.com/mattermost/mattermost/server/v8/playbooks/server/metrics" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" + "github.com/mattermost/mattermost/server/v8/playbooks/server/timeutils" ) const checklistItemDescriptionCharLimit = 4000 diff --git a/server/playbooks/server/app/playbook_run_test.go b/server/playbooks/server/app/playbook_run_test.go index 03698269ce3..a4b2b5ddaf4 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/public/model" + "github.com/mattermost/mattermost/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 6dfcaa5dd5e..551ea1c2018 100644 --- a/server/playbooks/server/app/playbook_service.go +++ b/server/playbooks/server/app/playbook_service.go @@ -4,13 +4,13 @@ package app import ( - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/bot" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/metrics" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" + "github.com/mattermost/mattermost/server/v8/playbooks/server/bot" + "github.com/mattermost/mattermost/server/v8/playbooks/server/metrics" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" ) const ( diff --git a/server/playbooks/server/app/plugin_api_tools.go b/server/playbooks/server/app/plugin_api_tools.go index 1910d9fe59c..d196d3c1093 100644 --- a/server/playbooks/server/app/plugin_api_tools.go +++ b/server/playbooks/server/app/plugin_api_tools.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/app/reminder.go b/server/playbooks/server/app/reminder.go index 282d6807faf..091591cad89 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/public/model" + "github.com/mattermost/mattermost/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 eeaa5cf9468..dc6ac8cd1ed 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/public/model" + "github.com/mattermost/mattermost/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 fb79b7bb55c..07158668419 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/public/model" + "github.com/mattermost/mattermost/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 8f40dd5ede6..6b1eec4129a 100644 --- a/server/playbooks/server/bot/bot.go +++ b/server/playbooks/server/bot/bot.go @@ -4,9 +4,9 @@ package bot import ( - "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/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" ) // Bot stores the information for the plugin configuration, and implements the Poster interfaces. diff --git a/server/playbooks/server/bot/mocks/mock_poster.go b/server/playbooks/server/bot/mocks/mock_poster.go index 4b365dbf0a1..3be0df21fce 100644 --- a/server/playbooks/server/bot/mocks/mock_poster.go +++ b/server/playbooks/server/bot/mocks/mock_poster.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/playbooks/server/bot (interfaces: Poster) +// Source: github.com/mattermost/mattermost/server/v8/playbooks/server/bot (interfaces: Poster) // Package mock_bot is a generated GoMock package. package mock_bot @@ -11,7 +11,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/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 b3b8c6021f6..256211672c2 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/public/model" + "github.com/mattermost/mattermost/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 1ed267dc61f..cac7baded9f 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/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/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/bot" + "github.com/mattermost/mattermost/server/v8/playbooks/server/config" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" + "github.com/mattermost/mattermost/server/v8/playbooks/server/timeutils" "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 a333a22b1f2..f1254babc55 100644 --- a/server/playbooks/server/config/service.go +++ b/server/playbooks/server/config/service.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/playbooks/server/playbooks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" ) // const npsPluginID = "com.mattermost.nps" diff --git a/server/playbooks/server/enterprise/license.go b/server/playbooks/server/enterprise/license.go index 4a83c4419c0..9d264284ad4 100644 --- a/server/playbooks/server/enterprise/license.go +++ b/server/playbooks/server/enterprise/license.go @@ -4,8 +4,8 @@ package enterprise import ( - "github.com/mattermost/mattermost-server/server/v8/playbooks/product/pluginapi" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" + "github.com/mattermost/mattermost/server/v8/playbooks/product/pluginapi" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" ) type LicenseChecker struct { diff --git a/server/playbooks/server/httptools/client.go b/server/playbooks/server/httptools/client.go index 0ffde23be6c..d3b34ab1b4d 100644 --- a/server/playbooks/server/httptools/client.go +++ b/server/playbooks/server/httptools/client.go @@ -10,8 +10,8 @@ import ( "time" "unicode" - "github.com/mattermost/mattermost-server/server/v8/platform/services/httpservice" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" + "github.com/mattermost/mattermost/server/v8/platform/services/httpservice" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" ) func MakeClient(api playbooks.ServicesAPI) *http.Client { diff --git a/server/playbooks/server/main_test.go b/server/playbooks/server/main_test.go index 16bdb3866fc..18249ac0f8f 100644 --- a/server/playbooks/server/main_test.go +++ b/server/playbooks/server/main_test.go @@ -10,21 +10,21 @@ 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/playbooks/client" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/v8/channels/api4" + sapp "github.com/mattermost/mattermost/server/v8/channels/app" + "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/channels/utils" + "github.com/mattermost/mattermost/server/v8/config" + "github.com/mattermost/mattermost/server/v8/playbooks/client" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" "github.com/pkg/errors" "github.com/stretchr/testify/require" "gopkg.in/guregu/null.v4" - _ "github.com/mattermost/mattermost-server/server/v8/playbooks/product" + _ "github.com/mattermost/mattermost/server/v8/playbooks/product" ) func TestMain(m *testing.M) { diff --git a/server/playbooks/server/playbooks/service_api.go b/server/playbooks/server/playbooks/service_api.go index 3135040079a..10d17359e83 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/public/model" + mm_model "github.com/mattermost/mattermost/server/public/model" ) const ( diff --git a/server/playbooks/server/sqlstore/actions.go b/server/playbooks/server/sqlstore/actions.go index 31b3aa25238..018ec731842 100644 --- a/server/playbooks/server/sqlstore/actions.go +++ b/server/playbooks/server/sqlstore/actions.go @@ -11,8 +11,8 @@ import ( sq "github.com/Masterminds/squirrel" "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/playbooks/server/app" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 2e17e8c2390..ce834aab62f 100644 --- a/server/playbooks/server/sqlstore/actions_test.go +++ b/server/playbooks/server/sqlstore/actions_test.go @@ -10,9 +10,9 @@ 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/playbooks/server/app" - mock_sqlstore "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore/mocks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" + mock_sqlstore "github.com/mattermost/mattermost/server/v8/playbooks/server/sqlstore/mocks" ) func setupChannelActionStore(t *testing.T, db *sqlx.DB) app.ChannelActionStore { diff --git a/server/playbooks/server/sqlstore/category.go b/server/playbooks/server/sqlstore/category.go index c5957cb8c71..45b0dcb3a1b 100644 --- a/server/playbooks/server/sqlstore/category.go +++ b/server/playbooks/server/sqlstore/category.go @@ -7,8 +7,8 @@ import ( "database/sql" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 628e5d532f8..3af9f82e0fc 100644 --- a/server/playbooks/server/sqlstore/category_test.go +++ b/server/playbooks/server/sqlstore/category_test.go @@ -10,9 +10,9 @@ 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/playbooks/server/app" - mock_sqlstore "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore/mocks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" + mock_sqlstore "github.com/mattermost/mattermost/server/v8/playbooks/server/sqlstore/mocks" ) func setupCategoryStore(t *testing.T, db *sqlx.DB) app.CategoryStore { diff --git a/server/playbooks/server/sqlstore/migrate.go b/server/playbooks/server/sqlstore/migrate.go index 6482380ebf3..9ba369051a4 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/public/model" + "github.com/mattermost/mattermost/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 ae34a2a61a8..9e5ff4a6279 100644 --- a/server/playbooks/server/sqlstore/migrations.go +++ b/server/playbooks/server/sqlstore/migrations.go @@ -13,8 +13,8 @@ import ( "github.com/blang/semver" "github.com/go-sql-driver/mysql" "github.com/jmoiron/sqlx" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 99df21d948f..bbde83e8ffe 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/public/model" + "github.com/mattermost/mattermost/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 9c431b87e2b..bef4fe12c9d 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/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/pkg/errors" "github.com/jmoiron/sqlx" diff --git a/server/playbooks/server/sqlstore/mockmocks/mock_storeapi.go b/server/playbooks/server/sqlstore/mockmocks/mock_storeapi.go index 10b706dde5b..5924a4fd966 100644 --- a/server/playbooks/server/sqlstore/mockmocks/mock_storeapi.go +++ b/server/playbooks/server/sqlstore/mockmocks/mock_storeapi.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/playbooks/server/sqlstore (interfaces: StoreAPI) +// Source: github.com/mattermost/mattermost/server/v8/playbooks/server/sqlstore (interfaces: StoreAPI) // Package mock_sqlstore is a generated GoMock package. package mock_sqlstore diff --git a/server/playbooks/server/sqlstore/mocks/mock_configurationapi.go b/server/playbooks/server/sqlstore/mocks/mock_configurationapi.go index 5a30bb782f1..8115a701907 100644 --- a/server/playbooks/server/sqlstore/mocks/mock_configurationapi.go +++ b/server/playbooks/server/sqlstore/mocks/mock_configurationapi.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/playbooks/server/sqlstore (interfaces: ConfigurationAPI) +// Source: github.com/mattermost/mattermost/server/v8/playbooks/server/sqlstore (interfaces: ConfigurationAPI) // Package mock_sqlstore is a generated GoMock package. package mock_sqlstore @@ -11,7 +11,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - model "github.com/mattermost/mattermost-server/server/public/model" + model "github.com/mattermost/mattermost/server/public/model" ) // MockConfigurationAPI is a mock of ConfigurationAPI interface. diff --git a/server/playbooks/server/sqlstore/mocks/mock_kvapi.go b/server/playbooks/server/sqlstore/mocks/mock_kvapi.go index 398e6f79012..c3c234c2396 100644 --- a/server/playbooks/server/sqlstore/mocks/mock_kvapi.go +++ b/server/playbooks/server/sqlstore/mocks/mock_kvapi.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/playbooks/server/sqlstore (interfaces: KVAPI) +// Source: github.com/mattermost/mattermost/server/v8/playbooks/server/sqlstore (interfaces: KVAPI) // Package mock_sqlstore is a generated GoMock package. package mock_sqlstore diff --git a/server/playbooks/server/sqlstore/mocks/mock_storeapi.go b/server/playbooks/server/sqlstore/mocks/mock_storeapi.go index ffd99fd4910..6d9c23123e5 100644 --- a/server/playbooks/server/sqlstore/mocks/mock_storeapi.go +++ b/server/playbooks/server/sqlstore/mocks/mock_storeapi.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/playbooks/server/sqlstore (interfaces: StoreAPI) +// Source: github.com/mattermost/mattermost/server/v8/playbooks/server/sqlstore (interfaces: StoreAPI) // Package mock_sqlstore is a generated GoMock package. package mock_sqlstore diff --git a/server/playbooks/server/sqlstore/playbook.go b/server/playbooks/server/sqlstore/playbook.go index 2ddd0c38317..7bfabae2513 100644 --- a/server/playbooks/server/sqlstore/playbook.go +++ b/server/playbooks/server/sqlstore/playbook.go @@ -11,8 +11,8 @@ import ( "strings" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 0388964701a..e749b4ae5a8 100644 --- a/server/playbooks/server/sqlstore/playbook_run.go +++ b/server/playbooks/server/sqlstore/playbook_run.go @@ -16,8 +16,8 @@ import ( "github.com/jmoiron/sqlx" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 ac75f514461..a22b52e7a4a 100644 --- a/server/playbooks/server/sqlstore/playbook_run_test.go +++ b/server/playbooks/server/sqlstore/playbook_run_test.go @@ -20,9 +20,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/playbooks/server/app" - mock_sqlstore "github.com/mattermost/mattermost-server/server/v8/playbooks/server/sqlstore/mocks" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" + mock_sqlstore "github.com/mattermost/mattermost/server/v8/playbooks/server/sqlstore/mocks" ) func TestCreateAndGetPlaybookRun(t *testing.T) { diff --git a/server/playbooks/server/sqlstore/playbook_test.go b/server/playbooks/server/sqlstore/playbook_test.go index ff54729fb37..55161ef6e5b 100644 --- a/server/playbooks/server/sqlstore/playbook_test.go +++ b/server/playbooks/server/sqlstore/playbook_test.go @@ -16,9 +16,9 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "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" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" + mock_sqlstore "github.com/mattermost/mattermost/server/v8/playbooks/server/sqlstore/mocks" ) func membersFromIds(ids []string) []app.PlaybookMember { diff --git a/server/playbooks/server/sqlstore/pluginapi_client.go b/server/playbooks/server/sqlstore/pluginapi_client.go index 920083be564..ca17f72fb8b 100644 --- a/server/playbooks/server/sqlstore/pluginapi_client.go +++ b/server/playbooks/server/sqlstore/pluginapi_client.go @@ -6,9 +6,9 @@ package sqlstore import ( "database/sql" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/playbooks" + "github.com/mattermost/mattermost/server/v8/playbooks/server/playbooks" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/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 590e8f0ee96..4544b4c7c28 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/public/model" + "github.com/mattermost/mattermost/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 d92309f75f0..3d0d97a18bb 100644 --- a/server/playbooks/server/sqlstore/stats_test.go +++ b/server/playbooks/server/sqlstore/stats_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/guregu/null.v4" - "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" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" + mock_sqlstore "github.com/mattermost/mattermost/server/v8/playbooks/server/sqlstore/mocks" ) func setupStatsStore(t *testing.T, db *sqlx.DB) *StatsStore { diff --git a/server/playbooks/server/sqlstore/store.go b/server/playbooks/server/sqlstore/store.go index a7c062fdcfe..ebd4a3bb8cd 100644 --- a/server/playbooks/server/sqlstore/store.go +++ b/server/playbooks/server/sqlstore/store.go @@ -6,12 +6,12 @@ package sqlstore import ( "database/sql" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" "github.com/sirupsen/logrus" sq "github.com/Masterminds/squirrel" "github.com/jmoiron/sqlx" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/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 58219f06736..6b9dbaee434 100644 --- a/server/playbooks/server/sqlstore/store_test.go +++ b/server/playbooks/server/sqlstore/store_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" - mock_app "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app/mocks" + mock_app "github.com/mattermost/mattermost/server/v8/playbooks/server/app/mocks" sq "github.com/Masterminds/squirrel" "github.com/blang/semver" @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func 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 38d838e24d6..f40dab67e35 100644 --- a/server/playbooks/server/sqlstore/support_for_test.go +++ b/server/playbooks/server/sqlstore/support_for_test.go @@ -10,16 +10,16 @@ import ( "github.com/blang/semver" - mock_app "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app/mocks" + mock_app "github.com/mattermost/mattermost/server/v8/playbooks/server/app/mocks" sq "github.com/Masterminds/squirrel" "github.com/golang/mock/gomock" "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/playbooks/server/app" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/channels/store/storetest" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" ) func getDriverName() string { diff --git a/server/playbooks/server/sqlstore/system.go b/server/playbooks/server/sqlstore/system.go index e2e668402fb..0c862ce90d6 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/public/model" + "github.com/mattermost/mattermost/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 d16b08ac6ee..6a70cf566ad 100644 --- a/server/playbooks/server/sqlstore/timeline_event_test.go +++ b/server/playbooks/server/sqlstore/timeline_event_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/playbooks/server/app" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" ) func TestPlaybookRunStore_CreateTimelineEvent(t *testing.T) { diff --git a/server/playbooks/server/sqlstore/user_info.go b/server/playbooks/server/sqlstore/user_info.go index d33c02c6a6f..43c4a7c27cb 100644 --- a/server/playbooks/server/sqlstore/user_info.go +++ b/server/playbooks/server/sqlstore/user_info.go @@ -7,10 +7,10 @@ import ( "database/sql" "encoding/json" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" "github.com/pkg/errors" ) diff --git a/server/playbooks/server/sqlstore/user_info_test.go b/server/playbooks/server/sqlstore/user_info_test.go index db89cbdb3fb..69221cefcbb 100644 --- a/server/playbooks/server/sqlstore/user_info_test.go +++ b/server/playbooks/server/sqlstore/user_info_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - mock_app "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app/mocks" + mock_app "github.com/mattermost/mattermost/server/v8/playbooks/server/app/mocks" "github.com/pkg/errors" @@ -16,8 +16,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/playbooks/server/app" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" ) func Test_userInfoStore_Get(t *testing.T) { diff --git a/server/playbooks/server/telemetry/noop.go b/server/playbooks/server/telemetry/noop.go index c0a8521ec32..5801ad65988 100644 --- a/server/playbooks/server/telemetry/noop.go +++ b/server/playbooks/server/telemetry/noop.go @@ -4,7 +4,7 @@ package telemetry import ( - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" ) // NoopTelemetry satisfies the Telemetry interface with no-op implementations. diff --git a/server/playbooks/server/telemetry/rudder.go b/server/playbooks/server/telemetry/rudder.go index b0909fdbca3..7f79eecba95 100644 --- a/server/playbooks/server/telemetry/rudder.go +++ b/server/playbooks/server/telemetry/rudder.go @@ -6,7 +6,7 @@ package telemetry import ( "sync" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" "github.com/pkg/errors" rudder "github.com/rudderlabs/analytics-go" diff --git a/server/playbooks/server/telemetry/rudder_test.go b/server/playbooks/server/telemetry/rudder_test.go index 326d9dc5e8c..d612c3a3542 100644 --- a/server/playbooks/server/telemetry/rudder_test.go +++ b/server/playbooks/server/telemetry/rudder_test.go @@ -13,7 +13,7 @@ import ( "gopkg.in/guregu/null.v4" - "github.com/mattermost/mattermost-server/server/v8/playbooks/server/app" + "github.com/mattermost/mattermost/server/v8/playbooks/server/app" rudder "github.com/rudderlabs/analytics-go" "github.com/stretchr/testify/require" diff --git a/server/playbooks/server/timeutils/timeutils.go b/server/playbooks/server/timeutils/timeutils.go index 851ad16c9bc..6acb1a2fe9d 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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) func GetTimeForMillis(unixMillis int64) time.Time { diff --git a/server/public/go.mod b/server/public/go.mod index 6b15c9afb22..e53808b40b7 100644 --- a/server/public/go.mod +++ b/server/public/go.mod @@ -1,4 +1,4 @@ -module github.com/mattermost/mattermost-server/server/public +module github.com/mattermost/mattermost/server/public go 1.19 diff --git a/server/public/model/bundle_info.go b/server/public/model/bundle_info.go index 99133953bbc..55c89faa0fa 100644 --- a/server/public/model/bundle_info.go +++ b/server/public/model/bundle_info.go @@ -4,7 +4,7 @@ package model import ( - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) type BundleInfo struct { diff --git a/server/public/model/client4_test.go b/server/public/model/client4_test.go index 66b4f531408..6632b02b0ec 100644 --- a/server/public/model/client4_test.go +++ b/server/public/model/client4_test.go @@ -28,7 +28,7 @@ func TestClient4TrimTrailingSlash(t *testing.T) { } } -// https://github.com/mattermost/mattermost-server/server/v8/channels/issues/8205 +// https://github.com/mattermost/mattermost/server/v8/channels/issues/8205 func TestClient4CreatePost(t *testing.T) { post := &Post{ Props: map[string]any{ diff --git a/server/public/model/cloud.go b/server/public/model/cloud.go index 1efad1878cb..7693654e6b8 100644 --- a/server/public/model/cloud.go +++ b/server/public/model/cloud.go @@ -275,7 +275,7 @@ type SubscriptionChange struct { // TODO remove BoardsLimits. // It is not used for real. // Focalboard has some lingering code using this struct -// https://github.com/mattermost/mattermost-server/server/v8/boards/blob/fd4cf95f8ac9ba616864b25bf91bb1e4ec21335a/server/app/cloud.go#L86 +// https://github.com/mattermost/mattermost/server/v8/boards/blob/fd4cf95f8ac9ba616864b25bf91bb1e4ec21335a/server/app/cloud.go#L86 // we should remove this struct once that code is removed. type BoardsLimits struct { Cards *int `json:"cards"` @@ -298,7 +298,7 @@ type ProductLimits struct { // TODO remove Boards property. // It is not used for real. // Focalboard has some lingering code using this property - // https://github.com/mattermost/mattermost-server/server/v8/boards/blob/fd4cf95f8ac9ba616864b25bf91bb1e4ec21335a/server/app/cloud.go#L86 + // https://github.com/mattermost/mattermost/server/v8/boards/blob/fd4cf95f8ac9ba616864b25bf91bb1e4ec21335a/server/app/cloud.go#L86 // we should remove this property once that code is removed. Boards *BoardsLimits `json:"boards,omitempty"` Files *FilesLimits `json:"files,omitempty"` diff --git a/server/public/model/command_args.go b/server/public/model/command_args.go index 5ad13fd4c81..c7c9eaf5792 100644 --- a/server/public/model/command_args.go +++ b/server/public/model/command_args.go @@ -4,7 +4,7 @@ package model import ( - "github.com/mattermost/mattermost-server/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/i18n" ) type CommandArgs struct { diff --git a/server/public/model/command_response.go b/server/public/model/command_response.go index 6462012d14e..084febc95cb 100644 --- a/server/public/model/command_response.go +++ b/server/public/model/command_response.go @@ -8,7 +8,7 @@ import ( "io" "strings" - "github.com/mattermost/mattermost-server/server/public/utils" + "github.com/mattermost/mattermost/server/public/utils" ) const ( diff --git a/server/public/model/config.go b/server/public/model/config.go index 095f2f4548d..bcce75fcf67 100644 --- a/server/public/model/config.go +++ b/server/public/model/config.go @@ -21,8 +21,8 @@ import ( "github.com/mattermost/ldap" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" - "github.com/mattermost/mattermost-server/server/public/utils" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/utils" ) const ( diff --git a/server/public/model/post.go b/server/public/model/post.go index 58912077922..04f84ce38cc 100644 --- a/server/public/model/post.go +++ b/server/public/model/post.go @@ -15,7 +15,7 @@ import ( "sync" "unicode/utf8" - "github.com/mattermost/mattermost-server/server/public/shared/markdown" + "github.com/mattermost/mattermost/server/public/shared/markdown" ) const ( diff --git a/server/public/model/service_environment_test.go b/server/public/model/service_environment_test.go index a327fbc34df..794bc7f4ff6 100644 --- a/server/public/model/service_environment_test.go +++ b/server/public/model/service_environment_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/stretchr/testify/require" ) diff --git a/server/public/model/session.go b/server/public/model/session.go index 61ef7e65629..d219909e536 100644 --- a/server/public/model/session.go +++ b/server/public/model/session.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/public/model/user.go b/server/public/model/user.go index 3185f88a0fd..8ce86ef2e27 100644 --- a/server/public/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/public/shared/mlog" - "github.com/mattermost/mattermost-server/server/public/shared/timezones" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/timezones" ) const ( diff --git a/server/public/model/utils.go b/server/public/model/utils.go index 8d1230fdc21..175994d9a7b 100644 --- a/server/public/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/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/i18n" ) const ( diff --git a/server/public/model/websocket_client.go b/server/public/model/websocket_client.go index cc11d863356..1f599f7da04 100644 --- a/server/public/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/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" "github.com/gorilla/websocket" "github.com/vmihailenco/msgpack/v5" diff --git a/server/public/model/websocket_request.go b/server/public/model/websocket_request.go index bd6dc4233cc..7995805bbde 100644 --- a/server/public/model/websocket_request.go +++ b/server/public/model/websocket_request.go @@ -4,7 +4,7 @@ package model import ( - "github.com/mattermost/mattermost-server/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/i18n" "github.com/vmihailenco/msgpack/v5" ) diff --git a/server/public/plugin/api.go b/server/public/plugin/api.go index 00aeb145851..bd1f3cfabd4 100644 --- a/server/public/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/public/model" + "github.com/mattermost/mattermost/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/public/plugin/api_timer_layer_generated.go b/server/public/plugin/api_timer_layer_generated.go index 6cb162a5696..e3ed4723f37 100644 --- a/server/public/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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type apiTimerLayer struct { diff --git a/server/public/plugin/checker/check_api.go b/server/public/plugin/checker/check_api.go index 97fd5a474ff..c31fd0bd8ae 100644 --- a/server/public/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/public/plugin/checker/internal/asthelpers" - "github.com/mattermost/mattermost-server/server/public/plugin/checker/internal/version" + "github.com/mattermost/mattermost/server/public/plugin/checker/internal/asthelpers" + "github.com/mattermost/mattermost/server/public/plugin/checker/internal/version" ) func checkAPIVersionComments(pkgPath string) (result, error) { diff --git a/server/public/plugin/checker/check_api_test.go b/server/public/plugin/checker/check_api_test.go index abb15aac089..d7d6fdd798b 100644 --- a/server/public/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/public/plugin/checker/internal/test/valid", + pkgPath: "github.com/mattermost/mattermost/server/public/plugin/checker/internal/test/valid", err: "", }, { name: "invalid comments", - pkgPath: "github.com/mattermost/mattermost-server/server/public/plugin/checker/internal/test/invalid", + pkgPath: "github.com/mattermost/mattermost/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/public/plugin/checker/internal/test/missing", + pkgPath: "github.com/mattermost/mattermost/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/public/plugin/checker/internal/test/does_not_exist", + pkgPath: "github.com/mattermost/mattermost/server/public/plugin/checker/internal/test/does_not_exist", err: "could not find API interface", }, } diff --git a/server/public/plugin/checker/main.go b/server/public/plugin/checker/main.go index 2c4ba9f0440..5850c43375f 100644 --- a/server/public/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/public/plugin" +const pluginPackagePath = "github.com/mattermost/mattermost/server/public/plugin" type result struct { Warnings []string diff --git a/server/public/plugin/client_rpc.go b/server/public/plugin/client_rpc.go index 3abc572bb39..147ecf4a252 100644 --- a/server/public/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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) var hookNameToId map[string]int = make(map[string]int) diff --git a/server/public/plugin/client_rpc_generated.go b/server/public/plugin/client_rpc_generated.go index 2e3b69dc18b..2e3ba67731d 100644 --- a/server/public/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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) func init() { diff --git a/server/public/plugin/environment.go b/server/public/plugin/environment.go index 5a20779889b..6bfd6f8d64b 100644 --- a/server/public/plugin/environment.go +++ b/server/public/plugin/environment.go @@ -13,9 +13,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/public/utils" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/utils" ) var ErrNotFound = errors.New("Item not found") diff --git a/server/public/plugin/environment_test.go b/server/public/plugin/environment_test.go index e084a0fc8a3..898c2edcca3 100644 --- a/server/public/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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) func TestAvailablePlugins(t *testing.T) { diff --git a/server/public/plugin/example_hello_world_test.go b/server/public/plugin/example_hello_world_test.go index 044dc071ac8..e9107bc73f7 100644 --- a/server/public/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/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin" ) // HelloWorldPlugin implements the interface expected by the Mattermost server to communicate diff --git a/server/public/plugin/example_help_test.go b/server/public/plugin/example_help_test.go index 47d6c7c044f..ee4051b46eb 100644 --- a/server/public/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/public/model" - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" ) // configuration represents the configuration for this plugin as exposed via the Mattermost diff --git a/server/public/plugin/hclog_adapter.go b/server/public/plugin/hclog_adapter.go index 67e5a4ca59f..e4f25f4dbe2 100644 --- a/server/public/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/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) type hclogAdapter struct { diff --git a/server/public/plugin/health_check.go b/server/public/plugin/health_check.go index c34a3653a08..7f24ab0a179 100644 --- a/server/public/plugin/health_check.go +++ b/server/public/plugin/health_check.go @@ -7,8 +7,8 @@ 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/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const ( diff --git a/server/public/plugin/health_check_test.go b/server/public/plugin/health_check_test.go index dba5cb40c0f..974928ea25a 100644 --- a/server/public/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/public/model" - "github.com/mattermost/mattermost-server/server/public/plugin/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin/utils" + "github.com/mattermost/mattermost/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/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin" ) type MyPlugin struct { @@ -73,8 +73,8 @@ func testPluginHealthCheckPanic(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/plugin" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" ) type MyPlugin struct { diff --git a/server/public/plugin/hooks.go b/server/public/plugin/hooks.go index e3ab52e8bd7..f71dbcf3255 100644 --- a/server/public/plugin/hooks.go +++ b/server/public/plugin/hooks.go @@ -7,7 +7,7 @@ import ( "io" "net/http" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/server/public/model" ) // These assignments are part of the wire protocol used to trigger hook events in plugins. diff --git a/server/public/plugin/hooks_timer_layer_generated.go b/server/public/plugin/hooks_timer_layer_generated.go index 68db9215422..258ef220157 100644 --- a/server/public/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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type hooksTimerLayer struct { diff --git a/server/public/plugin/http.go b/server/public/plugin/http.go index 5e5fbdbc4ac..00d10f0b81c 100644 --- a/server/public/plugin/http.go +++ b/server/public/plugin/http.go @@ -12,7 +12,7 @@ import ( "net/http" "net/rpc" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) type hijackedResponse struct { diff --git a/server/public/plugin/interface_generator/main.go b/server/public/plugin/interface_generator/main.go index 0111f7b23d7..0ca598d4c02 100644 --- a/server/public/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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type apiTimerLayer struct { @@ -494,7 +494,7 @@ import ( "net/http" timePkg "time" - "github.com/mattermost/mattermost-server/server/public/model" + "github.com/mattermost/mattermost/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/public/plugin") + dirs, err := goList("github.com/mattermost/mattermost/server/public/plugin") if err != nil { panic(err) } else if len(dirs) != 1 { diff --git a/server/public/plugin/plugintest/api.go b/server/public/plugin/plugintest/api.go index d5a2d392bdc..333b3b5a6b7 100644 --- a/server/public/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/public/model" + model "github.com/mattermost/mattermost/server/public/model" ) // API is an autogenerated mock type for the API type diff --git a/server/public/plugin/plugintest/doc.go b/server/public/plugin/plugintest/doc.go index a4e5ea003e6..d43fbe0eeff 100644 --- a/server/public/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/public/plugin/plugintest/mock". +// "github.com/mattermost/mattermost/server/public/plugin/plugintest/mock". package plugintest diff --git a/server/public/plugin/plugintest/driver.go b/server/public/plugin/plugintest/driver.go index db2c82662cf..25d02489e8a 100644 --- a/server/public/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/public/plugin" + plugin "github.com/mattermost/mattermost/server/public/plugin" ) // Driver is an autogenerated mock type for the Driver type diff --git a/server/public/plugin/plugintest/example_hello_user_test.go b/server/public/plugin/plugintest/example_hello_user_test.go index 296fd9aee71..edcd474a954 100644 --- a/server/public/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/public/model" - "github.com/mattermost/mattermost-server/server/public/plugin" - "github.com/mattermost/mattermost-server/server/public/plugin/plugintest" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin" + "github.com/mattermost/mattermost/server/public/plugin/plugintest" ) type HelloUserPlugin struct { diff --git a/server/public/plugin/plugintest/hooks.go b/server/public/plugin/plugintest/hooks.go index d64b23a9735..f3e0fd51a78 100644 --- a/server/public/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/public/model" + model "github.com/mattermost/mattermost/server/public/model" - plugin "github.com/mattermost/mattermost-server/server/public/plugin" + plugin "github.com/mattermost/mattermost/server/public/plugin" ) // Hooks is an autogenerated mock type for the Hooks type diff --git a/server/public/plugin/product_hooks_generated.go b/server/public/plugin/product_hooks_generated.go index 50c5d9c8853..d8c789cdf57 100644 --- a/server/public/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/public/model" + "github.com/mattermost/mattermost/server/public/model" ) type OnConfigurationChangeIFace interface { diff --git a/server/public/plugin/supervisor.go b/server/public/plugin/supervisor.go index c8634f77557..ad4f9ccf0c4 100644 --- a/server/public/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/public/model" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) type supervisor struct { diff --git a/server/public/plugin/supervisor_test.go b/server/public/plugin/supervisor_test.go index aa50174fdcf..364d4cb01bb 100644 --- a/server/public/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/public/model" - "github.com/mattermost/mattermost-server/server/public/plugin/utils" - "github.com/mattermost/mattermost-server/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/plugin/utils" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) func TestSupervisor(t *testing.T) { diff --git a/server/public/shared/i18n/i18n.go b/server/public/shared/i18n/i18n.go index 4307d821d93..396ebde05c1 100644 --- a/server/public/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/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) const defaultLocale = "en" diff --git a/server/public/shared/mlog/global_test.go b/server/public/shared/mlog/global_test.go index 4cc53780b9b..15d6067f07c 100644 --- a/server/public/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/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) func TestLoggingBeforeInitialized(t *testing.T) { diff --git a/server/public/utils/json_test.go b/server/public/utils/json_test.go index e10a7ea8ab5..b00c5dfb0d3 100644 --- a/server/public/utils/json_test.go +++ b/server/public/utils/json_test.go @@ -11,8 +11,8 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/server/public/model" - "github.com/mattermost/mattermost-server/server/public/utils" + "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/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 280d606a5d3..5239e687a87 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/public/model" + "github.com/mattermost/mattermost/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 856a1d2899e..d5ad991890f 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/public/model" + "github.com/mattermost/mattermost/server/public/model" "github.com/stretchr/testify/require" )