mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Upgrade Go to 1.24.3 (#31220)

Просмотр исходного кода 
* Upgrade Go to 1.24.3

Updates the following files:
- server/.go-version: 1.23.9 → 1.24.3
- server/build/Dockerfile.buildenv: golang:1.23.9-bullseye → golang:1.24.3-bullseye
- server/go.mod: go 1.23.0 → go 1.24.3, toolchain go1.23.9 → go1.24.3
- server/public/go.mod: go 1.23.0 → go 1.24.3, toolchain go1.23.9 → go1.24.3

Also fixes non-constant format string errors introduced by Go 1.24.3's stricter format string checking:
- Added response() helper function in slashcommands/util.go for simple string responses
- Removed unused responsef() function from slashcommands/util.go
- Replaced responsef() with response() for translated strings that don't need formatting
- Fixed fmt.Errorf and fmt.Fprintf calls to use proper format verbs instead of string concatenation
- Updated marketplace buildURL to handle format strings conditionally

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Update generated mocks for Go 1.24.3

Regenerated mocks using mockery v2.53.4 to ensure compatibility with Go 1.24.3.
This addresses mock generation failures that occurred with the Go upgrade.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Update to bookworm and fix non-existent sha

Signed-off-by: Stavros Foteinopoulos <stafot@gmail.com>

* fix non-constant format string

---------

Signed-off-by: Stavros Foteinopoulos <stafot@gmail.com>
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: Stavros Foteinopoulos <stafot@gmail.com>
Этот коммит содержится в:
Jesse Hallam
2025-06-10 15:04:57 -03:00
коммит произвёл GitHub
родитель d01d6501f7
Коммит e6d8bf5835
110 изменённых файлов: 422 добавлений и 425 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
server/.go-version
Просмотреть файл

@@ -1 +1 @@
1.23.9
1.24.3

24
server/Makefile
Просмотреть файл

@@ -317,15 +317,15 @@ i18n-check: ## Exit on empty translation strings and translation source strings
$(GOBIN)/mmgotool i18n check-empty-src --portal-dir=""
store-mocks: ## Creates mock files.
$(GO) install github.com/vektra/mockery/v2/...@v2.42.2
$(GO) install github.com/vektra/mockery/v2/...@v2.53.4
$(GOBIN)/mockery --config channels/store/.mockery.yaml
cache-mocks:
$(GO) install github.com/vektra/mockery/v2/...@v2.42.2
$(GO) install github.com/vektra/mockery/v2/...@v2.53.4
$(GOBIN)/mockery --config platform/services/cache/.mockery.yaml
telemetry-mocks: ## Creates mock files.
$(GO) install github.com/vektra/mockery/v2/...@v2.42.2
$(GO) install github.com/vektra/mockery/v2/...@v2.53.4
$(GOBIN)/mockery --config platform/services/telemetry/.mockery.yaml
store-layers: ## Generate layers for the store
@@ -340,39 +340,39 @@ new-migration: ## Creates a new migration. Run with make new-migration name=<>
$(GOBIN)/morph new script $(name) --driver postgres --dir channels/db/migrations --sequence
filestore-mocks: ## Creates mock files.
$(GO) install github.com/vektra/mockery/v2/...@v2.42.2
$(GO) install github.com/vektra/mockery/v2/...@v2.53.4
$(GOBIN)/mockery --config platform/shared/filestore/.mockery.yaml
ldap-mocks: ## Creates mock files for ldap.
$(GO) install github.com/vektra/mockery/v2/...@v2.42.2
$(GO) install github.com/vektra/mockery/v2/...@v2.53.4
$(GOBIN)/mockery --dir $(BUILD_ENTERPRISE_DIR)/ldap --all --inpackage --note 'Regenerate this file using `make ldap-mocks`.'
plugin-mocks: ## Creates mock files for plugins.
$(GO) install github.com/vektra/mockery/v2/...@v2.42.2
$(GO) install github.com/vektra/mockery/v2/...@v2.53.4
$(GOBIN)/mockery --config public/plugin/.mockery.yaml
einterfaces-mocks: ## Creates mock files for einterfaces.
$(GO) install github.com/vektra/mockery/v2/...@v2.42.2
$(GO) install github.com/vektra/mockery/v2/...@v2.53.4
$(GOBIN)/mockery --config einterfaces/.mockery.yaml
searchengine-mocks: ## Creates mock files for searchengines.
$(GO) install github.com/vektra/mockery/v2/...@v2.42.2
$(GO) install github.com/vektra/mockery/v2/...@v2.53.4
$(GOBIN)/mockery --config platform/services/searchengine/.mockery.yaml
sharedchannel-mocks: ## Creates mock files for shared channels.
$(GO) install github.com/vektra/mockery/v2/...@v2.42.2
$(GO) install github.com/vektra/mockery/v2/...@v2.53.4
$(GOBIN)/mockery --config platform/services/sharedchannel/.mockery.yaml
misc-mocks: ## Creates mocks for misc interfaces.
$(GO) install github.com/vektra/mockery/v2/...@v2.42.2
$(GO) install github.com/vektra/mockery/v2/...@v2.53.4
$(GOBIN)/mockery --config channels/utils/.mockery.yaml
email-mocks: ## Creates mocks for misc interfaces.
$(GO) install github.com/vektra/mockery/v2/...@v2.42.2
$(GO) install github.com/vektra/mockery/v2/...@v2.53.4
$(GOBIN)/mockery --config channels/app/email/.mockery.yaml
platform-mocks: ## Creates mocks for platform interfaces.
$(GO) install github.com/vektra/mockery/v2/...@v2.42.2
$(GO) install github.com/vektra/mockery/v2/...@v2.53.4
$(GOBIN)/mockery --config channels/app/platform/.mockery.yaml
mmctl-mocks: ## Creates mocks for mmctl

2
server/build/Dockerfile.buildenv
Просмотреть файл

@@ -1,4 +1,4 @@
FROM golang:1.23.9-bullseye@sha256:f2ea45502b0565bd554ed2d4954ef1eb434df07ff4cdb867fabb4d2a6b1c0668
FROM golang:1.24.3-bookworm@sha256:29d97266c1d341b7424e2f5085440b74654ae0b61ecdba206bc12d6264844e21
RUN apt-get update && apt-get install -y make git apt-transport-https ca-certificates curl software-properties-common build-essential zip xmlsec1 jq pgloader

8
server/channels/app/email/mocks/ServiceInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make email-mocks`.
@@ -121,7 +121,7 @@ func (_m *ServiceInterface) GetMessageForNotification(post *model.Post, teamName
return r0
}
// GetPerDayEmailRateLimiter provides a mock function with given fields:
// GetPerDayEmailRateLimiter provides a mock function with no fields
func (_m *ServiceInterface) GetPerDayEmailRateLimiter() *throttled.GCRARateLimiter {
ret := _m.Called()
@@ -141,7 +141,7 @@ func (_m *ServiceInterface) GetPerDayEmailRateLimiter() *throttled.GCRARateLimit
return r0
}
// InitEmailBatching provides a mock function with given fields:
// InitEmailBatching provides a mock function with no fields
func (_m *ServiceInterface) InitEmailBatching() {
_m.Called()
}
@@ -551,7 +551,7 @@ func (_m *ServiceInterface) SetStore(st store.Store) {
_m.Called(st)
}
// Stop provides a mock function with given fields:
// Stop provides a mock function with no fields
func (_m *ServiceInterface) Stop() {
_m.Called()
}

10
server/channels/app/notification_email_test.go
Просмотреть файл

@@ -130,7 +130,7 @@ func TestGetNotificationEmailBodyFullNotificationGroupChannel(t *testing.T) {
body, err := th.App.getNotificationEmailBody(th.Context, recipient, post, channel, channelName, senderName, teamName, teamURL, emailNotificationContentsType, true, translateFunc, "user-avatar.png")
require.NoError(t, err)
require.Contains(t, body, "sent you a new message", fmt.Sprintf("Expected email text 'sent you a new message. Got "+body))
require.Contains(t, body, "sent you a new message", fmt.Sprintf("Expected email text 'sent you a new message. Got %s", body))
require.Contains(t, body, post.Message, fmt.Sprintf("Expected email text '%s'. Got %s", post.Message, body))
require.Contains(t, body, teamURL, fmt.Sprintf("Expected email text '%s'. Got %s", teamURL, body))
}
@@ -162,7 +162,7 @@ func TestGetNotificationEmailBodyFullNotificationPrivateChannel(t *testing.T) {
body, err := th.App.getNotificationEmailBody(th.Context, recipient, post, channel, channelName, senderName, teamName, teamURL, emailNotificationContentsType, true, translateFunc, "user-avatar.png")
require.NoError(t, err)
require.Contains(t, body, "mentioned you in a message", fmt.Sprintf("Expected email text 'mentioned you in a message. Got "+body))
require.Contains(t, body, "mentioned you in a message", fmt.Sprintf("Expected email text 'mentioned you in a message. Got %s", body))
require.Contains(t, body, post.Message, fmt.Sprintf("Expected email text '%s'. Got %s", post.Message, body))
require.Contains(t, body, teamURL, fmt.Sprintf("Expected email text '%s'. Got %s", teamURL, body))
}
@@ -194,7 +194,7 @@ func TestGetNotificationEmailBodyFullNotificationDirectChannel(t *testing.T) {
body, err := th.App.getNotificationEmailBody(th.Context, recipient, post, channel, channelName, senderName, teamName, teamURL, emailNotificationContentsType, true, translateFunc, "user-avatar.png")
require.NoError(t, err)
require.Contains(t, body, "sent you a new message", fmt.Sprintf("Expected email text 'sent you a new message. Got "+body))
require.Contains(t, body, "sent you a new message", fmt.Sprintf("Expected email text 'sent you a new message. Got %s", body))
require.Contains(t, body, post.Message, fmt.Sprintf("Expected email text '%s'. Got %s", post.Message, body))
require.Contains(t, body, teamURL, fmt.Sprintf("Expected email text '%s'. Got %s", teamURL, body))
}
@@ -554,7 +554,7 @@ func TestGetNotificationEmailBodyGenericNotificationGroupChannel(t *testing.T) {
body, err := th.App.getNotificationEmailBody(th.Context, recipient, post, channel, channelName, senderName, teamName, teamURL, emailNotificationContentsType, true, translateFunc, "user-avatar.png")
require.NoError(t, err)
require.Contains(t, body, "sent you a new message", fmt.Sprintf("Expected email text 'sent you a new message. Got "+body))
require.Contains(t, body, "sent you a new message", fmt.Sprintf("Expected email text 'sent you a new message. Got %s", body))
require.Contains(t, body, teamURL, fmt.Sprintf("Expected email text '%s'. Got %s", teamURL, body))
}
@@ -616,7 +616,7 @@ func TestGetNotificationEmailBodyGenericNotificationDirectChannel(t *testing.T)
body, err := th.App.getNotificationEmailBody(th.Context, recipient, post, channel, channelName, senderName, teamName, teamURL, emailNotificationContentsType, true, translateFunc, "user-avatar.png")
require.NoError(t, err)
require.Contains(t, body, "sent you a new message", fmt.Sprintf("Expected email text 'sent you a new message. Got "+body))
require.Contains(t, body, "sent you a new message", fmt.Sprintf("Expected email text 'sent you a new message. Got %s", body))
require.Contains(t, body, teamURL, fmt.Sprintf("Expected email text '%s'. Got %s", teamURL, body))
}

2
server/channels/app/platform/config.go
Просмотреть файл

@@ -309,7 +309,7 @@ func (ps *PlatformService) EnsureAsymmetricSigningKey() error {
case "P-256":
curve = elliptic.P256()
default:
return fmt.Errorf("unknown curve: " + key.ECDSAKey.Curve)
return fmt.Errorf("unknown curve: %s", key.ECDSAKey.Curve)
}
ps.asymmetricSigningKey.Store(&ecdsa.PrivateKey{
PublicKey: ecdsa.PublicKey{

2
server/channels/app/platform/mocks/SuiteIFace.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make platform-mocks`.

48
server/channels/app/slashcommands/command_remote.go
Просмотреть файл

@@ -72,13 +72,13 @@ func (rp *RemoteProvider) GetCommand(a *app.App, T i18n.TranslateFunc) *model.Co
func (rp *RemoteProvider) DoCommand(a *app.App, c request.CTX, args *model.CommandArgs, message string) *model.CommandResponse {
if !a.HasPermissionTo(args.UserId, model.PermissionManageSecureConnections) {
return responsef(args.T("api.command_remote.permission_required", map[string]any{"Permission": "manage_secure_connections"}))
return response(args.T("api.command_remote.permission_required", map[string]any{"Permission": "manage_secure_connections"}))
}
margs := parseNamedArgs(args.Command)
action, ok := margs[ActionKey]
if !ok {
return responsef(args.T("api.command_remote.missing_command", map[string]any{"Actions": AvailableRemoteActions}))
return response(args.T("api.command_remote.missing_command", map[string]any{"Actions": AvailableRemoteActions}))
}
switch action {
@@ -92,7 +92,7 @@ func (rp *RemoteProvider) DoCommand(a *app.App, c request.CTX, args *model.Comma
return rp.doStatus(a, args, margs)
}
return responsef(args.T("api.command_remote.unknown_action", map[string]any{"Action": action}))
return response(args.T("api.command_remote.unknown_action", map[string]any{"Action": action}))
}
func (rp *RemoteProvider) GetAutoCompleteListItems(c request.CTX, a *app.App, commandArgs *model.CommandArgs, arg *model.AutocompleteArg, parsed, toBeParsed string) ([]model.AutocompleteListItem, error) {
@@ -111,12 +111,12 @@ func (rp *RemoteProvider) GetAutoCompleteListItems(c request.CTX, a *app.App, co
func (rp *RemoteProvider) doCreate(a *app.App, args *model.CommandArgs, margs map[string]string) *model.CommandResponse {
password := margs["password"]
if password == "" {
return responsef(args.T("api.command_remote.missing_empty", map[string]any{"Arg": "password"}))
return response(args.T("api.command_remote.missing_empty", map[string]any{"Arg": "password"}))
}
name := margs["name"]
if name == "" {
return responsef(args.T("api.command_remote.missing_empty", map[string]any{"Arg": "name"}))
return response(args.T("api.command_remote.missing_empty", map[string]any{"Arg": "name"}))
}
displayname := margs["displayname"]
@@ -126,7 +126,7 @@ func (rp *RemoteProvider) doCreate(a *app.App, args *model.CommandArgs, margs ma
url := a.GetSiteURL()
if url == "" {
return responsef(args.T("api.command_remote.site_url_not_set"))
return response(args.T("api.command_remote.site_url_not_set"))
}
rc := &model.RemoteCluster{
@@ -139,16 +139,16 @@ func (rp *RemoteProvider) doCreate(a *app.App, args *model.CommandArgs, margs ma
rcSaved, appErr := a.AddRemoteCluster(rc)
if appErr != nil {
return responsef(args.T("api.command_remote.add_remote.error", map[string]any{"Error": appErr.Error()}))
return response(args.T("api.command_remote.add_remote.error", map[string]any{"Error": appErr.Error()}))
}
// Display the encrypted invitation
inviteCode, err := a.CreateRemoteClusterInvite(rcSaved.RemoteId, url, rcSaved.Token, password)
if err != nil {
return responsef(args.T("api.command_remote.encrypt_invitation.error", map[string]any{"Error": err.Error()}))
return response(args.T("api.command_remote.encrypt_invitation.error", map[string]any{"Error": err.Error()}))
}
return responsef("##### " + args.T("api.command_remote.invitation_created") + "\n" +
return response("##### " + args.T("api.command_remote.invitation_created") + "\n" +
args.T("api.command_remote.invite_summary", map[string]any{"Command": "/secure-connection accept", "Invitation": inviteCode, "SiteURL": url}))
}
@@ -156,12 +156,12 @@ func (rp *RemoteProvider) doCreate(a *app.App, args *model.CommandArgs, margs ma
func (rp *RemoteProvider) doAccept(a *app.App, args *model.CommandArgs, margs map[string]string) *model.CommandResponse {
password := margs["password"]
if password == "" {
return responsef(args.T("api.command_remote.missing_empty", map[string]any{"Arg": "password"}))
return response(args.T("api.command_remote.missing_empty", map[string]any{"Arg": "password"}))
}
name := margs["name"]
if name == "" {
return responsef(args.T("api.command_remote.missing_empty", map[string]any{"Arg": "name"}))
return response(args.T("api.command_remote.missing_empty", map[string]any{"Arg": "name"}))
}
displayname := margs["displayname"]
@@ -171,65 +171,65 @@ func (rp *RemoteProvider) doAccept(a *app.App, args *model.CommandArgs, margs ma
blob := margs["invite"]
if blob == "" {
return responsef(args.T("api.command_remote.missing_empty", map[string]any{"Arg": "invite"}))
return response(args.T("api.command_remote.missing_empty", map[string]any{"Arg": "invite"}))
}
// invite is encoded as base64 and encrypted
invite, dErr := a.DecryptRemoteClusterInvite(blob, password)
if dErr != nil {
return responsef(args.T("api.command_remote.decode_invitation.error", map[string]any{"Error": dErr.Error()}))
return response(args.T("api.command_remote.decode_invitation.error", map[string]any{"Error": dErr.Error()}))
}
rcs, _ := a.GetRemoteClusterService()
if rcs == nil {
return responsef(args.T("api.command_remote.service_not_enabled"))
return response(args.T("api.command_remote.service_not_enabled"))
}
url := a.GetSiteURL()
if url == "" {
return responsef(args.T("api.command_remote.site_url_not_set"))
return response(args.T("api.command_remote.site_url_not_set"))
}
rc, err := rcs.AcceptInvitation(invite, name, displayname, args.UserId, url, "")
if err != nil {
return responsef(args.T("api.command_remote.accept_invitation.error", map[string]any{"Error": err.Error()}))
return response(args.T("api.command_remote.accept_invitation.error", map[string]any{"Error": err.Error()}))
}
return responsef("##### " + args.T("api.command_remote.accept_invitation", map[string]any{"SiteURL": rc.GetSiteURL()}))
return response("##### " + args.T("api.command_remote.accept_invitation", map[string]any{"SiteURL": rc.GetSiteURL()}))
}
// doRemove removes a remote cluster from the database, effectively revoking the trust relationship.
func (rp *RemoteProvider) doRemove(a *app.App, args *model.CommandArgs, margs map[string]string) *model.CommandResponse {
id, ok := margs["connectionID"]
if !ok {
return responsef(args.T("api.command_remote.missing_empty", map[string]any{"Arg": "remoteId"}))
return response(args.T("api.command_remote.missing_empty", map[string]any{"Arg": "remoteId"}))
}
deleted, err := a.DeleteRemoteCluster(id)
if err != nil {
responsef(args.T("api.command_remote.remove_remote.error", map[string]any{"Error": err.Error()}))
response(args.T("api.command_remote.remove_remote.error", map[string]any{"Error": err.Error()}))
}
result := "removed"
if !deleted {
result = "**NOT FOUND**"
}
return responsef("##### " + args.T("api.command_remote.cluster_removed", map[string]any{"RemoteId": id, "Result": result}))
return response("##### " + args.T("api.command_remote.cluster_removed", map[string]any{"RemoteId": id, "Result": result}))
}
// doStatus displays connection status for all remote clusters.
func (rp *RemoteProvider) doStatus(a *app.App, args *model.CommandArgs, _ map[string]string) *model.CommandResponse {
list, err := a.GetAllRemoteClusters(0, 999999, model.RemoteClusterQueryFilter{IncludeDeleted: true})
if err != nil {
responsef(args.T("api.command_remote.fetch_status.error", map[string]any{"Error": err.Error()}))
response(args.T("api.command_remote.fetch_status.error", map[string]any{"Error": err.Error()}))
}
if len(list) == 0 {
return responsef("** " + args.T("api.command_remote.remotes_not_found") + " **")
return response("** " + args.T("api.command_remote.remotes_not_found") + " **")
}
var sb strings.Builder
fmt.Fprintf(&sb, args.T("api.command_remote.remote_table_header")+" \n")
fmt.Fprintf(&sb, "%s \n", args.T("api.command_remote.remote_table_header"))
// | Secure Connection | Display name | ConnectionID | Site URL | Default Team | Invite accepted | Online | Last ping | Deleted |
fmt.Fprintf(&sb, "| :---- | :---- | :---- | :---- | :---- | :---- | :---- | :---- | | :---- |\n")
@@ -241,7 +241,7 @@ func (rp *RemoteProvider) doStatus(a *app.App, args *model.CommandArgs, _ map[st
fmt.Fprintf(&sb, "| %s | %s | %s | %s | %s | %s | %s | %s | %s |\n", rc.Name, rc.DisplayName, rc.RemoteId, rc.GetSiteURL(), rc.DefaultTeamId, accepted, online, lastPing, deleted)
}
return responsef(sb.String())
return response(sb.String())
}
func isOnline(lastPing int64) bool {

54
server/channels/app/slashcommands/command_share.go
Просмотреть файл

@@ -124,23 +124,23 @@ func (sp *ShareProvider) getAutoCompleteUnInviteRemote(a *app.App, _ *model.Comm
func (sp *ShareProvider) DoCommand(a *app.App, c request.CTX, args *model.CommandArgs, message string) *model.CommandResponse {
if !a.HasPermissionTo(args.UserId, model.PermissionManageSharedChannels) {
return responsef(args.T("api.command_share.permission_required", map[string]any{"Permission": "manage_shared_channels"}))
return response(args.T("api.command_share.permission_required", map[string]any{"Permission": "manage_shared_channels"}))
}
syncService := a.Srv().GetSharedChannelSyncService()
if syncService == nil || !syncService.Active() {
return responsef(args.T("api.command_share.service_disabled"))
return response(args.T("api.command_share.service_disabled"))
}
rcService := a.Srv().GetRemoteClusterService()
if rcService == nil || !rcService.Active() {
return responsef(args.T("api.command_remote.service_disabled"))
return response(args.T("api.command_remote.service_disabled"))
}
margs := parseNamedArgs(args.Command)
action, ok := margs[ActionKey]
if !ok {
return responsef(args.T("api.command_share.missing_action", map[string]any{"Actions": AvailableShareActions}))
return response(args.T("api.command_share.missing_action", map[string]any{"Actions": AvailableShareActions}))
}
switch action {
@@ -155,14 +155,14 @@ func (sp *ShareProvider) DoCommand(a *app.App, c request.CTX, args *model.Comman
case "status":
return sp.doStatus(a, args, margs)
}
return responsef(args.T("api.command_share.unknown_action", map[string]any{"Action": action, "Actions": AvailableShareActions}))
return response(args.T("api.command_share.unknown_action", map[string]any{"Action": action, "Actions": AvailableShareActions}))
}
func (sp *ShareProvider) doShareChannel(a *app.App, c request.CTX, args *model.CommandArgs, margs map[string]string) *model.CommandResponse {
// fetch defaults for missing channel props
channel, errApp := a.GetChannel(c, args.ChannelId)
if errApp != nil {
return responsef(args.T("api.command_share.share_channel.error", map[string]any{"Error": errApp.Error()}))
return response(args.T("api.command_share.share_channel.error", map[string]any{"Error": errApp.Error()}))
}
if name := margs["name"]; name == "" {
@@ -183,7 +183,7 @@ func (sp *ShareProvider) doShareChannel(a *app.App, c request.CTX, args *model.C
readonly, err := parseBool(margs["readonly"])
if err != nil {
return responsef(args.T("api.command_share.invalid_value.error", map[string]any{"Arg": "readonly", "Error": err.Error()}))
return response(args.T("api.command_share.invalid_value.error", map[string]any{"Arg": "readonly", "Error": err.Error()}))
}
sc := &model.SharedChannel{
@@ -199,36 +199,36 @@ func (sp *ShareProvider) doShareChannel(a *app.App, c request.CTX, args *model.C
}
if _, err := a.ShareChannel(c, sc); err != nil {
return responsef(args.T("api.command_share.share_channel.error", map[string]any{"Error": err.Error()}))
return response(args.T("api.command_share.share_channel.error", map[string]any{"Error": err.Error()}))
}
return responsef("##### " + args.T("api.command_share.channel_shared"))
return response("##### " + args.T("api.command_share.channel_shared"))
}
func (sp *ShareProvider) doUnshareChannel(a *app.App, args *model.CommandArgs, margs map[string]string) *model.CommandResponse {
deleted, err := a.UnshareChannel(args.ChannelId)
if err != nil {
return responsef(args.T("api.command_share.shared_channel_unshare.error", map[string]any{"Error": err.Error()}))
return response(args.T("api.command_share.shared_channel_unshare.error", map[string]any{"Error": err.Error()}))
}
if !deleted {
return responsef(args.T("api.command_share.not_shared_channel_unshare"))
return response(args.T("api.command_share.not_shared_channel_unshare"))
}
return responsef("##### " + args.T("api.command_share.shared_channel_unavailable"))
return response("##### " + args.T("api.command_share.shared_channel_unavailable"))
}
func (sp *ShareProvider) doInviteRemote(a *app.App, c request.CTX, args *model.CommandArgs, margs map[string]string) (resp *model.CommandResponse) {
remoteID, ok := margs["connectionID"]
if !ok || remoteID == "" {
return responsef(args.T("api.command_share.must_specify_valid_remote"))
return response(args.T("api.command_share.must_specify_valid_remote"))
}
hasRemote, err := a.HasRemote(args.ChannelId, remoteID)
if err != nil {
return responsef(args.T("api.command_share.fetch_remote.error", map[string]any{"Error": err.Error()}))
return response(args.T("api.command_share.fetch_remote.error", map[string]any{"Error": err.Error()}))
}
if hasRemote {
return responsef(args.T("api.command_share.remote_already_invited"))
return response(args.T("api.command_share.remote_already_invited"))
}
// Check if channel is shared or not.
@@ -236,7 +236,7 @@ func (sp *ShareProvider) doInviteRemote(a *app.App, c request.CTX, args *model.C
// since `a.InviteRemoteToChannel` will share the channel automatically.
hasChan, err := a.HasSharedChannel(args.ChannelId)
if err != nil {
return responsef(args.T("api.command_share.check_channel_exist.error", map[string]any{"ChannelID": args.ChannelId, "Error": err.Error()}))
return response(args.T("api.command_share.check_channel_exist.error", map[string]any{"ChannelID": args.ChannelId, "Error": err.Error()}))
}
if !hasChan {
// If it doesn't exist, then create it.
@@ -250,44 +250,44 @@ func (sp *ShareProvider) doInviteRemote(a *app.App, c request.CTX, args *model.C
rc, appErr := a.GetRemoteCluster(remoteID, false)
if appErr != nil {
return responsef(args.T("api.command_share.remote_id_invalid.error", map[string]any{"Error": appErr.Error()}))
return response(args.T("api.command_share.remote_id_invalid.error", map[string]any{"Error": appErr.Error()}))
}
if err = a.InviteRemoteToChannel(args.ChannelId, remoteID, args.UserId, true); err != nil {
return responsef(args.T("api.command_share.invite_remote_to_channel.error", map[string]any{"Error": err.Error()}))
return response(args.T("api.command_share.invite_remote_to_channel.error", map[string]any{"Error": err.Error()}))
}
return responsef("##### " + args.T("api.command_share.invitation_sent", map[string]any{"Name": rc.DisplayName, "SiteURL": rc.SiteURL}))
return response("##### " + args.T("api.command_share.invitation_sent", map[string]any{"Name": rc.DisplayName, "SiteURL": rc.SiteURL}))
}
func (sp *ShareProvider) doUninviteRemote(a *app.App, args *model.CommandArgs, margs map[string]string) *model.CommandResponse {
remoteID, ok := margs["connectionID"]
if !ok || remoteID == "" {
return responsef(args.T("api.command_share.remote_not_valid"))
return response(args.T("api.command_share.remote_not_valid"))
}
err := a.UninviteRemoteFromChannel(args.ChannelId, remoteID)
if err != nil {
return responsef(err.Error())
return response(err.Error())
}
return responsef("##### " + args.T("api.command_share.remote_uninvited", map[string]any{"RemoteId": remoteID}))
return response("##### " + args.T("api.command_share.remote_uninvited", map[string]any{"RemoteId": remoteID}))
}
func (sp *ShareProvider) doStatus(a *app.App, args *model.CommandArgs, _ map[string]string) *model.CommandResponse {
statuses, err := a.GetSharedChannelRemotesStatus(args.ChannelId)
if err != nil {
return responsef(args.T("api.command_share.fetch_remote_status.error", map[string]any{"Error": err.Error()}))
return response(args.T("api.command_share.fetch_remote_status.error", map[string]any{"Error": err.Error()}))
}
if len(statuses) == 0 {
return responsef(args.T("api.command_share.no_remote_invited"))
return response(args.T("api.command_share.no_remote_invited"))
}
var sb strings.Builder
fmt.Fprintf(&sb, args.T("api.command_share.channel_status_id", map[string]any{"ChannelId": statuses[0].ChannelId})+"\n\n")
fmt.Fprintf(&sb, "%s\n\n", args.T("api.command_share.channel_status_id", map[string]any{"ChannelId": statuses[0].ChannelId}))
fmt.Fprintf(&sb, args.T("api.command_share.remote_table_header")+" \n")
fmt.Fprintf(&sb, "%s \n", args.T("api.command_share.remote_table_header"))
// "| Secure Connection | SiteURL | ReadOnly | InviteAccepted | Online | Last Sync |"
fmt.Fprintf(&sb, "| ---- | ---- | ---- | ---- | ---- | ---- | \n")
@@ -301,5 +301,5 @@ func (sp *ShareProvider) doStatus(a *app.App, args *model.CommandArgs, _ map[str
fmt.Fprintf(&sb, "| %s | %s | %s | %s | %s | %s |\n",
status.DisplayName, status.SiteURL, readonly, accepted, online, lastSync)
}
return responsef(sb.String())
return response(sb.String())
}

6
server/channels/app/slashcommands/util.go
Просмотреть файл

@@ -16,11 +16,11 @@ const (
ActionKey = "-action"
)
// responsef creates an ephemeral command response using printf syntax.
func responsef(format string, args ...any) *model.CommandResponse {
// response creates an ephemeral command response with the given message.
func response(message string) *model.CommandResponse {
return &model.CommandResponse{
ResponseType: model.CommandResponseTypeEphemeral,
Text: fmt.Sprintf(format, args...),
Text: message,
Type: model.PostTypeDefault,
}
}

2
server/channels/store/storetest/mocks/AccessControlPolicyStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

4
server/channels/store/storetest/mocks/AttributesStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -75,7 +75,7 @@ func (_m *AttributesStore) GetSubject(rctx request.CTX, ID string, groupID strin
return r0, r1
}
// RefreshAttributes provides a mock function with given fields:
// RefreshAttributes provides a mock function with no fields
func (_m *AttributesStore) RefreshAttributes() error {
ret := _m.Called()

2
server/channels/store/storetest/mocks/AuditStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

2
server/channels/store/storetest/mocks/BotStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

2
server/channels/store/storetest/mocks/ChannelBookmarkStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

2
server/channels/store/storetest/mocks/ChannelMemberHistoryStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

12
server/channels/store/storetest/mocks/ChannelStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -196,7 +196,7 @@ func (_m *ChannelStore) AutocompleteInTeamForSearch(teamID string, userID string
return r0, r1
}
// ClearAllCustomRoleAssignments provides a mock function with given fields:
// ClearAllCustomRoleAssignments provides a mock function with no fields
func (_m *ChannelStore) ClearAllCustomRoleAssignments() error {
ret := _m.Called()
@@ -214,12 +214,12 @@ func (_m *ChannelStore) ClearAllCustomRoleAssignments() error {
return r0
}
// ClearCaches provides a mock function with given fields:
// ClearCaches provides a mock function with no fields
func (_m *ChannelStore) ClearCaches() {
_m.Called()
}
// ClearMembersForUserCache provides a mock function with given fields:
// ClearMembersForUserCache provides a mock function with no fields
func (_m *ChannelStore) ClearMembersForUserCache() {
_m.Called()
}
@@ -2178,7 +2178,7 @@ func (_m *ChannelStore) GetTeamMembersForChannel(channelID string) ([]string, er
return r0, r1
}
// GroupSyncedChannelCount provides a mock function with given fields:
// GroupSyncedChannelCount provides a mock function with no fields
func (_m *ChannelStore) GroupSyncedChannelCount() (int64, error) {
ret := _m.Called()
@@ -2501,7 +2501,7 @@ func (_m *ChannelStore) RemoveMembers(ctx request.CTX, channelID string, userIds
return r0
}
// ResetAllChannelSchemes provides a mock function with given fields:
// ResetAllChannelSchemes provides a mock function with no fields
func (_m *ChannelStore) ResetAllChannelSchemes() error {
ret := _m.Called()

4
server/channels/store/storetest/mocks/ClusterDiscoveryStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -14,7 +14,7 @@ type ClusterDiscoveryStore struct {
mock.Mock
}
// Cleanup provides a mock function with given fields:
// Cleanup provides a mock function with no fields
func (_m *ClusterDiscoveryStore) Cleanup() error {
ret := _m.Called()

2
server/channels/store/storetest/mocks/CommandStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

4
server/channels/store/storetest/mocks/CommandWebhookStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -14,7 +14,7 @@ type CommandWebhookStore struct {
mock.Mock
}
// Cleanup provides a mock function with given fields:
// Cleanup provides a mock function with no fields
func (_m *CommandWebhookStore) Cleanup() {
_m.Called()
}

2
server/channels/store/storetest/mocks/ComplianceStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

2
server/channels/store/storetest/mocks/DesktopTokensStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

2
server/channels/store/storetest/mocks/DraftStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

2
server/channels/store/storetest/mocks/EmojiStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

8
server/channels/store/storetest/mocks/FileInfoStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -33,12 +33,12 @@ func (_m *FileInfoStore) AttachToPost(c request.CTX, fileID string, postID strin
return r0
}
// ClearCaches provides a mock function with given fields:
// ClearCaches provides a mock function with no fields
func (_m *FileInfoStore) ClearCaches() {
_m.Called()
}
// CountAll provides a mock function with given fields:
// CountAll provides a mock function with no fields
func (_m *FileInfoStore) CountAll() (int64, error) {
ret := _m.Called()
@@ -505,7 +505,7 @@ func (_m *FileInfoStore) PermanentDeleteForPost(rctx request.CTX, postID string)
return r0
}
// RefreshFileStats provides a mock function with given fields:
// RefreshFileStats provides a mock function with no fields
func (_m *FileInfoStore) RefreshFileStats() error {
ret := _m.Called()

14
server/channels/store/storetest/mocks/GroupStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -456,7 +456,7 @@ func (_m *GroupStore) DeleteMembers(groupID string, userIDs []string) ([]*model.
return r0, r1
}
// DistinctGroupMemberCount provides a mock function with given fields:
// DistinctGroupMemberCount provides a mock function with no fields
func (_m *GroupStore) DistinctGroupMemberCount() (int64, error) {
ret := _m.Called()
@@ -1138,7 +1138,7 @@ func (_m *GroupStore) GetNonMemberUsersPage(groupID string, page int, perPage in
return r0, r1
}
// GroupChannelCount provides a mock function with given fields:
// GroupChannelCount provides a mock function with no fields
func (_m *GroupStore) GroupChannelCount() (int64, error) {
ret := _m.Called()
@@ -1166,7 +1166,7 @@ func (_m *GroupStore) GroupChannelCount() (int64, error) {
return r0, r1
}
// GroupCount provides a mock function with given fields:
// GroupCount provides a mock function with no fields
func (_m *GroupStore) GroupCount() (int64, error) {
ret := _m.Called()
@@ -1222,7 +1222,7 @@ func (_m *GroupStore) GroupCountBySource(source model.GroupSource) (int64, error
return r0, r1
}
// GroupCountWithAllowReference provides a mock function with given fields:
// GroupCountWithAllowReference provides a mock function with no fields
func (_m *GroupStore) GroupCountWithAllowReference() (int64, error) {
ret := _m.Called()
@@ -1250,7 +1250,7 @@ func (_m *GroupStore) GroupCountWithAllowReference() (int64, error) {
return r0, r1
}
// GroupMemberCount provides a mock function with given fields:
// GroupMemberCount provides a mock function with no fields
func (_m *GroupStore) GroupMemberCount() (int64, error) {
ret := _m.Called()
@@ -1278,7 +1278,7 @@ func (_m *GroupStore) GroupMemberCount() (int64, error) {
return r0, r1
}
// GroupTeamCount provides a mock function with given fields:
// GroupTeamCount provides a mock function with no fields
func (_m *GroupStore) GroupTeamCount() (int64, error) {
ret := _m.Called()

2
server/channels/store/storetest/mocks/JobStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

4
server/channels/store/storetest/mocks/LicenseStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -45,7 +45,7 @@ func (_m *LicenseStore) Get(c request.CTX, id string) (*model.LicenseRecord, err
return r0, r1
}
// GetAll provides a mock function with given fields:
// GetAll provides a mock function with no fields
func (_m *LicenseStore) GetAll() ([]*model.LicenseRecord, error) {
ret := _m.Called()

2
server/channels/store/storetest/mocks/LinkMetadataStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

2
server/channels/store/storetest/mocks/NotifyAdminStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

4
server/channels/store/storetest/mocks/OAuthStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -338,7 +338,7 @@ func (_m *OAuthStore) RemoveAccessData(token string) error {
return r0
}
// RemoveAllAccessData provides a mock function with given fields:
// RemoveAllAccessData provides a mock function with no fields
func (_m *OAuthStore) RemoveAllAccessData() error {
ret := _m.Called()

2
server/channels/store/storetest/mocks/OutgoingOAuthConnectionStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

4
server/channels/store/storetest/mocks/PluginStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -88,7 +88,7 @@ func (_m *PluginStore) Delete(pluginID string, key string) error {
return r0
}
// DeleteAllExpired provides a mock function with given fields:
// DeleteAllExpired provides a mock function with no fields
func (_m *PluginStore) DeleteAllExpired() error {
ret := _m.Called()

2
server/channels/store/storetest/mocks/PostAcknowledgementStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

2
server/channels/store/storetest/mocks/PostPersistentNotificationStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

2
server/channels/store/storetest/mocks/PostPriorityStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

12
server/channels/store/storetest/mocks/PostStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -136,7 +136,7 @@ func (_m *PostStore) AnalyticsUserCountsWithPostsByDay(teamID string) (model.Ana
return r0, r1
}
// ClearCaches provides a mock function with given fields:
// ClearCaches provides a mock function with no fields
func (_m *PostStore) ClearCaches() {
_m.Called()
}
@@ -357,7 +357,7 @@ func (_m *PostStore) GetFlaggedPostsForTeam(userID string, teamID string, offset
return r0, r1
}
// GetMaxPostSize provides a mock function with given fields:
// GetMaxPostSize provides a mock function with no fields
func (_m *PostStore) GetMaxPostSize() int {
ret := _m.Called()
@@ -403,7 +403,7 @@ func (_m *PostStore) GetNthRecentPostTime(n int64) (int64, error) {
return r0, r1
}
// GetOldest provides a mock function with given fields:
// GetOldest provides a mock function with no fields
func (_m *PostStore) GetOldest() (*model.Post, error) {
ret := _m.Called()
@@ -433,7 +433,7 @@ func (_m *PostStore) GetOldest() (*model.Post, error) {
return r0, r1
}
// GetOldestEntityCreationTime provides a mock function with given fields:
// GetOldestEntityCreationTime provides a mock function with no fields
func (_m *PostStore) GetOldestEntityCreationTime() (int64, error) {
ret := _m.Called()
@@ -1191,7 +1191,7 @@ func (_m *PostStore) PermanentDeleteByUser(rctx request.CTX, userID string) erro
return r0
}
// RefreshPostStats provides a mock function with given fields:
// RefreshPostStats provides a mock function with no fields
func (_m *PostStore) RefreshPostStats() error {
ret := _m.Called()

4
server/channels/store/storetest/mocks/PreferenceStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -96,7 +96,7 @@ func (_m *PreferenceStore) DeleteCategoryAndName(category string, name string) e
return r0
}
// DeleteInvalidVisibleDmsGms provides a mock function with given fields:
// DeleteInvalidVisibleDmsGms provides a mock function with no fields
func (_m *PreferenceStore) DeleteInvalidVisibleDmsGms() (int64, error) {
ret := _m.Called()

2
server/channels/store/storetest/mocks/ProductNoticesStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

2
server/channels/store/storetest/mocks/PropertyFieldStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

2
server/channels/store/storetest/mocks/PropertyGroupStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

2
server/channels/store/storetest/mocks/PropertyValueStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

2
server/channels/store/storetest/mocks/ReactionStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

2
server/channels/store/storetest/mocks/RemoteClusterStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

4
server/channels/store/storetest/mocks/RetentionPolicyStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -272,7 +272,7 @@ func (_m *RetentionPolicyStore) GetChannelsCount(policyID string) (int64, error)
return r0, r1
}
// GetCount provides a mock function with given fields:
// GetCount provides a mock function with no fields
func (_m *RetentionPolicyStore) GetCount() (int64, error) {
ret := _m.Called()

8
server/channels/store/storetest/mocks/RoleStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -16,7 +16,7 @@ type RoleStore struct {
mock.Mock
}
// AllChannelSchemeRoles provides a mock function with given fields:
// AllChannelSchemeRoles provides a mock function with no fields
func (_m *RoleStore) AllChannelSchemeRoles() ([]*model.Role, error) {
ret := _m.Called()
@@ -166,7 +166,7 @@ func (_m *RoleStore) Get(roleID string) (*model.Role, error) {
return r0, r1
}
// GetAll provides a mock function with given fields:
// GetAll provides a mock function with no fields
func (_m *RoleStore) GetAll() ([]*model.Role, error) {
ret := _m.Called()
@@ -256,7 +256,7 @@ func (_m *RoleStore) GetByNames(names []string) ([]*model.Role, error) {
return r0, r1
}
// PermanentDeleteAll provides a mock function with given fields:
// PermanentDeleteAll provides a mock function with no fields
func (_m *RoleStore) PermanentDeleteAll() error {
ret := _m.Called()

4
server/channels/store/storetest/mocks/ScheduledPostStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -74,7 +74,7 @@ func (_m *ScheduledPostStore) Get(scheduledPostId string) (*model.ScheduledPost,
return r0, r1
}
// GetMaxMessageSize provides a mock function with given fields:
// GetMaxMessageSize provides a mock function with no fields
func (_m *ScheduledPostStore) GetMaxMessageSize() int {
ret := _m.Called()

4
server/channels/store/storetest/mocks/SchemeStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -190,7 +190,7 @@ func (_m *SchemeStore) GetByName(schemeName string) (*model.Scheme, error) {
return r0, r1
}
// PermanentDeleteAll provides a mock function with given fields:
// PermanentDeleteAll provides a mock function with no fields
func (_m *SchemeStore) PermanentDeleteAll() error {
ret := _m.Called()

8
server/channels/store/storetest/mocks/SessionStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -15,7 +15,7 @@ type SessionStore struct {
mock.Mock
}
// AnalyticsSessionCount provides a mock function with given fields:
// AnalyticsSessionCount provides a mock function with no fields
func (_m *SessionStore) AnalyticsSessionCount() (int64, error) {
ret := _m.Called()
@@ -121,7 +121,7 @@ func (_m *SessionStore) GetLRUSessions(c request.CTX, userID string, limit uint6
return r0, r1
}
// GetMobileSessionMetadata provides a mock function with given fields:
// GetMobileSessionMetadata provides a mock function with no fields
func (_m *SessionStore) GetMobileSessionMetadata() ([]*model.MobileSessionMetadata, error) {
ret := _m.Called()
@@ -277,7 +277,7 @@ func (_m *SessionStore) Remove(sessionIDOrToken string) error {
return r0
}
// RemoveAllSessions provides a mock function with given fields:
// RemoveAllSessions provides a mock function with no fields
func (_m *SessionStore) RemoveAllSessions() error {
ret := _m.Called()

2
server/channels/store/storetest/mocks/SharedChannelStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

8
server/channels/store/storetest/mocks/StatusStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -74,7 +74,7 @@ func (_m *StatusStore) GetByIds(userIds []string) ([]*model.Status, error) {
return r0, r1
}
// GetTotalActiveUsersCount provides a mock function with given fields:
// GetTotalActiveUsersCount provides a mock function with no fields
func (_m *StatusStore) GetTotalActiveUsersCount() (int64, error) {
ret := _m.Called()
@@ -102,7 +102,7 @@ func (_m *StatusStore) GetTotalActiveUsersCount() (int64, error) {
return r0, r1
}
// ResetAll provides a mock function with given fields:
// ResetAll provides a mock function with no fields
func (_m *StatusStore) ResetAll() error {
ret := _m.Called()
@@ -138,7 +138,7 @@ func (_m *StatusStore) SaveOrUpdate(status *model.Status) error {
return r0
}
// UpdateExpiredDNDStatuses provides a mock function with given fields:
// UpdateExpiredDNDStatuses provides a mock function with no fields
func (_m *StatusStore) UpdateExpiredDNDStatuses() ([]*model.Status, error) {
ret := _m.Called()

140
server/channels/store/storetest/mocks/Store.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -24,7 +24,7 @@ type Store struct {
mock.Mock
}
// AccessControlPolicy provides a mock function with given fields:
// AccessControlPolicy provides a mock function with no fields
func (_m *Store) AccessControlPolicy() store.AccessControlPolicyStore {
ret := _m.Called()
@@ -44,7 +44,7 @@ func (_m *Store) AccessControlPolicy() store.AccessControlPolicyStore {
return r0
}
// Attributes provides a mock function with given fields:
// Attributes provides a mock function with no fields
func (_m *Store) Attributes() store.AttributesStore {
ret := _m.Called()
@@ -64,7 +64,7 @@ func (_m *Store) Attributes() store.AttributesStore {
return r0
}
// Audit provides a mock function with given fields:
// Audit provides a mock function with no fields
func (_m *Store) Audit() store.AuditStore {
ret := _m.Called()
@@ -84,7 +84,7 @@ func (_m *Store) Audit() store.AuditStore {
return r0
}
// Bot provides a mock function with given fields:
// Bot provides a mock function with no fields
func (_m *Store) Bot() store.BotStore {
ret := _m.Called()
@@ -104,7 +104,7 @@ func (_m *Store) Bot() store.BotStore {
return r0
}
// Channel provides a mock function with given fields:
// Channel provides a mock function with no fields
func (_m *Store) Channel() store.ChannelStore {
ret := _m.Called()
@@ -124,7 +124,7 @@ func (_m *Store) Channel() store.ChannelStore {
return r0
}
// ChannelBookmark provides a mock function with given fields:
// ChannelBookmark provides a mock function with no fields
func (_m *Store) ChannelBookmark() store.ChannelBookmarkStore {
ret := _m.Called()
@@ -144,7 +144,7 @@ func (_m *Store) ChannelBookmark() store.ChannelBookmarkStore {
return r0
}
// ChannelMemberHistory provides a mock function with given fields:
// ChannelMemberHistory provides a mock function with no fields
func (_m *Store) ChannelMemberHistory() store.ChannelMemberHistoryStore {
ret := _m.Called()
@@ -164,7 +164,7 @@ func (_m *Store) ChannelMemberHistory() store.ChannelMemberHistoryStore {
return r0
}
// CheckIntegrity provides a mock function with given fields:
// CheckIntegrity provides a mock function with no fields
func (_m *Store) CheckIntegrity() <-chan model.IntegrityCheckResult {
ret := _m.Called()
@@ -184,12 +184,12 @@ func (_m *Store) CheckIntegrity() <-chan model.IntegrityCheckResult {
return r0
}
// Close provides a mock function with given fields:
// Close provides a mock function with no fields
func (_m *Store) Close() {
_m.Called()
}
// ClusterDiscovery provides a mock function with given fields:
// ClusterDiscovery provides a mock function with no fields
func (_m *Store) ClusterDiscovery() store.ClusterDiscoveryStore {
ret := _m.Called()
@@ -209,7 +209,7 @@ func (_m *Store) ClusterDiscovery() store.ClusterDiscoveryStore {
return r0
}
// Command provides a mock function with given fields:
// Command provides a mock function with no fields
func (_m *Store) Command() store.CommandStore {
ret := _m.Called()
@@ -229,7 +229,7 @@ func (_m *Store) Command() store.CommandStore {
return r0
}
// CommandWebhook provides a mock function with given fields:
// CommandWebhook provides a mock function with no fields
func (_m *Store) CommandWebhook() store.CommandWebhookStore {
ret := _m.Called()
@@ -249,7 +249,7 @@ func (_m *Store) CommandWebhook() store.CommandWebhookStore {
return r0
}
// Compliance provides a mock function with given fields:
// Compliance provides a mock function with no fields
func (_m *Store) Compliance() store.ComplianceStore {
ret := _m.Called()
@@ -269,7 +269,7 @@ func (_m *Store) Compliance() store.ComplianceStore {
return r0
}
// Context provides a mock function with given fields:
// Context provides a mock function with no fields
func (_m *Store) Context() context.Context {
ret := _m.Called()
@@ -289,7 +289,7 @@ func (_m *Store) Context() context.Context {
return r0
}
// DesktopTokens provides a mock function with given fields:
// DesktopTokens provides a mock function with no fields
func (_m *Store) DesktopTokens() store.DesktopTokensStore {
ret := _m.Called()
@@ -309,7 +309,7 @@ func (_m *Store) DesktopTokens() store.DesktopTokensStore {
return r0
}
// Draft provides a mock function with given fields:
// Draft provides a mock function with no fields
func (_m *Store) Draft() store.DraftStore {
ret := _m.Called()
@@ -329,12 +329,12 @@ func (_m *Store) Draft() store.DraftStore {
return r0
}
// DropAllTables provides a mock function with given fields:
// DropAllTables provides a mock function with no fields
func (_m *Store) DropAllTables() {
_m.Called()
}
// Emoji provides a mock function with given fields:
// Emoji provides a mock function with no fields
func (_m *Store) Emoji() store.EmojiStore {
ret := _m.Called()
@@ -354,7 +354,7 @@ func (_m *Store) Emoji() store.EmojiStore {
return r0
}
// FileInfo provides a mock function with given fields:
// FileInfo provides a mock function with no fields
func (_m *Store) FileInfo() store.FileInfoStore {
ret := _m.Called()
@@ -374,7 +374,7 @@ func (_m *Store) FileInfo() store.FileInfoStore {
return r0
}
// GetAppliedMigrations provides a mock function with given fields:
// GetAppliedMigrations provides a mock function with no fields
func (_m *Store) GetAppliedMigrations() ([]model.AppliedMigration, error) {
ret := _m.Called()
@@ -404,7 +404,7 @@ func (_m *Store) GetAppliedMigrations() ([]model.AppliedMigration, error) {
return r0, r1
}
// GetDBSchemaVersion provides a mock function with given fields:
// GetDBSchemaVersion provides a mock function with no fields
func (_m *Store) GetDBSchemaVersion() (int, error) {
ret := _m.Called()
@@ -460,7 +460,7 @@ func (_m *Store) GetDbVersion(numerical bool) (string, error) {
return r0, r1
}
// GetInternalMasterDB provides a mock function with given fields:
// GetInternalMasterDB provides a mock function with no fields
func (_m *Store) GetInternalMasterDB() *sql.DB {
ret := _m.Called()
@@ -480,7 +480,7 @@ func (_m *Store) GetInternalMasterDB() *sql.DB {
return r0
}
// GetInternalReplicaDB provides a mock function with given fields:
// GetInternalReplicaDB provides a mock function with no fields
func (_m *Store) GetInternalReplicaDB() *sql.DB {
ret := _m.Called()
@@ -500,7 +500,7 @@ func (_m *Store) GetInternalReplicaDB() *sql.DB {
return r0
}
// GetLocalSchemaVersion provides a mock function with given fields:
// GetLocalSchemaVersion provides a mock function with no fields
func (_m *Store) GetLocalSchemaVersion() (int, error) {
ret := _m.Called()
@@ -528,7 +528,7 @@ func (_m *Store) GetLocalSchemaVersion() (int, error) {
return r0, r1
}
// Group provides a mock function with given fields:
// Group provides a mock function with no fields
func (_m *Store) Group() store.GroupStore {
ret := _m.Called()
@@ -548,7 +548,7 @@ func (_m *Store) Group() store.GroupStore {
return r0
}
// Job provides a mock function with given fields:
// Job provides a mock function with no fields
func (_m *Store) Job() store.JobStore {
ret := _m.Called()
@@ -568,7 +568,7 @@ func (_m *Store) Job() store.JobStore {
return r0
}
// License provides a mock function with given fields:
// License provides a mock function with no fields
func (_m *Store) License() store.LicenseStore {
ret := _m.Called()
@@ -588,7 +588,7 @@ func (_m *Store) License() store.LicenseStore {
return r0
}
// LinkMetadata provides a mock function with given fields:
// LinkMetadata provides a mock function with no fields
func (_m *Store) LinkMetadata() store.LinkMetadataStore {
ret := _m.Called()
@@ -608,12 +608,12 @@ func (_m *Store) LinkMetadata() store.LinkMetadataStore {
return r0
}
// LockToMaster provides a mock function with given fields:
// LockToMaster provides a mock function with no fields
func (_m *Store) LockToMaster() {
_m.Called()
}
// Logger provides a mock function with given fields:
// Logger provides a mock function with no fields
func (_m *Store) Logger() mlog.LoggerIFace {
ret := _m.Called()
@@ -633,12 +633,12 @@ func (_m *Store) Logger() mlog.LoggerIFace {
return r0
}
// MarkSystemRanUnitTests provides a mock function with given fields:
// MarkSystemRanUnitTests provides a mock function with no fields
func (_m *Store) MarkSystemRanUnitTests() {
_m.Called()
}
// NotifyAdmin provides a mock function with given fields:
// NotifyAdmin provides a mock function with no fields
func (_m *Store) NotifyAdmin() store.NotifyAdminStore {
ret := _m.Called()
@@ -658,7 +658,7 @@ func (_m *Store) NotifyAdmin() store.NotifyAdminStore {
return r0
}
// OAuth provides a mock function with given fields:
// OAuth provides a mock function with no fields
func (_m *Store) OAuth() store.OAuthStore {
ret := _m.Called()
@@ -678,7 +678,7 @@ func (_m *Store) OAuth() store.OAuthStore {
return r0
}
// OutgoingOAuthConnection provides a mock function with given fields:
// OutgoingOAuthConnection provides a mock function with no fields
func (_m *Store) OutgoingOAuthConnection() store.OutgoingOAuthConnectionStore {
ret := _m.Called()
@@ -698,7 +698,7 @@ func (_m *Store) OutgoingOAuthConnection() store.OutgoingOAuthConnectionStore {
return r0
}
// Plugin provides a mock function with given fields:
// Plugin provides a mock function with no fields
func (_m *Store) Plugin() store.PluginStore {
ret := _m.Called()
@@ -718,7 +718,7 @@ func (_m *Store) Plugin() store.PluginStore {
return r0
}
// Post provides a mock function with given fields:
// Post provides a mock function with no fields
func (_m *Store) Post() store.PostStore {
ret := _m.Called()
@@ -738,7 +738,7 @@ func (_m *Store) Post() store.PostStore {
return r0
}
// PostAcknowledgement provides a mock function with given fields:
// PostAcknowledgement provides a mock function with no fields
func (_m *Store) PostAcknowledgement() store.PostAcknowledgementStore {
ret := _m.Called()
@@ -758,7 +758,7 @@ func (_m *Store) PostAcknowledgement() store.PostAcknowledgementStore {
return r0
}
// PostPersistentNotification provides a mock function with given fields:
// PostPersistentNotification provides a mock function with no fields
func (_m *Store) PostPersistentNotification() store.PostPersistentNotificationStore {
ret := _m.Called()
@@ -778,7 +778,7 @@ func (_m *Store) PostPersistentNotification() store.PostPersistentNotificationSt
return r0
}
// PostPriority provides a mock function with given fields:
// PostPriority provides a mock function with no fields
func (_m *Store) PostPriority() store.PostPriorityStore {
ret := _m.Called()
@@ -798,7 +798,7 @@ func (_m *Store) PostPriority() store.PostPriorityStore {
return r0
}
// Preference provides a mock function with given fields:
// Preference provides a mock function with no fields
func (_m *Store) Preference() store.PreferenceStore {
ret := _m.Called()
@@ -818,7 +818,7 @@ func (_m *Store) Preference() store.PreferenceStore {
return r0
}
// ProductNotices provides a mock function with given fields:
// ProductNotices provides a mock function with no fields
func (_m *Store) ProductNotices() store.ProductNoticesStore {
ret := _m.Called()
@@ -838,7 +838,7 @@ func (_m *Store) ProductNotices() store.ProductNoticesStore {
return r0
}
// PropertyField provides a mock function with given fields:
// PropertyField provides a mock function with no fields
func (_m *Store) PropertyField() store.PropertyFieldStore {
ret := _m.Called()
@@ -858,7 +858,7 @@ func (_m *Store) PropertyField() store.PropertyFieldStore {
return r0
}
// PropertyGroup provides a mock function with given fields:
// PropertyGroup provides a mock function with no fields
func (_m *Store) PropertyGroup() store.PropertyGroupStore {
ret := _m.Called()
@@ -878,7 +878,7 @@ func (_m *Store) PropertyGroup() store.PropertyGroupStore {
return r0
}
// PropertyValue provides a mock function with given fields:
// PropertyValue provides a mock function with no fields
func (_m *Store) PropertyValue() store.PropertyValueStore {
ret := _m.Called()
@@ -898,7 +898,7 @@ func (_m *Store) PropertyValue() store.PropertyValueStore {
return r0
}
// Reaction provides a mock function with given fields:
// Reaction provides a mock function with no fields
func (_m *Store) Reaction() store.ReactionStore {
ret := _m.Called()
@@ -923,7 +923,7 @@ func (_m *Store) RecycleDBConnections(d time.Duration) {
_m.Called(d)
}
// RemoteCluster provides a mock function with given fields:
// RemoteCluster provides a mock function with no fields
func (_m *Store) RemoteCluster() store.RemoteClusterStore {
ret := _m.Called()
@@ -943,7 +943,7 @@ func (_m *Store) RemoteCluster() store.RemoteClusterStore {
return r0
}
// ReplicaLagAbs provides a mock function with given fields:
// ReplicaLagAbs provides a mock function with no fields
func (_m *Store) ReplicaLagAbs() error {
ret := _m.Called()
@@ -961,7 +961,7 @@ func (_m *Store) ReplicaLagAbs() error {
return r0
}
// ReplicaLagTime provides a mock function with given fields:
// ReplicaLagTime provides a mock function with no fields
func (_m *Store) ReplicaLagTime() error {
ret := _m.Called()
@@ -979,7 +979,7 @@ func (_m *Store) ReplicaLagTime() error {
return r0
}
// RetentionPolicy provides a mock function with given fields:
// RetentionPolicy provides a mock function with no fields
func (_m *Store) RetentionPolicy() store.RetentionPolicyStore {
ret := _m.Called()
@@ -999,7 +999,7 @@ func (_m *Store) RetentionPolicy() store.RetentionPolicyStore {
return r0
}
// Role provides a mock function with given fields:
// Role provides a mock function with no fields
func (_m *Store) Role() store.RoleStore {
ret := _m.Called()
@@ -1019,7 +1019,7 @@ func (_m *Store) Role() store.RoleStore {
return r0
}
// ScheduledPost provides a mock function with given fields:
// ScheduledPost provides a mock function with no fields
func (_m *Store) ScheduledPost() store.ScheduledPostStore {
ret := _m.Called()
@@ -1039,7 +1039,7 @@ func (_m *Store) ScheduledPost() store.ScheduledPostStore {
return r0
}
// Scheme provides a mock function with given fields:
// Scheme provides a mock function with no fields
func (_m *Store) Scheme() store.SchemeStore {
ret := _m.Called()
@@ -1059,7 +1059,7 @@ func (_m *Store) Scheme() store.SchemeStore {
return r0
}
// Session provides a mock function with given fields:
// Session provides a mock function with no fields
func (_m *Store) Session() store.SessionStore {
ret := _m.Called()
@@ -1084,7 +1084,7 @@ func (_m *Store) SetContext(_a0 context.Context) {
_m.Called(_a0)
}
// SharedChannel provides a mock function with given fields:
// SharedChannel provides a mock function with no fields
func (_m *Store) SharedChannel() store.SharedChannelStore {
ret := _m.Called()
@@ -1104,7 +1104,7 @@ func (_m *Store) SharedChannel() store.SharedChannelStore {
return r0
}
// Status provides a mock function with given fields:
// Status provides a mock function with no fields
func (_m *Store) Status() store.StatusStore {
ret := _m.Called()
@@ -1124,7 +1124,7 @@ func (_m *Store) Status() store.StatusStore {
return r0
}
// System provides a mock function with given fields:
// System provides a mock function with no fields
func (_m *Store) System() store.SystemStore {
ret := _m.Called()
@@ -1144,7 +1144,7 @@ func (_m *Store) System() store.SystemStore {
return r0
}
// Team provides a mock function with given fields:
// Team provides a mock function with no fields
func (_m *Store) Team() store.TeamStore {
ret := _m.Called()
@@ -1164,7 +1164,7 @@ func (_m *Store) Team() store.TeamStore {
return r0
}
// TermsOfService provides a mock function with given fields:
// TermsOfService provides a mock function with no fields
func (_m *Store) TermsOfService() store.TermsOfServiceStore {
ret := _m.Called()
@@ -1184,7 +1184,7 @@ func (_m *Store) TermsOfService() store.TermsOfServiceStore {
return r0
}
// Thread provides a mock function with given fields:
// Thread provides a mock function with no fields
func (_m *Store) Thread() store.ThreadStore {
ret := _m.Called()
@@ -1204,7 +1204,7 @@ func (_m *Store) Thread() store.ThreadStore {
return r0
}
// Token provides a mock function with given fields:
// Token provides a mock function with no fields
func (_m *Store) Token() store.TokenStore {
ret := _m.Called()
@@ -1224,7 +1224,7 @@ func (_m *Store) Token() store.TokenStore {
return r0
}
// TotalMasterDbConnections provides a mock function with given fields:
// TotalMasterDbConnections provides a mock function with no fields
func (_m *Store) TotalMasterDbConnections() int {
ret := _m.Called()
@@ -1242,7 +1242,7 @@ func (_m *Store) TotalMasterDbConnections() int {
return r0
}
// TotalReadDbConnections provides a mock function with given fields:
// TotalReadDbConnections provides a mock function with no fields
func (_m *Store) TotalReadDbConnections() int {
ret := _m.Called()
@@ -1260,7 +1260,7 @@ func (_m *Store) TotalReadDbConnections() int {
return r0
}
// TotalSearchDbConnections provides a mock function with given fields:
// TotalSearchDbConnections provides a mock function with no fields
func (_m *Store) TotalSearchDbConnections() int {
ret := _m.Called()
@@ -1278,12 +1278,12 @@ func (_m *Store) TotalSearchDbConnections() int {
return r0
}
// UnlockFromMaster provides a mock function with given fields:
// UnlockFromMaster provides a mock function with no fields
func (_m *Store) UnlockFromMaster() {
_m.Called()
}
// UploadSession provides a mock function with given fields:
// UploadSession provides a mock function with no fields
func (_m *Store) UploadSession() store.UploadSessionStore {
ret := _m.Called()
@@ -1303,7 +1303,7 @@ func (_m *Store) UploadSession() store.UploadSessionStore {
return r0
}
// User provides a mock function with given fields:
// User provides a mock function with no fields
func (_m *Store) User() store.UserStore {
ret := _m.Called()
@@ -1323,7 +1323,7 @@ func (_m *Store) User() store.UserStore {
return r0
}
// UserAccessToken provides a mock function with given fields:
// UserAccessToken provides a mock function with no fields
func (_m *Store) UserAccessToken() store.UserAccessTokenStore {
ret := _m.Called()
@@ -1343,7 +1343,7 @@ func (_m *Store) UserAccessToken() store.UserAccessTokenStore {
return r0
}
// UserTermsOfService provides a mock function with given fields:
// UserTermsOfService provides a mock function with no fields
func (_m *Store) UserTermsOfService() store.UserTermsOfServiceStore {
ret := _m.Called()
@@ -1363,7 +1363,7 @@ func (_m *Store) UserTermsOfService() store.UserTermsOfServiceStore {
return r0
}
// Webhook provides a mock function with given fields:
// Webhook provides a mock function with no fields
func (_m *Store) Webhook() store.WebhookStore {
ret := _m.Called()

4
server/channels/store/storetest/mocks/SystemStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -14,7 +14,7 @@ type SystemStore struct {
mock.Mock
}
// Get provides a mock function with given fields:
// Get provides a mock function with no fields
func (_m *SystemStore) Get() (model.StringMap, error) {
ret := _m.Called()

18
server/channels/store/storetest/mocks/TeamStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -71,7 +71,7 @@ func (_m *TeamStore) AnalyticsTeamCount(opts *model.TeamSearch) (int64, error) {
return r0, r1
}
// ClearAllCustomRoleAssignments provides a mock function with given fields:
// ClearAllCustomRoleAssignments provides a mock function with no fields
func (_m *TeamStore) ClearAllCustomRoleAssignments() error {
ret := _m.Called()
@@ -89,7 +89,7 @@ func (_m *TeamStore) ClearAllCustomRoleAssignments() error {
return r0
}
// ClearCaches provides a mock function with given fields:
// ClearCaches provides a mock function with no fields
func (_m *TeamStore) ClearCaches() {
_m.Called()
}
@@ -152,7 +152,7 @@ func (_m *TeamStore) GetActiveMemberCount(teamID string, restrictions *model.Vie
return r0, r1
}
// GetAll provides a mock function with given fields:
// GetAll provides a mock function with no fields
func (_m *TeamStore) GetAll() ([]*model.Team, error) {
ret := _m.Called()
@@ -242,7 +242,7 @@ func (_m *TeamStore) GetAllPage(offset int, limit int, opts *model.TeamSearch) (
return r0, r1
}
// GetAllPrivateTeamListing provides a mock function with given fields:
// GetAllPrivateTeamListing provides a mock function with no fields
func (_m *TeamStore) GetAllPrivateTeamListing() ([]*model.Team, error) {
ret := _m.Called()
@@ -272,7 +272,7 @@ func (_m *TeamStore) GetAllPrivateTeamListing() ([]*model.Team, error) {
return r0, r1
}
// GetAllTeamListing provides a mock function with given fields:
// GetAllTeamListing provides a mock function with no fields
func (_m *TeamStore) GetAllTeamListing() ([]*model.Team, error) {
ret := _m.Called()
@@ -302,7 +302,7 @@ func (_m *TeamStore) GetAllTeamListing() ([]*model.Team, error) {
return r0, r1
}
// GetByEmptyInviteID provides a mock function with given fields:
// GetByEmptyInviteID provides a mock function with no fields
func (_m *TeamStore) GetByEmptyInviteID() ([]*model.Team, error) {
ret := _m.Called()
@@ -870,7 +870,7 @@ func (_m *TeamStore) GetUserTeamIds(userID string, allowFromCache bool) ([]strin
return r0, r1
}
// GroupSyncedTeamCount provides a mock function with given fields:
// GroupSyncedTeamCount provides a mock function with no fields
func (_m *TeamStore) GroupSyncedTeamCount() (int64, error) {
ret := _m.Called()
@@ -1023,7 +1023,7 @@ func (_m *TeamStore) RemoveMembers(rctx request.CTX, teamID string, userIds []st
return r0
}
// ResetAllTeamSchemes provides a mock function with given fields:
// ResetAllTeamSchemes provides a mock function with no fields
func (_m *TeamStore) ResetAllTeamSchemes() error {
ret := _m.Called()

2
server/channels/store/storetest/mocks/TermsOfServiceStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

2
server/channels/store/storetest/mocks/ThreadStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

2
server/channels/store/storetest/mocks/TokenStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

2
server/channels/store/storetest/mocks/UploadSessionStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

2
server/channels/store/storetest/mocks/UserAccessTokenStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

24
server/channels/store/storetest/mocks/UserStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -104,7 +104,7 @@ func (_m *UserStore) AnalyticsGetExternalUsers(hostDomain string) (bool, error)
return r0, r1
}
// AnalyticsGetGuestCount provides a mock function with given fields:
// AnalyticsGetGuestCount provides a mock function with no fields
func (_m *UserStore) AnalyticsGetGuestCount() (int64, error) {
ret := _m.Called()
@@ -132,7 +132,7 @@ func (_m *UserStore) AnalyticsGetGuestCount() (int64, error) {
return r0, r1
}
// AnalyticsGetInactiveUsersCount provides a mock function with given fields:
// AnalyticsGetInactiveUsersCount provides a mock function with no fields
func (_m *UserStore) AnalyticsGetInactiveUsersCount() (int64, error) {
ret := _m.Called()
@@ -160,7 +160,7 @@ func (_m *UserStore) AnalyticsGetInactiveUsersCount() (int64, error) {
return r0, r1
}
// AnalyticsGetSystemAdminCount provides a mock function with given fields:
// AnalyticsGetSystemAdminCount provides a mock function with no fields
func (_m *UserStore) AnalyticsGetSystemAdminCount() (int64, error) {
ret := _m.Called()
@@ -218,7 +218,7 @@ func (_m *UserStore) AutocompleteUsersInChannel(rctx request.CTX, teamID string,
return r0, r1
}
// ClearAllCustomRoleAssignments provides a mock function with given fields:
// ClearAllCustomRoleAssignments provides a mock function with no fields
func (_m *UserStore) ClearAllCustomRoleAssignments() error {
ret := _m.Called()
@@ -236,7 +236,7 @@ func (_m *UserStore) ClearAllCustomRoleAssignments() error {
return r0
}
// ClearCaches provides a mock function with given fields:
// ClearCaches provides a mock function with no fields
func (_m *UserStore) ClearCaches() {
_m.Called()
}
@@ -269,7 +269,7 @@ func (_m *UserStore) Count(options model.UserCountOptions) (int64, error) {
return r0, r1
}
// DeactivateGuests provides a mock function with given fields:
// DeactivateGuests provides a mock function with no fields
func (_m *UserStore) DeactivateGuests() ([]string, error) {
ret := _m.Called()
@@ -359,7 +359,7 @@ func (_m *UserStore) Get(ctx context.Context, id string) (*model.User, error) {
return r0, r1
}
// GetAll provides a mock function with given fields:
// GetAll provides a mock function with no fields
func (_m *UserStore) GetAll() ([]*model.User, error) {
ret := _m.Called()
@@ -717,7 +717,7 @@ func (_m *UserStore) GetChannelGroupUsers(channelID string) ([]*model.User, erro
return r0, r1
}
// GetEtagForAllProfiles provides a mock function with given fields:
// GetEtagForAllProfiles provides a mock function with no fields
func (_m *UserStore) GetEtagForAllProfiles() string {
ret := _m.Called()
@@ -1251,7 +1251,7 @@ func (_m *UserStore) GetRecentlyActiveUsersForTeam(teamID string, offset int, li
return r0, r1
}
// GetSystemAdminProfiles provides a mock function with given fields:
// GetSystemAdminProfiles provides a mock function with no fields
func (_m *UserStore) GetSystemAdminProfiles() (map[string]*model.User, error) {
ret := _m.Called()
@@ -1485,7 +1485,7 @@ func (_m *UserStore) GetUsersWithInvalidEmails(page int, perPage int, restricted
return r0, r1
}
// InferSystemInstallDate provides a mock function with given fields:
// InferSystemInstallDate provides a mock function with no fields
func (_m *UserStore) InferSystemInstallDate() (int64, error) {
ret := _m.Called()
@@ -1610,7 +1610,7 @@ func (_m *UserStore) PromoteGuestToUser(userID string) error {
return r0
}
// RefreshPostStatsForUsers provides a mock function with given fields:
// RefreshPostStatsForUsers provides a mock function with no fields
func (_m *UserStore) RefreshPostStatsForUsers() error {
ret := _m.Called()

2
server/channels/store/storetest/mocks/UserTermsOfServiceStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.

4
server/channels/store/storetest/mocks/WebhookStore.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make store-mocks`.
@@ -70,7 +70,7 @@ func (_m *WebhookStore) AnalyticsOutgoingCount(teamID string) (int64, error) {
return r0, r1
}
// ClearCaches provides a mock function with given fields:
// ClearCaches provides a mock function with no fields
func (_m *WebhookStore) ClearCaches() {
_m.Called()
}

2
server/channels/utils/mocks/LicenseValidatorIface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make misc-mocks`.

2
server/cmd/mmctl/commands/user_e2e_test.go
Просмотреть файл

@@ -477,7 +477,7 @@ func (s *MmctlE2ETestSuite) TestVerifyUserEmailWithoutTokenCmd() {
var expected error
expected = multierror.Append(
expected, fmt.Errorf("unable to verify user "+user.Id+" email: You do not have the appropriate permissions."),
expected, fmt.Errorf("unable to verify user %s email: You do not have the appropriate permissions.", user.Id),
)
s.Require().EqualError(err, expected.Error())

4
server/cmd/mmctl/commands/user_test.go
Просмотреть файл

@@ -1753,7 +1753,7 @@ func (s *MmctlUnitTestSuite) TestResetUserMfaCmd() {
var expected error
expected = multierror.Append(
expected, fmt.Errorf("unable to reset user \"userId\" MFA. Error: "+mockError.Error()),
expected, fmt.Errorf("unable to reset user \"userId\" MFA. Error: %s", mockError.Error()),
)
s.Require().EqualError(err, expected.Error())
@@ -1814,7 +1814,7 @@ func (s *MmctlUnitTestSuite) TestResetUserMfaCmd() {
),
)
expected = multierror.Append(
expected, fmt.Errorf("unable to reset user \""+users[1]+"\" MFA. Error: "+mockError.Error()),
expected, fmt.Errorf("unable to reset user \"%s\" MFA. Error: %s", users[1], mockError.Error()),
)
s.Require().EqualError(err, expected.ErrorOrNil().Error())

2
server/einterfaces/mocks/AccessControlServiceInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.

6
server/einterfaces/mocks/AccessControlSyncJobInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.
@@ -16,7 +16,7 @@ type AccessControlSyncJobInterface struct {
mock.Mock
}
// MakeScheduler provides a mock function with given fields:
// MakeScheduler provides a mock function with no fields
func (_m *AccessControlSyncJobInterface) MakeScheduler() jobs.Scheduler {
ret := _m.Called()
@@ -36,7 +36,7 @@ func (_m *AccessControlSyncJobInterface) MakeScheduler() jobs.Scheduler {
return r0
}
// MakeWorker provides a mock function with given fields:
// MakeWorker provides a mock function with no fields
func (_m *AccessControlSyncJobInterface) MakeWorker() model.Worker {
ret := _m.Called()

2
server/einterfaces/mocks/AccountMigrationInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.

6
server/einterfaces/mocks/CloudInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.
@@ -449,7 +449,7 @@ func (_m *CloudInterface) GetSubscription(userID string) (*model.Subscription, e
return r0, r1
}
// HandleLicenseChange provides a mock function with given fields:
// HandleLicenseChange provides a mock function with no fields
func (_m *CloudInterface) HandleLicenseChange() error {
ret := _m.Called()
@@ -467,7 +467,7 @@ func (_m *CloudInterface) HandleLicenseChange() error {
return r0
}
// InvalidateCaches provides a mock function with given fields:
// InvalidateCaches provides a mock function with no fields
func (_m *CloudInterface) InvalidateCaches() error {
ret := _m.Called()

6
server/einterfaces/mocks/CloudJobInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.
@@ -16,7 +16,7 @@ type CloudJobInterface struct {
mock.Mock
}
// MakeScheduler provides a mock function with given fields:
// MakeScheduler provides a mock function with no fields
func (_m *CloudJobInterface) MakeScheduler() jobs.Scheduler {
ret := _m.Called()
@@ -36,7 +36,7 @@ func (_m *CloudJobInterface) MakeScheduler() jobs.Scheduler {
return r0
}
// MakeWorker provides a mock function with given fields:
// MakeWorker provides a mock function with no fields
func (_m *CloudJobInterface) MakeWorker() model.Worker {
ret := _m.Called()

18
server/einterfaces/mocks/ClusterInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.
@@ -68,7 +68,7 @@ func (_m *ClusterInterface) GenerateSupportPacket(rctx request.CTX, options *mod
return r0, r1
}
// GetClusterId provides a mock function with given fields:
// GetClusterId provides a mock function with no fields
func (_m *ClusterInterface) GetClusterId() string {
ret := _m.Called()
@@ -86,7 +86,7 @@ func (_m *ClusterInterface) GetClusterId() string {
return r0
}
// GetClusterInfos provides a mock function with given fields:
// GetClusterInfos provides a mock function with no fields
func (_m *ClusterInterface) GetClusterInfos() ([]*model.ClusterInfo, error) {
ret := _m.Called()
@@ -180,7 +180,7 @@ func (_m *ClusterInterface) GetLogs(ctx request.CTX, page int, perPage int) ([]s
return r0, r1
}
// GetMyClusterInfo provides a mock function with given fields:
// GetMyClusterInfo provides a mock function with no fields
func (_m *ClusterInterface) GetMyClusterInfo() *model.ClusterInfo {
ret := _m.Called()
@@ -200,7 +200,7 @@ func (_m *ClusterInterface) GetMyClusterInfo() *model.ClusterInfo {
return r0
}
// GetPluginStatuses provides a mock function with given fields:
// GetPluginStatuses provides a mock function with no fields
func (_m *ClusterInterface) GetPluginStatuses() (model.PluginStatuses, *model.AppError) {
ret := _m.Called()
@@ -262,7 +262,7 @@ func (_m *ClusterInterface) GetWSQueues(userID string, connectionID string, seqN
return r0, r1
}
// HealthScore provides a mock function with given fields:
// HealthScore provides a mock function with no fields
func (_m *ClusterInterface) HealthScore() int {
ret := _m.Called()
@@ -280,7 +280,7 @@ func (_m *ClusterInterface) HealthScore() int {
return r0
}
// IsLeader provides a mock function with given fields:
// IsLeader provides a mock function with no fields
func (_m *ClusterInterface) IsLeader() bool {
ret := _m.Called()
@@ -363,12 +363,12 @@ func (_m *ClusterInterface) SendClusterMessageToNode(nodeID string, msg *model.C
return r0
}
// StartInterNodeCommunication provides a mock function with given fields:
// StartInterNodeCommunication provides a mock function with no fields
func (_m *ClusterInterface) StartInterNodeCommunication() {
_m.Called()
}
// StopInterNodeCommunication provides a mock function with given fields:
// StopInterNodeCommunication provides a mock function with no fields
func (_m *ClusterInterface) StopInterNodeCommunication() {
_m.Called()
}

2
server/einterfaces/mocks/ClusterMessageHandler.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.

4
server/einterfaces/mocks/ComplianceInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.
@@ -35,7 +35,7 @@ func (_m *ComplianceInterface) RunComplianceJob(rctx request.CTX, job *model.Com
return r0
}
// StartComplianceDailyJob provides a mock function with given fields:
// StartComplianceDailyJob provides a mock function with no fields
func (_m *ComplianceInterface) StartComplianceDailyJob() {
_m.Called()
}

6
server/einterfaces/mocks/DataRetentionInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.
@@ -170,7 +170,7 @@ func (_m *DataRetentionInterface) GetChannelsForPolicy(policyID string, offset i
return r0, r1
}
// GetGlobalPolicy provides a mock function with given fields:
// GetGlobalPolicy provides a mock function with no fields
func (_m *DataRetentionInterface) GetGlobalPolicy() (*model.GlobalRetentionPolicy, *model.AppError) {
ret := _m.Called()
@@ -234,7 +234,7 @@ func (_m *DataRetentionInterface) GetPolicies(offset int, limit int) (*model.Ret
return r0, r1
}
// GetPoliciesCount provides a mock function with given fields:
// GetPoliciesCount provides a mock function with no fields
func (_m *DataRetentionInterface) GetPoliciesCount() (int64, *model.AppError) {
ret := _m.Called()

6
server/einterfaces/mocks/DataRetentionJobInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.
@@ -16,7 +16,7 @@ type DataRetentionJobInterface struct {
mock.Mock
}
// MakeScheduler provides a mock function with given fields:
// MakeScheduler provides a mock function with no fields
func (_m *DataRetentionJobInterface) MakeScheduler() jobs.Scheduler {
ret := _m.Called()
@@ -36,7 +36,7 @@ func (_m *DataRetentionJobInterface) MakeScheduler() jobs.Scheduler {
return r0
}
// MakeWorker provides a mock function with given fields:
// MakeWorker provides a mock function with no fields
func (_m *DataRetentionJobInterface) MakeWorker() model.Worker {
ret := _m.Called()

6
server/einterfaces/mocks/ElasticsearchAggregatorInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.
@@ -16,7 +16,7 @@ type ElasticsearchAggregatorInterface struct {
mock.Mock
}
// MakeScheduler provides a mock function with given fields:
// MakeScheduler provides a mock function with no fields
func (_m *ElasticsearchAggregatorInterface) MakeScheduler() jobs.Scheduler {
ret := _m.Called()
@@ -36,7 +36,7 @@ func (_m *ElasticsearchAggregatorInterface) MakeScheduler() jobs.Scheduler {
return r0
}
// MakeWorker provides a mock function with given fields:
// MakeWorker provides a mock function with no fields
func (_m *ElasticsearchAggregatorInterface) MakeWorker() model.Worker {
ret := _m.Called()

4
server/einterfaces/mocks/ElasticsearchIndexerInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.
@@ -14,7 +14,7 @@ type ElasticsearchIndexerInterface struct {
mock.Mock
}
// MakeWorker provides a mock function with given fields:
// MakeWorker provides a mock function with no fields
func (_m *ElasticsearchIndexerInterface) MakeWorker() model.Worker {
ret := _m.Called()

4
server/einterfaces/mocks/IPFilteringInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.
@@ -44,7 +44,7 @@ func (_m *IPFilteringInterface) ApplyIPFilters(allowedIPRanges *model.AllowedIPR
return r0, r1
}
// GetIPFilters provides a mock function with given fields:
// GetIPFilters provides a mock function with no fields
func (_m *IPFilteringInterface) GetIPFilters() (*model.AllowedIPRanges, error) {
ret := _m.Called()

4
server/einterfaces/mocks/IndexerJobInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.
@@ -14,7 +14,7 @@ type IndexerJobInterface struct {
mock.Mock
}
// MakeWorker provides a mock function with given fields:
// MakeWorker provides a mock function with no fields
func (_m *IndexerJobInterface) MakeWorker() model.Worker {
ret := _m.Called()

2
server/einterfaces/mocks/LdapDiagnosticInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.

2
server/einterfaces/mocks/LdapInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.

6
server/einterfaces/mocks/LdapSyncInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.
@@ -16,7 +16,7 @@ type LdapSyncInterface struct {
mock.Mock
}
// MakeScheduler provides a mock function with given fields:
// MakeScheduler provides a mock function with no fields
func (_m *LdapSyncInterface) MakeScheduler() jobs.Scheduler {
ret := _m.Called()
@@ -36,7 +36,7 @@ func (_m *LdapSyncInterface) MakeScheduler() jobs.Scheduler {
return r0
}
// MakeWorker provides a mock function with given fields:
// MakeWorker provides a mock function with no fields
func (_m *LdapSyncInterface) MakeWorker() model.Worker {
ret := _m.Called()

6
server/einterfaces/mocks/LicenseInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.
@@ -14,7 +14,7 @@ type LicenseInterface struct {
mock.Mock
}
// CanStartTrial provides a mock function with given fields:
// CanStartTrial provides a mock function with no fields
func (_m *LicenseInterface) CanStartTrial() (bool, error) {
ret := _m.Called()
@@ -42,7 +42,7 @@ func (_m *LicenseInterface) CanStartTrial() (bool, error) {
return r0, r1
}
// GetPrevTrial provides a mock function with given fields:
// GetPrevTrial provides a mock function with no fields
func (_m *LicenseInterface) GetPrevTrial() (*model.License, error) {
ret := _m.Called()

2
server/einterfaces/mocks/MessageExportInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.

6
server/einterfaces/mocks/MessageExportJobInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.
@@ -16,7 +16,7 @@ type MessageExportJobInterface struct {
mock.Mock
}
// MakeScheduler provides a mock function with given fields:
// MakeScheduler provides a mock function with no fields
func (_m *MessageExportJobInterface) MakeScheduler() jobs.Scheduler {
ret := _m.Called()
@@ -36,7 +36,7 @@ func (_m *MessageExportJobInterface) MakeScheduler() jobs.Scheduler {
return r0
}
// MakeWorker provides a mock function with given fields:
// MakeWorker provides a mock function with no fields
func (_m *MessageExportJobInterface) MakeWorker() model.Worker {
ret := _m.Called()

48
server/einterfaces/mocks/MetricsInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.
@@ -28,7 +28,7 @@ func (_m *MetricsInterface) AddMemCacheMissCounter(cacheName string, amount floa
_m.Called(cacheName, amount)
}
// ClearMobileClientSessionMetadata provides a mock function with given fields:
// ClearMobileClientSessionMetadata provides a mock function with no fields
func (_m *MetricsInterface) ClearMobileClientSessionMetadata() {
_m.Called()
}
@@ -53,7 +53,7 @@ func (_m *MetricsInterface) DecrementWebSocketBroadcastUsersRegistered(hub strin
_m.Called(hub, amount)
}
// GetLoggerMetricsCollector provides a mock function with given fields:
// GetLoggerMetricsCollector provides a mock function with no fields
func (_m *MetricsInterface) GetLoggerMetricsCollector() logr.MetricsCollector {
ret := _m.Called()
@@ -73,12 +73,12 @@ func (_m *MetricsInterface) GetLoggerMetricsCollector() logr.MetricsCollector {
return r0
}
// IncrementAccessControlCacheInvalidation provides a mock function with given fields:
// IncrementAccessControlCacheInvalidation provides a mock function with no fields
func (_m *MetricsInterface) IncrementAccessControlCacheInvalidation() {
_m.Called()
}
// IncrementChannelIndexCounter provides a mock function with given fields:
// IncrementChannelIndexCounter provides a mock function with no fields
func (_m *MetricsInterface) IncrementChannelIndexCounter() {
_m.Called()
}
@@ -93,7 +93,7 @@ func (_m *MetricsInterface) IncrementClusterEventType(eventType model.ClusterEve
_m.Called(eventType)
}
// IncrementClusterRequest provides a mock function with given fields:
// IncrementClusterRequest provides a mock function with no fields
func (_m *MetricsInterface) IncrementClusterRequest() {
_m.Called()
}
@@ -108,22 +108,22 @@ func (_m *MetricsInterface) IncrementEtagMissCounter(route string) {
_m.Called(route)
}
// IncrementFileIndexCounter provides a mock function with given fields:
// IncrementFileIndexCounter provides a mock function with no fields
func (_m *MetricsInterface) IncrementFileIndexCounter() {
_m.Called()
}
// IncrementFilesSearchCounter provides a mock function with given fields:
// IncrementFilesSearchCounter provides a mock function with no fields
func (_m *MetricsInterface) IncrementFilesSearchCounter() {
_m.Called()
}
// IncrementHTTPError provides a mock function with given fields:
// IncrementHTTPError provides a mock function with no fields
func (_m *MetricsInterface) IncrementHTTPError() {
_m.Called()
}
// IncrementHTTPRequest provides a mock function with given fields:
// IncrementHTTPRequest provides a mock function with no fields
func (_m *MetricsInterface) IncrementHTTPRequest() {
_m.Called()
}
@@ -138,12 +138,12 @@ func (_m *MetricsInterface) IncrementJobActive(jobType string) {
_m.Called(jobType)
}
// IncrementLogin provides a mock function with given fields:
// IncrementLogin provides a mock function with no fields
func (_m *MetricsInterface) IncrementLogin() {
_m.Called()
}
// IncrementLoginFail provides a mock function with given fields:
// IncrementLoginFail provides a mock function with no fields
func (_m *MetricsInterface) IncrementLoginFail() {
_m.Called()
}
@@ -153,7 +153,7 @@ func (_m *MetricsInterface) IncrementMemCacheHitCounter(cacheName string) {
_m.Called(cacheName)
}
// IncrementMemCacheHitCounterSession provides a mock function with given fields:
// IncrementMemCacheHitCounterSession provides a mock function with no fields
func (_m *MetricsInterface) IncrementMemCacheHitCounterSession() {
_m.Called()
}
@@ -163,7 +163,7 @@ func (_m *MetricsInterface) IncrementMemCacheInvalidationCounter(cacheName strin
_m.Called(cacheName)
}
// IncrementMemCacheInvalidationCounterSession provides a mock function with given fields:
// IncrementMemCacheInvalidationCounterSession provides a mock function with no fields
func (_m *MetricsInterface) IncrementMemCacheInvalidationCounterSession() {
_m.Called()
}
@@ -173,7 +173,7 @@ func (_m *MetricsInterface) IncrementMemCacheMissCounter(cacheName string) {
_m.Called(cacheName)
}
// IncrementMemCacheMissCounterSession provides a mock function with given fields:
// IncrementMemCacheMissCounterSession provides a mock function with no fields
func (_m *MetricsInterface) IncrementMemCacheMissCounterSession() {
_m.Called()
}
@@ -208,12 +208,12 @@ func (_m *MetricsInterface) IncrementNotificationUnsupportedCounter(notification
_m.Called(notificationType, notSentReason, platform)
}
// IncrementPostBroadcast provides a mock function with given fields:
// IncrementPostBroadcast provides a mock function with no fields
func (_m *MetricsInterface) IncrementPostBroadcast() {
_m.Called()
}
// IncrementPostCreate provides a mock function with given fields:
// IncrementPostCreate provides a mock function with no fields
func (_m *MetricsInterface) IncrementPostCreate() {
_m.Called()
}
@@ -223,22 +223,22 @@ func (_m *MetricsInterface) IncrementPostFileAttachment(count int) {
_m.Called(count)
}
// IncrementPostIndexCounter provides a mock function with given fields:
// IncrementPostIndexCounter provides a mock function with no fields
func (_m *MetricsInterface) IncrementPostIndexCounter() {
_m.Called()
}
// IncrementPostSentEmail provides a mock function with given fields:
// IncrementPostSentEmail provides a mock function with no fields
func (_m *MetricsInterface) IncrementPostSentEmail() {
_m.Called()
}
// IncrementPostSentPush provides a mock function with given fields:
// IncrementPostSentPush provides a mock function with no fields
func (_m *MetricsInterface) IncrementPostSentPush() {
_m.Called()
}
// IncrementPostsSearchCounter provides a mock function with given fields:
// IncrementPostsSearchCounter provides a mock function with no fields
func (_m *MetricsInterface) IncrementPostsSearchCounter() {
_m.Called()
}
@@ -268,7 +268,7 @@ func (_m *MetricsInterface) IncrementSharedChannelsSyncCounter(remoteID string)
_m.Called(remoteID)
}
// IncrementUserIndexCounter provides a mock function with given fields:
// IncrementUserIndexCounter provides a mock function with no fields
func (_m *MetricsInterface) IncrementUserIndexCounter() {
_m.Called()
}
@@ -288,7 +288,7 @@ func (_m *MetricsInterface) IncrementWebSocketBroadcastUsersRegistered(hub strin
_m.Called(hub, amount)
}
// IncrementWebhookPost provides a mock function with given fields:
// IncrementWebhookPost provides a mock function with no fields
func (_m *MetricsInterface) IncrementWebhookPost() {
_m.Called()
}
@@ -553,7 +553,7 @@ func (_m *MetricsInterface) ObserveStoreMethodDuration(method string, success st
_m.Called(method, success, elapsed)
}
// Register provides a mock function with given fields:
// Register provides a mock function with no fields
func (_m *MetricsInterface) Register() {
_m.Called()
}

4
server/einterfaces/mocks/NotificationInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.
@@ -15,7 +15,7 @@ type NotificationInterface struct {
mock.Mock
}
// CheckLicense provides a mock function with given fields:
// CheckLicense provides a mock function with no fields
func (_m *NotificationInterface) CheckLicense() *model.AppError {
ret := _m.Called()

2
server/einterfaces/mocks/OAuthProvider.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.

2
server/einterfaces/mocks/OutgoingOAuthConnectionInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.

2
server/einterfaces/mocks/PolicyAdministrationPointInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.

2
server/einterfaces/mocks/PolicyDecisionPointInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.

2
server/einterfaces/mocks/SamlInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.

2
server/einterfaces/mocks/Scheduler.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make einterfaces-mocks`.

4
server/go.mod
Просмотреть файл

@@ -1,8 +1,6 @@
module github.com/mattermost/mattermost/server/v8
go 1.23.0
toolchain go1.23.9
go 1.24.3
require (
code.sajari.com/docconv/v2 v2.0.0-pre.4

8
server/platform/services/cache/mocks/Cache.go поставляемый
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make cache-mocks`.
@@ -34,7 +34,7 @@ func (_m *Cache) Get(key string, value interface{}) error {
return r0
}
// GetInvalidateClusterEvent provides a mock function with given fields:
// GetInvalidateClusterEvent provides a mock function with no fields
func (_m *Cache) GetInvalidateClusterEvent() model.ClusterEvent {
ret := _m.Called()
@@ -72,7 +72,7 @@ func (_m *Cache) GetMulti(keys []string, values []interface{}) []error {
return r0
}
// Name provides a mock function with given fields:
// Name provides a mock function with no fields
func (_m *Cache) Name() string {
ret := _m.Called()
@@ -90,7 +90,7 @@ func (_m *Cache) Name() string {
return r0
}
// Purge provides a mock function with given fields:
// Purge provides a mock function with no fields
func (_m *Cache) Purge() error {
ret := _m.Called()

8
server/platform/services/cache/mocks/ExternalCache.go поставляемый
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make cache-mocks`.
@@ -52,7 +52,7 @@ func (_m *ExternalCache) Get(key string, value interface{}) error {
return r0
}
// GetInvalidateClusterEvent provides a mock function with given fields:
// GetInvalidateClusterEvent provides a mock function with no fields
func (_m *ExternalCache) GetInvalidateClusterEvent() model.ClusterEvent {
ret := _m.Called()
@@ -108,7 +108,7 @@ func (_m *ExternalCache) Increment(key string, val int) error {
return r0
}
// Name provides a mock function with given fields:
// Name provides a mock function with no fields
func (_m *ExternalCache) Name() string {
ret := _m.Called()
@@ -126,7 +126,7 @@ func (_m *ExternalCache) Name() string {
return r0
}
// Purge provides a mock function with given fields:
// Purge provides a mock function with no fields
func (_m *ExternalCache) Purge() error {
ret := _m.Called()

8
server/platform/services/cache/mocks/Provider.go поставляемый
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make cache-mocks`.
@@ -16,7 +16,7 @@ type Provider struct {
mock.Mock
}
// Close provides a mock function with given fields:
// Close provides a mock function with no fields
func (_m *Provider) Close() error {
ret := _m.Called()
@@ -34,7 +34,7 @@ func (_m *Provider) Close() error {
return r0
}
// Connect provides a mock function with given fields:
// Connect provides a mock function with no fields
func (_m *Provider) Connect() (string, error) {
ret := _m.Called()
@@ -97,7 +97,7 @@ func (_m *Provider) SetMetrics(metrics einterfaces.MetricsInterface) {
_m.Called(metrics)
}
// Type provides a mock function with given fields:
// Type provides a mock function with no fields
func (_m *Provider) Type() string {
ret := _m.Called()

5
server/platform/services/marketplace/client.go
Просмотреть файл

@@ -119,7 +119,10 @@ func closeBody(r *http.Response) {
}
func (c *Client) buildURL(urlPath string, args ...any) string {
return fmt.Sprintf("%s/%s", strings.TrimRight(c.address, "/"), strings.TrimLeft(fmt.Sprintf(urlPath, args...), "/"))
if len(args) > 0 {
urlPath = fmt.Sprintf(urlPath, args...)
}
return fmt.Sprintf("%s/%s", strings.TrimRight(c.address, "/"), strings.TrimLeft(urlPath, "/"))
}
func (c *Client) doGet(u string) (*http.Response, error) {

26
server/platform/services/searchengine/mocks/SearchEngineInterface.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make searchengine-mocks`.
@@ -217,7 +217,7 @@ func (_m *SearchEngineInterface) DeleteUserPosts(rctx request.CTX, userID string
return r0
}
// GetFullVersion provides a mock function with given fields:
// GetFullVersion provides a mock function with no fields
func (_m *SearchEngineInterface) GetFullVersion() string {
ret := _m.Called()
@@ -235,7 +235,7 @@ func (_m *SearchEngineInterface) GetFullVersion() string {
return r0
}
// GetName provides a mock function with given fields:
// GetName provides a mock function with no fields
func (_m *SearchEngineInterface) GetName() string {
ret := _m.Called()
@@ -253,7 +253,7 @@ func (_m *SearchEngineInterface) GetName() string {
return r0
}
// GetPlugins provides a mock function with given fields:
// GetPlugins provides a mock function with no fields
func (_m *SearchEngineInterface) GetPlugins() []string {
ret := _m.Called()
@@ -273,7 +273,7 @@ func (_m *SearchEngineInterface) GetPlugins() []string {
return r0
}
// GetVersion provides a mock function with given fields:
// GetVersion provides a mock function with no fields
func (_m *SearchEngineInterface) GetVersion() int {
ret := _m.Called()
@@ -371,7 +371,7 @@ func (_m *SearchEngineInterface) IndexUser(rctx request.CTX, user *model.User, t
return r0
}
// IsActive provides a mock function with given fields:
// IsActive provides a mock function with no fields
func (_m *SearchEngineInterface) IsActive() bool {
ret := _m.Called()
@@ -389,7 +389,7 @@ func (_m *SearchEngineInterface) IsActive() bool {
return r0
}
// IsAutocompletionEnabled provides a mock function with given fields:
// IsAutocompletionEnabled provides a mock function with no fields
func (_m *SearchEngineInterface) IsAutocompletionEnabled() bool {
ret := _m.Called()
@@ -407,7 +407,7 @@ func (_m *SearchEngineInterface) IsAutocompletionEnabled() bool {
return r0
}
// IsEnabled provides a mock function with given fields:
// IsEnabled provides a mock function with no fields
func (_m *SearchEngineInterface) IsEnabled() bool {
ret := _m.Called()
@@ -425,7 +425,7 @@ func (_m *SearchEngineInterface) IsEnabled() bool {
return r0
}
// IsIndexingEnabled provides a mock function with given fields:
// IsIndexingEnabled provides a mock function with no fields
func (_m *SearchEngineInterface) IsIndexingEnabled() bool {
ret := _m.Called()
@@ -443,7 +443,7 @@ func (_m *SearchEngineInterface) IsIndexingEnabled() bool {
return r0
}
// IsIndexingSync provides a mock function with given fields:
// IsIndexingSync provides a mock function with no fields
func (_m *SearchEngineInterface) IsIndexingSync() bool {
ret := _m.Called()
@@ -461,7 +461,7 @@ func (_m *SearchEngineInterface) IsIndexingSync() bool {
return r0
}
// IsSearchEnabled provides a mock function with given fields:
// IsSearchEnabled provides a mock function with no fields
func (_m *SearchEngineInterface) IsSearchEnabled() bool {
ret := _m.Called()
@@ -717,7 +717,7 @@ func (_m *SearchEngineInterface) SearchUsersInTeam(teamId string, restrictedToCh
return r0, r1
}
// Start provides a mock function with given fields:
// Start provides a mock function with no fields
func (_m *SearchEngineInterface) Start() *model.AppError {
ret := _m.Called()
@@ -737,7 +737,7 @@ func (_m *SearchEngineInterface) Start() *model.AppError {
return r0
}
// Stop provides a mock function with given fields:
// Stop provides a mock function with no fields
func (_m *SearchEngineInterface) Stop() *model.AppError {
ret := _m.Called()

2
server/platform/services/sharedchannel/mock_AppIface_test.go
Просмотреть файл

@@ -1,4 +1,4 @@
// Code generated by mockery v2.42.2. DO NOT EDIT.
// Code generated by mockery v2.53.4. DO NOT EDIT.
// Regenerate this file using `make sharedchannel-mocks`.

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше