From 9f7521d0036b22ab860cfcb7ec4293f7dc07951e Mon Sep 17 00:00:00 2001 From: Felipe Martin <812088+fmartingr@users.noreply.github.com> Date: Tue, 5 Sep 2023 09:47:30 +0200 Subject: [PATCH] Move request package into public/shared folder (#24420) * move request package to public/shared * updated app-layers * update app layer * remove original package location --- server/channels/api4/apitestlib.go | 2 +- server/channels/api4/command_test.go | 2 +- server/channels/api4/team_test.go | 2 +- server/channels/app/admin.go | 2 +- server/channels/app/admin_advisor.go | 2 +- server/channels/app/app_iface.go | 2 +- server/channels/app/authentication.go | 2 +- server/channels/app/authorization.go | 2 +- server/channels/app/auto_responder.go | 2 +- server/channels/app/bot.go | 2 +- server/channels/app/channel.go | 3 +-- server/channels/app/channel_category.go | 2 +- server/channels/app/channels.go | 2 +- server/channels/app/command.go | 2 +- server/channels/app/command_autocomplete.go | 2 +- server/channels/app/command_autocomplete_test.go | 2 +- server/channels/app/context.go | 2 +- server/channels/app/draft.go | 2 +- server/channels/app/emoji.go | 2 +- server/channels/app/export.go | 2 +- server/channels/app/file.go | 2 +- server/channels/app/helper_test.go | 2 +- server/channels/app/import.go | 2 +- server/channels/app/import_functions.go | 2 +- server/channels/app/import_test.go | 2 +- server/channels/app/integration_action.go | 2 +- server/channels/app/layer_generators/opentracing_layer.go.tmpl | 3 ++- server/channels/app/login.go | 2 +- server/channels/app/notification.go | 2 +- server/channels/app/notification_email.go | 2 +- server/channels/app/notification_push.go | 2 +- server/channels/app/notify_admin.go | 2 +- server/channels/app/notify_admin_test.go | 2 +- server/channels/app/oauth.go | 2 +- server/channels/app/onboarding.go | 2 +- server/channels/app/onboarding_test.go | 2 +- server/channels/app/opentracing/opentracing_layer.go | 3 ++- server/channels/app/permissions.go | 2 +- server/channels/app/plugin.go | 2 +- server/channels/app/plugin_api.go | 2 +- server/channels/app/plugin_api_test.go | 2 +- server/channels/app/plugin_commands.go | 2 +- server/channels/app/plugin_commands_test.go | 2 +- server/channels/app/plugin_hooks_test.go | 2 +- server/channels/app/plugin_test.go | 2 +- server/channels/app/post.go | 2 +- server/channels/app/post_acknowledgements.go | 2 +- server/channels/app/post_metadata.go | 2 +- server/channels/app/post_persistent_notification.go | 2 +- server/channels/app/product_notices.go | 2 +- server/channels/app/reaction.go | 2 +- server/channels/app/server.go | 2 +- server/channels/app/shared_channel.go | 2 +- server/channels/app/slack.go | 2 +- server/channels/app/slashcommands/auto_channels.go | 2 +- server/channels/app/slashcommands/auto_environment.go | 2 +- server/channels/app/slashcommands/auto_posts.go | 2 +- server/channels/app/slashcommands/auto_users.go | 2 +- server/channels/app/slashcommands/command_away.go | 2 +- server/channels/app/slashcommands/command_channel_header.go | 2 +- server/channels/app/slashcommands/command_channel_purpose.go | 2 +- server/channels/app/slashcommands/command_channel_rename.go | 2 +- server/channels/app/slashcommands/command_code.go | 2 +- server/channels/app/slashcommands/command_custom_status.go | 2 +- server/channels/app/slashcommands/command_dnd.go | 2 +- server/channels/app/slashcommands/command_echo.go | 2 +- server/channels/app/slashcommands/command_expand_collapse.go | 2 +- server/channels/app/slashcommands/command_exportlink.go | 2 +- server/channels/app/slashcommands/command_groupmsg.go | 2 +- server/channels/app/slashcommands/command_help.go | 2 +- server/channels/app/slashcommands/command_invite.go | 2 +- server/channels/app/slashcommands/command_invite_people.go | 2 +- server/channels/app/slashcommands/command_join.go | 2 +- server/channels/app/slashcommands/command_leave.go | 2 +- server/channels/app/slashcommands/command_loadtest.go | 2 +- server/channels/app/slashcommands/command_logout.go | 2 +- server/channels/app/slashcommands/command_marketplace.go | 2 +- server/channels/app/slashcommands/command_me.go | 2 +- server/channels/app/slashcommands/command_msg.go | 2 +- server/channels/app/slashcommands/command_mute.go | 2 +- server/channels/app/slashcommands/command_offline.go | 2 +- server/channels/app/slashcommands/command_online.go | 2 +- server/channels/app/slashcommands/command_remote.go | 2 +- server/channels/app/slashcommands/command_remove.go | 2 +- server/channels/app/slashcommands/command_search.go | 2 +- server/channels/app/slashcommands/command_settings.go | 2 +- server/channels/app/slashcommands/command_share.go | 2 +- server/channels/app/slashcommands/command_shortcuts.go | 2 +- server/channels/app/slashcommands/command_shrug.go | 2 +- server/channels/app/slashcommands/helper_test.go | 2 +- server/channels/app/status.go | 2 +- server/channels/app/syncables.go | 2 +- server/channels/app/team.go | 2 +- server/channels/app/teams/helper_test.go | 2 +- server/channels/app/upload.go | 2 +- server/channels/app/user.go | 2 +- server/channels/app/user_test.go | 2 +- server/channels/app/users/helper_test.go | 2 +- server/channels/app/webhook.go | 2 +- server/channels/jobs/export_process/worker.go | 2 +- server/channels/jobs/import_process/worker.go | 2 +- server/channels/product/api.go | 2 +- server/channels/web/context.go | 2 +- server/channels/web/handlers.go | 2 +- server/channels/web/unsupported_browser.go | 2 +- server/channels/web/web_test.go | 2 +- server/channels/wsapi/user.go | 2 +- server/cmd/mattermost/commands/export.go | 2 +- server/cmd/mattermost/commands/import.go | 2 +- server/cmd/mattermost/commands/init.go | 2 +- server/einterfaces/ldap.go | 2 +- server/einterfaces/mocks/LdapInterface.go | 2 +- server/einterfaces/mocks/SamlInterface.go | 2 +- server/einterfaces/saml.go | 2 +- server/platform/services/sharedchannel/attachment.go | 2 +- server/platform/services/sharedchannel/channelinvite.go | 2 +- server/platform/services/sharedchannel/mock_AppIface_test.go | 2 +- server/platform/services/sharedchannel/service.go | 2 +- server/platform/services/sharedchannel/sync_recv.go | 2 +- server/platform/services/sharedchannel/sync_send.go | 2 +- server/platform/services/sharedchannel/sync_send_remote.go | 2 +- server/platform/services/slackimport/slackimport.go | 2 +- server/platform/services/slackimport/slackimport_test.go | 2 +- server/{channels/app => public/shared}/request/context.go | 0 124 files changed, 125 insertions(+), 124 deletions(-) rename server/{channels/app => public/shared}/request/context.go (100%) diff --git a/server/channels/api4/apitestlib.go b/server/channels/api4/apitestlib.go index 629557bee3..963471074a 100644 --- a/server/channels/api4/apitestlib.go +++ b/server/channels/api4/apitestlib.go @@ -29,8 +29,8 @@ import ( "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/public/shared/request" "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" diff --git a/server/channels/api4/command_test.go b/server/channels/api4/command_test.go index fddd015344..48b865196f 100644 --- a/server/channels/api4/command_test.go +++ b/server/channels/api4/command_test.go @@ -17,7 +17,7 @@ import ( "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/public/shared/request" ) func TestCreateCommand(t *testing.T) { diff --git a/server/channels/api4/team_test.go b/server/channels/api4/team_test.go index 887d6b9000..3076ae9924 100644 --- a/server/channels/api4/team_test.go +++ b/server/channels/api4/team_test.go @@ -20,8 +20,8 @@ import ( "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/public/shared/request" "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" diff --git a/server/channels/app/admin.go b/server/channels/app/admin.go index 1f970a6c9b..b5ab1a9010 100644 --- a/server/channels/app/admin.go +++ b/server/channels/app/admin.go @@ -12,7 +12,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/platform/services/cache" "github.com/mattermost/mattermost/server/v8/platform/shared/mail" ) diff --git a/server/channels/app/admin_advisor.go b/server/channels/app/admin_advisor.go index c68279ba12..27c90dea2f 100644 --- a/server/channels/app/admin_advisor.go +++ b/server/channels/app/admin_advisor.go @@ -10,7 +10,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/platform/shared/mail" ) diff --git a/server/channels/app/app_iface.go b/server/channels/app/app_iface.go index 0a99412f34..7850275fc9 100644 --- a/server/channels/app/app_iface.go +++ b/server/channels/app/app_iface.go @@ -22,9 +22,9 @@ import ( "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/request" "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" diff --git a/server/channels/app/authentication.go b/server/channels/app/authentication.go index c2c9d48890..ab63c987ba 100644 --- a/server/channels/app/authentication.go +++ b/server/channels/app/authentication.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/app/users" "github.com/mattermost/mattermost/server/v8/platform/shared/mfa" ) diff --git a/server/channels/app/authorization.go b/server/channels/app/authorization.go index de20eb869f..f2481e112f 100644 --- a/server/channels/app/authorization.go +++ b/server/channels/app/authorization.go @@ -11,7 +11,7 @@ import ( "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/public/shared/request" ) func (a *App) MakePermissionError(s *model.Session, permissions []*model.Permission) *model.AppError { diff --git a/server/channels/app/auto_responder.go b/server/channels/app/auto_responder.go index c9a66c333d..55b80c19e8 100644 --- a/server/channels/app/auto_responder.go +++ b/server/channels/app/auto_responder.go @@ -8,7 +8,7 @@ import ( "time" "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/public/shared/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/bot.go b/server/channels/app/bot.go index b625741f7f..edc543d719 100644 --- a/server/channels/app/bot.go +++ b/server/channels/app/bot.go @@ -13,7 +13,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/product" "github.com/mattermost/mattermost/server/v8/channels/store" ) diff --git a/server/channels/app/channel.go b/server/channels/app/channel.go index 4a0b97a704..07962d9f2b 100644 --- a/server/channels/app/channel.go +++ b/server/channels/app/channel.go @@ -15,9 +15,8 @@ import ( "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/request" pUtils "github.com/mattermost/mattermost/server/public/utils" - - "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" diff --git a/server/channels/app/channel_category.go b/server/channels/app/channel_category.go index 7043abe627..05ddf6888b 100644 --- a/server/channels/app/channel_category.go +++ b/server/channels/app/channel_category.go @@ -10,7 +10,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" ) diff --git a/server/channels/app/channels.go b/server/channels/app/channels.go index 76b6858f19..b134adf888 100644 --- a/server/channels/app/channels.go +++ b/server/channels/app/channels.go @@ -14,8 +14,8 @@ import ( "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/shared/request" "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" diff --git a/server/channels/app/command.go b/server/channels/app/command.go index 8f4400565a..4cff1135e6 100644 --- a/server/channels/app/command.go +++ b/server/channels/app/command.go @@ -17,7 +17,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" ) diff --git a/server/channels/app/command_autocomplete.go b/server/channels/app/command_autocomplete.go index e90d5c3041..f76d3e2767 100644 --- a/server/channels/app/command_autocomplete.go +++ b/server/channels/app/command_autocomplete.go @@ -13,7 +13,7 @@ import ( "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/public/shared/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 441576165c..7c133ad159 100644 --- a/server/channels/app/command_autocomplete_test.go +++ b/server/channels/app/command_autocomplete_test.go @@ -11,7 +11,7 @@ import ( "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/public/shared/request" ) func TestParseStaticListArgument(t *testing.T) { diff --git a/server/channels/app/context.go b/server/channels/app/context.go index 26775422ef..cd5cab3aa1 100644 --- a/server/channels/app/context.go +++ b/server/channels/app/context.go @@ -7,7 +7,7 @@ import ( "context" "github.com/mattermost/mattermost/server/public/plugin" - "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store/sqlstore" ) diff --git a/server/channels/app/draft.go b/server/channels/app/draft.go index ee17eac892..b50c910904 100644 --- a/server/channels/app/draft.go +++ b/server/channels/app/draft.go @@ -11,7 +11,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" ) diff --git a/server/channels/app/emoji.go b/server/channels/app/emoji.go index 273282181d..0f3f6c75ca 100644 --- a/server/channels/app/emoji.go +++ b/server/channels/app/emoji.go @@ -24,7 +24,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" "github.com/mattermost/mattermost/server/v8/channels/utils" ) diff --git a/server/channels/app/export.go b/server/channels/app/export.go index 006e10960f..017ad6dd56 100644 --- a/server/channels/app/export.go +++ b/server/channels/app/export.go @@ -21,8 +21,8 @@ import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/request" "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" "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) diff --git a/server/channels/app/file.go b/server/channels/app/file.go index b499986469..e654100f16 100644 --- a/server/channels/app/file.go +++ b/server/channels/app/file.go @@ -27,8 +27,8 @@ import ( "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/shared/request" "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" diff --git a/server/channels/app/helper_test.go b/server/channels/app/helper_test.go index ff3ce167ce..e4292b4246 100644 --- a/server/channels/app/helper_test.go +++ b/server/channels/app/helper_test.go @@ -18,7 +18,7 @@ import ( "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/public/shared/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" diff --git a/server/channels/app/import.go b/server/channels/app/import.go index ceb8ca93ed..c877581f52 100644 --- a/server/channels/app/import.go +++ b/server/channels/app/import.go @@ -16,8 +16,8 @@ import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/request" "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 09f871d3b2..f7c59cfcc4 100644 --- a/server/channels/app/import_functions.go +++ b/server/channels/app/import_functions.go @@ -19,8 +19,8 @@ import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/request" "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" diff --git a/server/channels/app/import_test.go b/server/channels/app/import_test.go index b57c4a2c03..5c08503dcb 100644 --- a/server/channels/app/import_test.go +++ b/server/channels/app/import_test.go @@ -18,8 +18,8 @@ import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/request" "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" ) diff --git a/server/channels/app/integration_action.go b/server/channels/app/integration_action.go index ca9c64f3e4..625055a047 100644 --- a/server/channels/app/integration_action.go +++ b/server/channels/app/integration_action.go @@ -35,7 +35,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" "github.com/mattermost/mattermost/server/v8/channels/utils" ) diff --git a/server/channels/app/layer_generators/opentracing_layer.go.tmpl b/server/channels/app/layer_generators/opentracing_layer.go.tmpl index 7b71bfee5f..494b27feaf 100644 --- a/server/channels/app/layer_generators/opentracing_layer.go.tmpl +++ b/server/channels/app/layer_generators/opentracing_layer.go.tmpl @@ -8,6 +8,7 @@ package opentracing import ( "github.com/opentracing/opentracing-go/ext" + spanlog "github.com/opentracing/opentracing-go/log" ) @@ -140,4 +141,4 @@ func (a *{{.Name}}) Timezones() *timezones.Timezones { } func (a *{{.Name}}) SetServer(srv *app.Server) { a.srv = srv -} \ No newline at end of file +} diff --git a/server/channels/app/login.go b/server/channels/app/login.go index d7a97a68f4..fec7bb2425 100644 --- a/server/channels/app/login.go +++ b/server/channels/app/login.go @@ -19,7 +19,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" "github.com/mattermost/mattermost/server/v8/channels/utils" ) diff --git a/server/channels/app/notification.go b/server/channels/app/notification.go index fa5607c4a0..6d1a4a52e2 100644 --- a/server/channels/app/notification.go +++ b/server/channels/app/notification.go @@ -19,7 +19,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" ) diff --git a/server/channels/app/notification_email.go b/server/channels/app/notification_email.go index 11f2ae2e99..e3df43a41a 100644 --- a/server/channels/app/notification_email.go +++ b/server/channels/app/notification_email.go @@ -17,8 +17,8 @@ import ( "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/request" 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" ) diff --git a/server/channels/app/notification_push.go b/server/channels/app/notification_push.go index 750f2a3fb5..d52868ef38 100644 --- a/server/channels/app/notification_push.go +++ b/server/channels/app/notification_push.go @@ -19,7 +19,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/utils" ) diff --git a/server/channels/app/notify_admin.go b/server/channels/app/notify_admin.go index 54a319cfaf..5287fa9934 100644 --- a/server/channels/app/notify_admin.go +++ b/server/channels/app/notify_admin.go @@ -14,7 +14,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" ) diff --git a/server/channels/app/notify_admin_test.go b/server/channels/app/notify_admin_test.go index 2be48e8f5b..018c76fa37 100644 --- a/server/channels/app/notify_admin_test.go +++ b/server/channels/app/notify_admin_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/public/shared/request" ) const PluginIdGithub = "github" diff --git a/server/channels/app/oauth.go b/server/channels/app/oauth.go index 5a0d4793c9..4c287cd9b2 100644 --- a/server/channels/app/oauth.go +++ b/server/channels/app/oauth.go @@ -21,8 +21,8 @@ import ( "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/request" "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" diff --git a/server/channels/app/onboarding.go b/server/channels/app/onboarding.go index 0184fd6f5c..e085d803e4 100644 --- a/server/channels/app/onboarding.go +++ b/server/channels/app/onboarding.go @@ -10,7 +10,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" ) diff --git a/server/channels/app/onboarding_test.go b/server/channels/app/onboarding_test.go index 9d7dd0e06f..a9d5c60cd8 100644 --- a/server/channels/app/onboarding_test.go +++ b/server/channels/app/onboarding_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" mm_model "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/public/shared/request" ) func TestOnboardingSavesOrganizationName(t *testing.T) { diff --git a/server/channels/app/opentracing/opentracing_layer.go b/server/channels/app/opentracing/opentracing_layer.go index 8b490d0ec3..25b424533f 100644 --- a/server/channels/app/opentracing/opentracing_layer.go +++ b/server/channels/app/opentracing/opentracing_layer.go @@ -22,10 +22,10 @@ import ( "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/request" "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" @@ -37,6 +37,7 @@ import ( "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/permissions.go b/server/channels/app/permissions.go index 31fc9bd576..26d6a61486 100644 --- a/server/channels/app/permissions.go +++ b/server/channels/app/permissions.go @@ -14,7 +14,7 @@ import ( "github.com/pkg/errors" "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/product" ) diff --git a/server/channels/app/plugin.go b/server/channels/app/plugin.go index 9bbbb4381a..69bca16d83 100644 --- a/server/channels/app/plugin.go +++ b/server/channels/app/plugin.go @@ -24,7 +24,7 @@ import ( "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/public/shared/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" diff --git a/server/channels/app/plugin_api.go b/server/channels/app/plugin_api.go index 3c9cacb585..7c6f38cd3e 100644 --- a/server/channels/app/plugin_api.go +++ b/server/channels/app/plugin_api.go @@ -17,7 +17,7 @@ import ( "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/public/shared/request" ) type PluginAPI struct { diff --git a/server/channels/app/plugin_api_test.go b/server/channels/app/plugin_api_test.go index 02cc881467..01ef03dec0 100644 --- a/server/channels/app/plugin_api_test.go +++ b/server/channels/app/plugin_api_test.go @@ -31,7 +31,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" "github.com/mattermost/mattermost/server/v8/einterfaces/mocks" ) diff --git a/server/channels/app/plugin_commands.go b/server/channels/app/plugin_commands.go index 17b246fa7d..24c64e2c80 100644 --- a/server/channels/app/plugin_commands.go +++ b/server/channels/app/plugin_commands.go @@ -13,7 +13,7 @@ import ( "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/public/shared/request" ) type PluginCommand struct { diff --git a/server/channels/app/plugin_commands_test.go b/server/channels/app/plugin_commands_test.go index dee14b35b8..015d1bfd2d 100644 --- a/server/channels/app/plugin_commands_test.go +++ b/server/channels/app/plugin_commands_test.go @@ -13,7 +13,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/product" ) diff --git a/server/channels/app/plugin_hooks_test.go b/server/channels/app/plugin_hooks_test.go index b8880e8164..9c5321f0d1 100644 --- a/server/channels/app/plugin_hooks_test.go +++ b/server/channels/app/plugin_hooks_test.go @@ -26,7 +26,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/einterfaces/mocks" ) diff --git a/server/channels/app/plugin_test.go b/server/channels/app/plugin_test.go index 34aa0d06f6..b95ae7e9cc 100644 --- a/server/channels/app/plugin_test.go +++ b/server/channels/app/plugin_test.go @@ -27,7 +27,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/testlib" "github.com/mattermost/mattermost/server/v8/channels/utils/fileutils" ) diff --git a/server/channels/app/post.go b/server/channels/app/post.go index edd837ec3b..340ff28ee9 100644 --- a/server/channels/app/post.go +++ b/server/channels/app/post.go @@ -19,7 +19,7 @@ import ( "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/public/shared/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" diff --git a/server/channels/app/post_acknowledgements.go b/server/channels/app/post_acknowledgements.go index 10fe84a798..3af4cc17ab 100644 --- a/server/channels/app/post_acknowledgements.go +++ b/server/channels/app/post_acknowledgements.go @@ -10,7 +10,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" ) diff --git a/server/channels/app/post_metadata.go b/server/channels/app/post_metadata.go index 3e957ac3ca..d49c33e010 100644 --- a/server/channels/app/post_metadata.go +++ b/server/channels/app/post_metadata.go @@ -22,8 +22,8 @@ import ( "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/public/shared/request" "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" ) diff --git a/server/channels/app/post_persistent_notification.go b/server/channels/app/post_persistent_notification.go index 3baf5c42c4..773756afb2 100644 --- a/server/channels/app/post_persistent_notification.go +++ b/server/channels/app/post_persistent_notification.go @@ -10,7 +10,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" "github.com/pkg/errors" ) diff --git a/server/channels/app/product_notices.go b/server/channels/app/product_notices.go index 77fe812e55..95d467300e 100644 --- a/server/channels/app/product_notices.go +++ b/server/channels/app/product_notices.go @@ -17,7 +17,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" "github.com/mattermost/mattermost/server/v8/channels/utils" "github.com/mattermost/mattermost/server/v8/config" diff --git a/server/channels/app/reaction.go b/server/channels/app/reaction.go index 56e1bdc211..9dccc3812c 100644 --- a/server/channels/app/reaction.go +++ b/server/channels/app/reaction.go @@ -11,7 +11,7 @@ import ( "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/public/shared/request" ) func (a *App) SaveReactionForPost(c *request.Context, reaction *model.Reaction) (*model.Reaction, *model.AppError) { diff --git a/server/channels/app/server.go b/server/channels/app/server.go index b568cb5c88..e340c1413a 100644 --- a/server/channels/app/server.go +++ b/server/channels/app/server.go @@ -30,10 +30,10 @@ import ( "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/request" "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" diff --git a/server/channels/app/shared_channel.go b/server/channels/app/shared_channel.go index b4d0043589..47d0158140 100644 --- a/server/channels/app/shared_channel.go +++ b/server/channels/app/shared_channel.go @@ -9,7 +9,7 @@ import ( "net/http" "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" ) diff --git a/server/channels/app/slack.go b/server/channels/app/slack.go index b4c5a0d079..1d832fdd42 100644 --- a/server/channels/app/slack.go +++ b/server/channels/app/slack.go @@ -14,7 +14,7 @@ import ( "time" "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" "github.com/mattermost/mattermost/server/v8/platform/services/slackimport" ) diff --git a/server/channels/app/slashcommands/auto_channels.go b/server/channels/app/slashcommands/auto_channels.go index 0e56ab9988..1881766882 100644 --- a/server/channels/app/slashcommands/auto_channels.go +++ b/server/channels/app/slashcommands/auto_channels.go @@ -5,8 +5,8 @@ package slashcommands import ( "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/request" "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" ) diff --git a/server/channels/app/slashcommands/auto_environment.go b/server/channels/app/slashcommands/auto_environment.go index 9e73a20dbe..664537e0f4 100644 --- a/server/channels/app/slashcommands/auto_environment.go +++ b/server/channels/app/slashcommands/auto_environment.go @@ -9,8 +9,8 @@ import ( "time" "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/request" "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" ) diff --git a/server/channels/app/slashcommands/auto_posts.go b/server/channels/app/slashcommands/auto_posts.go index 573c9c0120..7cea8bc7de 100644 --- a/server/channels/app/slashcommands/auto_posts.go +++ b/server/channels/app/slashcommands/auto_posts.go @@ -10,8 +10,8 @@ import ( "path/filepath" "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/request" "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" ) diff --git a/server/channels/app/slashcommands/auto_users.go b/server/channels/app/slashcommands/auto_users.go index d2aa7e765a..32c0afc41b 100644 --- a/server/channels/app/slashcommands/auto_users.go +++ b/server/channels/app/slashcommands/auto_users.go @@ -9,8 +9,8 @@ import ( "net/http" "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/request" "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" ) diff --git a/server/channels/app/slashcommands/command_away.go b/server/channels/app/slashcommands/command_away.go index 89fa9e2607..28c23689ac 100644 --- a/server/channels/app/slashcommands/command_away.go +++ b/server/channels/app/slashcommands/command_away.go @@ -6,8 +6,8 @@ package slashcommands import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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 7996ac48fd..0403e14274 100644 --- a/server/channels/app/slashcommands/command_channel_header.go +++ b/server/channels/app/slashcommands/command_channel_header.go @@ -6,8 +6,8 @@ package slashcommands import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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_purpose.go b/server/channels/app/slashcommands/command_channel_purpose.go index 0cdf813637..62fc4e8417 100644 --- a/server/channels/app/slashcommands/command_channel_purpose.go +++ b/server/channels/app/slashcommands/command_channel_purpose.go @@ -6,8 +6,8 @@ package slashcommands import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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_rename.go b/server/channels/app/slashcommands/command_channel_rename.go index a84d76053a..c387ee2265 100644 --- a/server/channels/app/slashcommands/command_channel_rename.go +++ b/server/channels/app/slashcommands/command_channel_rename.go @@ -6,8 +6,8 @@ package slashcommands import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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_code.go b/server/channels/app/slashcommands/command_code.go index c8582cd5f7..6b7f9acecf 100644 --- a/server/channels/app/slashcommands/command_code.go +++ b/server/channels/app/slashcommands/command_code.go @@ -8,8 +8,8 @@ import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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_custom_status.go b/server/channels/app/slashcommands/command_custom_status.go index 0851fb3b4e..809e707e25 100644 --- a/server/channels/app/slashcommands/command_custom_status.go +++ b/server/channels/app/slashcommands/command_custom_status.go @@ -11,8 +11,8 @@ import ( "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/request" "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_dnd.go b/server/channels/app/slashcommands/command_dnd.go index ac34f47cb4..1f613d910f 100644 --- a/server/channels/app/slashcommands/command_dnd.go +++ b/server/channels/app/slashcommands/command_dnd.go @@ -6,8 +6,8 @@ package slashcommands import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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 f2dd04e2c0..493d18f430 100644 --- a/server/channels/app/slashcommands/command_echo.go +++ b/server/channels/app/slashcommands/command_echo.go @@ -11,8 +11,8 @@ import ( "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/request" "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 95d40f4903..4ed28fde0c 100644 --- a/server/channels/app/slashcommands/command_expand_collapse.go +++ b/server/channels/app/slashcommands/command_expand_collapse.go @@ -9,8 +9,8 @@ import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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_exportlink.go b/server/channels/app/slashcommands/command_exportlink.go index e0780a0051..81a75a58ca 100644 --- a/server/channels/app/slashcommands/command_exportlink.go +++ b/server/channels/app/slashcommands/command_exportlink.go @@ -11,8 +11,8 @@ import ( "github.com/mattermost/logr/v2" "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/app" - "github.com/mattermost/mattermost/server/v8/channels/app/request" "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) diff --git a/server/channels/app/slashcommands/command_groupmsg.go b/server/channels/app/slashcommands/command_groupmsg.go index ea820fe6c8..43eb186876 100644 --- a/server/channels/app/slashcommands/command_groupmsg.go +++ b/server/channels/app/slashcommands/command_groupmsg.go @@ -10,8 +10,8 @@ import ( "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/request" "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_help.go b/server/channels/app/slashcommands/command_help.go index 0d1509e378..87296867db 100644 --- a/server/channels/app/slashcommands/command_help.go +++ b/server/channels/app/slashcommands/command_help.go @@ -6,8 +6,8 @@ package slashcommands import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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 b2d04bcb21..303240d2ab 100644 --- a/server/channels/app/slashcommands/command_invite.go +++ b/server/channels/app/slashcommands/command_invite.go @@ -8,8 +8,8 @@ import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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 2bfede51f5..702e13a48b 100644 --- a/server/channels/app/slashcommands/command_invite_people.go +++ b/server/channels/app/slashcommands/command_invite_people.go @@ -9,8 +9,8 @@ import ( "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/request" "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_join.go b/server/channels/app/slashcommands/command_join.go index 9e894aadd7..2bc6be9066 100644 --- a/server/channels/app/slashcommands/command_join.go +++ b/server/channels/app/slashcommands/command_join.go @@ -8,8 +8,8 @@ import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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_leave.go b/server/channels/app/slashcommands/command_leave.go index 33dc1cbc2b..81a1898e50 100644 --- a/server/channels/app/slashcommands/command_leave.go +++ b/server/channels/app/slashcommands/command_leave.go @@ -6,8 +6,8 @@ package slashcommands import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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_loadtest.go b/server/channels/app/slashcommands/command_loadtest.go index 18dc3ada29..632bacf7dd 100644 --- a/server/channels/app/slashcommands/command_loadtest.go +++ b/server/channels/app/slashcommands/command_loadtest.go @@ -18,8 +18,8 @@ import ( "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/request" "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" ) diff --git a/server/channels/app/slashcommands/command_logout.go b/server/channels/app/slashcommands/command_logout.go index 376698b14c..0263b83bb2 100644 --- a/server/channels/app/slashcommands/command_logout.go +++ b/server/channels/app/slashcommands/command_logout.go @@ -6,8 +6,8 @@ package slashcommands import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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 1da6433279..7e36c91ca8 100644 --- a/server/channels/app/slashcommands/command_marketplace.go +++ b/server/channels/app/slashcommands/command_marketplace.go @@ -6,8 +6,8 @@ package slashcommands import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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_me.go b/server/channels/app/slashcommands/command_me.go index c11424df2d..794f3bddc9 100644 --- a/server/channels/app/slashcommands/command_me.go +++ b/server/channels/app/slashcommands/command_me.go @@ -6,8 +6,8 @@ package slashcommands import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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_msg.go b/server/channels/app/slashcommands/command_msg.go index 80272f1cf1..297139ea12 100644 --- a/server/channels/app/slashcommands/command_msg.go +++ b/server/channels/app/slashcommands/command_msg.go @@ -10,8 +10,8 @@ import ( "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/request" "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" ) diff --git a/server/channels/app/slashcommands/command_mute.go b/server/channels/app/slashcommands/command_mute.go index 4e47aa6d51..fd5e6894b1 100644 --- a/server/channels/app/slashcommands/command_mute.go +++ b/server/channels/app/slashcommands/command_mute.go @@ -8,8 +8,8 @@ import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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_offline.go b/server/channels/app/slashcommands/command_offline.go index 26346e0171..8b013084cd 100644 --- a/server/channels/app/slashcommands/command_offline.go +++ b/server/channels/app/slashcommands/command_offline.go @@ -6,8 +6,8 @@ package slashcommands import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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 68d7f99ceb..aaa8a9c0e2 100644 --- a/server/channels/app/slashcommands/command_online.go +++ b/server/channels/app/slashcommands/command_online.go @@ -6,8 +6,8 @@ package slashcommands import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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_remote.go b/server/channels/app/slashcommands/command_remote.go index de3e9ca7ed..8568a53018 100644 --- a/server/channels/app/slashcommands/command_remote.go +++ b/server/channels/app/slashcommands/command_remote.go @@ -11,8 +11,8 @@ import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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 e429706ccc..a34906e98a 100644 --- a/server/channels/app/slashcommands/command_remove.go +++ b/server/channels/app/slashcommands/command_remove.go @@ -9,8 +9,8 @@ import ( "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/request" "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_search.go b/server/channels/app/slashcommands/command_search.go index a2d505aac8..b7b3dacfc3 100644 --- a/server/channels/app/slashcommands/command_search.go +++ b/server/channels/app/slashcommands/command_search.go @@ -6,8 +6,8 @@ package slashcommands import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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 b6710a7ef1..96071729c0 100644 --- a/server/channels/app/slashcommands/command_settings.go +++ b/server/channels/app/slashcommands/command_settings.go @@ -6,8 +6,8 @@ package slashcommands import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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 a680515b9c..629c5debd5 100644 --- a/server/channels/app/slashcommands/command_share.go +++ b/server/channels/app/slashcommands/command_share.go @@ -10,8 +10,8 @@ import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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_shortcuts.go b/server/channels/app/slashcommands/command_shortcuts.go index 019c6a341a..26b2b5f706 100644 --- a/server/channels/app/slashcommands/command_shortcuts.go +++ b/server/channels/app/slashcommands/command_shortcuts.go @@ -6,8 +6,8 @@ package slashcommands import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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 2685485447..3af4dbefb0 100644 --- a/server/channels/app/slashcommands/command_shrug.go +++ b/server/channels/app/slashcommands/command_shrug.go @@ -6,8 +6,8 @@ package slashcommands import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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/helper_test.go b/server/channels/app/slashcommands/helper_test.go index bd0f88668a..a7a639bdb6 100644 --- a/server/channels/app/slashcommands/helper_test.go +++ b/server/channels/app/slashcommands/helper_test.go @@ -15,8 +15,8 @@ import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/mlog" + "github.com/mattermost/mattermost/server/public/shared/request" "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" ) diff --git a/server/channels/app/status.go b/server/channels/app/status.go index 0fbc15eb18..f5129f3601 100644 --- a/server/channels/app/status.go +++ b/server/channels/app/status.go @@ -9,7 +9,7 @@ import ( "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/public/shared/request" ) // GetUserStatusesByIds used by apiV4 diff --git a/server/channels/app/syncables.go b/server/channels/app/syncables.go index 785b6aca93..5a060f2b97 100644 --- a/server/channels/app/syncables.go +++ b/server/channels/app/syncables.go @@ -10,7 +10,7 @@ import ( "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/public/shared/request" ) // createDefaultChannelMemberships adds users to channels based on their group memberships and how those groups are diff --git a/server/channels/app/team.go b/server/channels/app/team.go index f95a5c1889..9521e96b12 100644 --- a/server/channels/app/team.go +++ b/server/channels/app/team.go @@ -21,9 +21,9 @@ import ( "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/request" "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" diff --git a/server/channels/app/teams/helper_test.go b/server/channels/app/teams/helper_test.go index a80864a030..2eaebb56e5 100644 --- a/server/channels/app/teams/helper_test.go +++ b/server/channels/app/teams/helper_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" "github.com/mattermost/mattermost/server/v8/config" ) diff --git a/server/channels/app/upload.go b/server/channels/app/upload.go index 9b1858744b..7de74b999c 100644 --- a/server/channels/app/upload.go +++ b/server/channels/app/upload.go @@ -16,7 +16,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" ) diff --git a/server/channels/app/user.go b/server/channels/app/user.go index a778e56196..ce8d5d5397 100644 --- a/server/channels/app/user.go +++ b/server/channels/app/user.go @@ -23,9 +23,9 @@ import ( "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/request" "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" diff --git a/server/channels/app/user_test.go b/server/channels/app/user_test.go index f80eae0896..282586d8ed 100644 --- a/server/channels/app/user_test.go +++ b/server/channels/app/user_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/require" "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/request" 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" diff --git a/server/channels/app/users/helper_test.go b/server/channels/app/users/helper_test.go index 05f6ca4e69..0cb615b28d 100644 --- a/server/channels/app/users/helper_test.go +++ b/server/channels/app/users/helper_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" "github.com/mattermost/mattermost/server/v8/config" ) diff --git a/server/channels/app/webhook.go b/server/channels/app/webhook.go index e5600ef373..bca2b42bff 100644 --- a/server/channels/app/webhook.go +++ b/server/channels/app/webhook.go @@ -16,7 +16,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" "github.com/mattermost/mattermost/server/v8/channels/utils" ) diff --git a/server/channels/jobs/export_process/worker.go b/server/channels/jobs/export_process/worker.go index c8743b4419..f7fc88b910 100644 --- a/server/channels/jobs/export_process/worker.go +++ b/server/channels/jobs/export_process/worker.go @@ -10,7 +10,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/jobs" "github.com/mattermost/mattermost/server/v8/platform/services/configservice" ) diff --git a/server/channels/jobs/import_process/worker.go b/server/channels/jobs/import_process/worker.go index db07b4e5c5..cf3ee8d56b 100644 --- a/server/channels/jobs/import_process/worker.go +++ b/server/channels/jobs/import_process/worker.go @@ -14,7 +14,7 @@ import ( "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/public/shared/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" diff --git a/server/channels/product/api.go b/server/channels/product/api.go index de886aae84..60f24927eb 100644 --- a/server/channels/product/api.go +++ b/server/channels/product/api.go @@ -10,7 +10,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/platform/shared/filestore" ) diff --git a/server/channels/web/context.go b/server/channels/web/context.go index c269c79d4b..8e28329011 100644 --- a/server/channels/web/context.go +++ b/server/channels/web/context.go @@ -12,8 +12,8 @@ import ( "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/request" "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" ) diff --git a/server/channels/web/handlers.go b/server/channels/web/handlers.go index da155e317e..71a3688532 100644 --- a/server/channels/web/handlers.go +++ b/server/channels/web/handlers.go @@ -23,9 +23,9 @@ import ( "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/request" "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" diff --git a/server/channels/web/unsupported_browser.go b/server/channels/web/unsupported_browser.go index 692847fded..f30fbef9d7 100644 --- a/server/channels/web/unsupported_browser.go +++ b/server/channels/web/unsupported_browser.go @@ -8,7 +8,7 @@ import ( "github.com/avct/uasurfer" - "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/public/shared/request" "github.com/mattermost/mattermost/server/v8/platform/shared/templates" ) diff --git a/server/channels/web/web_test.go b/server/channels/web/web_test.go index 11ebf92885..70df148dbd 100644 --- a/server/channels/web/web_test.go +++ b/server/channels/web/web_test.go @@ -21,8 +21,8 @@ import ( "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/public/shared/request" "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" diff --git a/server/channels/wsapi/user.go b/server/channels/wsapi/user.go index b407025bcd..d94db4fe84 100644 --- a/server/channels/wsapi/user.go +++ b/server/channels/wsapi/user.go @@ -5,7 +5,7 @@ package wsapi import ( "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/public/shared/request" ) func (api *API) InitUser() { diff --git a/server/cmd/mattermost/commands/export.go b/server/cmd/mattermost/commands/export.go index c2b4845659..0dcceaa4c2 100644 --- a/server/cmd/mattermost/commands/export.go +++ b/server/cmd/mattermost/commands/export.go @@ -11,8 +11,8 @@ import ( "time" "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/request" "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" diff --git a/server/cmd/mattermost/commands/import.go b/server/cmd/mattermost/commands/import.go index 2c62f432d9..3b5ca0145d 100644 --- a/server/cmd/mattermost/commands/import.go +++ b/server/cmd/mattermost/commands/import.go @@ -11,8 +11,8 @@ import ( "github.com/spf13/cobra" "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/request" "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" ) diff --git a/server/cmd/mattermost/commands/init.go b/server/cmd/mattermost/commands/init.go index 140624eb0c..5101aa9926 100644 --- a/server/cmd/mattermost/commands/init.go +++ b/server/cmd/mattermost/commands/init.go @@ -9,8 +9,8 @@ import ( "github.com/mattermost/mattermost/server/public/model" "github.com/mattermost/mattermost/server/public/shared/i18n" + "github.com/mattermost/mattermost/server/public/shared/request" "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/sqlstore" "github.com/mattermost/mattermost/server/v8/channels/utils" diff --git a/server/einterfaces/ldap.go b/server/einterfaces/ldap.go index 2e2bbdfed2..92471a2a07 100644 --- a/server/einterfaces/ldap.go +++ b/server/einterfaces/ldap.go @@ -5,7 +5,7 @@ package einterfaces import ( "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/public/shared/request" ) type LdapInterface interface { diff --git a/server/einterfaces/mocks/LdapInterface.go b/server/einterfaces/mocks/LdapInterface.go index 32e9ab2bd9..8ea7b81a1b 100644 --- a/server/einterfaces/mocks/LdapInterface.go +++ b/server/einterfaces/mocks/LdapInterface.go @@ -6,7 +6,7 @@ package mocks import ( model "github.com/mattermost/mattermost/server/public/model" - request "github.com/mattermost/mattermost/server/v8/channels/app/request" + request "github.com/mattermost/mattermost/server/public/shared/request" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/mocks/SamlInterface.go b/server/einterfaces/mocks/SamlInterface.go index 3e9de0f093..8ea64e85df 100644 --- a/server/einterfaces/mocks/SamlInterface.go +++ b/server/einterfaces/mocks/SamlInterface.go @@ -6,7 +6,7 @@ package mocks import ( model "github.com/mattermost/mattermost/server/public/model" - request "github.com/mattermost/mattermost/server/v8/channels/app/request" + request "github.com/mattermost/mattermost/server/public/shared/request" mock "github.com/stretchr/testify/mock" ) diff --git a/server/einterfaces/saml.go b/server/einterfaces/saml.go index 35dfd3fede..1417a07ad1 100644 --- a/server/einterfaces/saml.go +++ b/server/einterfaces/saml.go @@ -5,7 +5,7 @@ package einterfaces import ( "github.com/mattermost/mattermost/server/public/model" - "github.com/mattermost/mattermost/server/v8/channels/app/request" + "github.com/mattermost/mattermost/server/public/shared/request" ) type SamlInterface interface { diff --git a/server/platform/services/sharedchannel/attachment.go b/server/platform/services/sharedchannel/attachment.go index b9ddfbb03b..b8671d0e66 100644 --- a/server/platform/services/sharedchannel/attachment.go +++ b/server/platform/services/sharedchannel/attachment.go @@ -12,7 +12,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" ) diff --git a/server/platform/services/sharedchannel/channelinvite.go b/server/platform/services/sharedchannel/channelinvite.go index df83cabde5..bad0e87eaa 100644 --- a/server/platform/services/sharedchannel/channelinvite.go +++ b/server/platform/services/sharedchannel/channelinvite.go @@ -11,7 +11,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" ) diff --git a/server/platform/services/sharedchannel/mock_AppIface_test.go b/server/platform/services/sharedchannel/mock_AppIface_test.go index 8579a8960a..b5ea5cc4a9 100644 --- a/server/platform/services/sharedchannel/mock_AppIface_test.go +++ b/server/platform/services/sharedchannel/mock_AppIface_test.go @@ -10,7 +10,7 @@ import ( model "github.com/mattermost/mattermost/server/public/model" - request "github.com/mattermost/mattermost/server/v8/channels/app/request" + request "github.com/mattermost/mattermost/server/public/shared/request" ) // MockAppIface is an autogenerated mock type for the AppIface type diff --git a/server/platform/services/sharedchannel/service.go b/server/platform/services/sharedchannel/service.go index 23621b5712..13331bec5c 100644 --- a/server/platform/services/sharedchannel/service.go +++ b/server/platform/services/sharedchannel/service.go @@ -12,7 +12,7 @@ import ( "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/public/shared/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" diff --git a/server/platform/services/sharedchannel/sync_recv.go b/server/platform/services/sharedchannel/sync_recv.go index d28ddf7d74..c1df7bfed7 100644 --- a/server/platform/services/sharedchannel/sync_recv.go +++ b/server/platform/services/sharedchannel/sync_recv.go @@ -13,7 +13,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" ) diff --git a/server/platform/services/sharedchannel/sync_send.go b/server/platform/services/sharedchannel/sync_send.go index 9e125848a1..82a0255e7d 100644 --- a/server/platform/services/sharedchannel/sync_send.go +++ b/server/platform/services/sharedchannel/sync_send.go @@ -11,7 +11,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" ) diff --git a/server/platform/services/sharedchannel/sync_send_remote.go b/server/platform/services/sharedchannel/sync_send_remote.go index c539b79603..6da93e69c7 100644 --- a/server/platform/services/sharedchannel/sync_send_remote.go +++ b/server/platform/services/sharedchannel/sync_send_remote.go @@ -13,7 +13,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/platform/services/remotecluster" ) diff --git a/server/platform/services/slackimport/slackimport.go b/server/platform/services/slackimport/slackimport.go index 4f59256c41..0f56f1c2c2 100644 --- a/server/platform/services/slackimport/slackimport.go +++ b/server/platform/services/slackimport/slackimport.go @@ -21,7 +21,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store" "github.com/mattermost/mattermost/server/v8/channels/utils" ) diff --git a/server/platform/services/slackimport/slackimport_test.go b/server/platform/services/slackimport/slackimport_test.go index d4e3f2a8a5..821abf532f 100644 --- a/server/platform/services/slackimport/slackimport_test.go +++ b/server/platform/services/slackimport/slackimport_test.go @@ -14,7 +14,7 @@ import ( "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/public/shared/request" "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks" ) diff --git a/server/channels/app/request/context.go b/server/public/shared/request/context.go similarity index 100% rename from server/channels/app/request/context.go rename to server/public/shared/request/context.go