MM-57759: Bump mockery to version 2.42.2 to support go 1.22^ (#26761)

server/channels/app/email/mocks/ServiceInterface.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make email-mocks`.
 
@@ -29,6 +29,10 @@ type ServiceInterface struct {
 func (_m *ServiceInterface) AddNotificationEmailToBatch(user *model.User, post *model.Post, team *model.Team) *model.AppError {
 	ret := _m.Called(user, post, team)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AddNotificationEmailToBatch")
+	}
+
 	var r0 *model.AppError
 	if rf, ok := ret.Get(0).(func(*model.User, *model.Post, *model.Team) *model.AppError); ok {
 		r0 = rf(user, post, team)
@@ -45,6 +49,10 @@ func (_m *ServiceInterface) AddNotificationEmailToBatch(user *model.User, post *
 func (_m *ServiceInterface) CreateVerifyEmailToken(userID string, newEmail string) (*model.Token, error) {
 	ret := _m.Called(userID, newEmail)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateVerifyEmailToken")
+	}
+
 	var r0 *model.Token
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (*model.Token, error)); ok {
@@ -71,6 +79,10 @@ func (_m *ServiceInterface) CreateVerifyEmailToken(userID string, newEmail strin
 func (_m *ServiceInterface) GenerateHyperlinkForChannels(postMessage string, teamName string, teamURL string) (string, error) {
 	ret := _m.Called(postMessage, teamName, teamURL)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GenerateHyperlinkForChannels")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, string) (string, error)); ok {
@@ -95,6 +107,10 @@ func (_m *ServiceInterface) GenerateHyperlinkForChannels(postMessage string, tea
 func (_m *ServiceInterface) GetMessageForNotification(post *model.Post, teamName string, siteUrl string, translateFunc i18n.TranslateFunc) string {
 	ret := _m.Called(post, teamName, siteUrl, translateFunc)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMessageForNotification")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func(*model.Post, string, string, i18n.TranslateFunc) string); ok {
 		r0 = rf(post, teamName, siteUrl, translateFunc)
@@ -109,6 +125,10 @@ func (_m *ServiceInterface) GetMessageForNotification(post *model.Post, teamName
 func (_m *ServiceInterface) GetPerDayEmailRateLimiter() *throttled.GCRARateLimiter {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPerDayEmailRateLimiter")
+	}
+
 	var r0 *throttled.GCRARateLimiter
 	if rf, ok := ret.Get(0).(func() *throttled.GCRARateLimiter); ok {
 		r0 = rf()
@@ -130,6 +150,10 @@ func (_m *ServiceInterface) InitEmailBatching() {
 func (_m *ServiceInterface) NewEmailTemplateData(locale string) templates.Data {
 	ret := _m.Called(locale)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewEmailTemplateData")
+	}
+
 	var r0 templates.Data
 	if rf, ok := ret.Get(0).(func(string) templates.Data); ok {
 		r0 = rf(locale)
@@ -144,6 +168,10 @@ func (_m *ServiceInterface) NewEmailTemplateData(locale string) templates.Data {
 func (_m *ServiceInterface) SendChangeUsernameEmail(newUsername string, _a1 string, locale string, siteURL string) error {
 	ret := _m.Called(newUsername, _a1, locale, siteURL)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendChangeUsernameEmail")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string, string) error); ok {
 		r0 = rf(newUsername, _a1, locale, siteURL)
@@ -158,6 +186,10 @@ func (_m *ServiceInterface) SendChangeUsernameEmail(newUsername string, _a1 stri
 func (_m *ServiceInterface) SendCloudRenewalEmail30(_a0 string, locale string, siteURL string) error {
 	ret := _m.Called(_a0, locale, siteURL)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendCloudRenewalEmail30")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string) error); ok {
 		r0 = rf(_a0, locale, siteURL)
@@ -172,6 +204,10 @@ func (_m *ServiceInterface) SendCloudRenewalEmail30(_a0 string, locale string, s
 func (_m *ServiceInterface) SendCloudRenewalEmail60(_a0 string, locale string, siteURL string) error {
 	ret := _m.Called(_a0, locale, siteURL)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendCloudRenewalEmail60")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string) error); ok {
 		r0 = rf(_a0, locale, siteURL)
@@ -186,6 +222,10 @@ func (_m *ServiceInterface) SendCloudRenewalEmail60(_a0 string, locale string, s
 func (_m *ServiceInterface) SendCloudRenewalEmail7(_a0 string, locale string, siteURL string) error {
 	ret := _m.Called(_a0, locale, siteURL)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendCloudRenewalEmail7")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string) error); ok {
 		r0 = rf(_a0, locale, siteURL)
@@ -200,6 +240,10 @@ func (_m *ServiceInterface) SendCloudRenewalEmail7(_a0 string, locale string, si
 func (_m *ServiceInterface) SendCloudUpgradeConfirmationEmail(userEmail string, name string, trialEndDate string, locale string, siteURL string, workspaceName string, isYearly bool, embeddedFiles map[string]io.Reader) error {
 	ret := _m.Called(userEmail, name, trialEndDate, locale, siteURL, workspaceName, isYearly, embeddedFiles)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendCloudUpgradeConfirmationEmail")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string, string, string, string, bool, map[string]io.Reader) error); ok {
 		r0 = rf(userEmail, name, trialEndDate, locale, siteURL, workspaceName, isYearly, embeddedFiles)
@@ -214,6 +258,10 @@ func (_m *ServiceInterface) SendCloudUpgradeConfirmationEmail(userEmail string,
 func (_m *ServiceInterface) SendCloudWelcomeEmail(userEmail string, locale string, teamInviteID string, workSpaceName string, dns string, siteURL string) error {
 	ret := _m.Called(userEmail, locale, teamInviteID, workSpaceName, dns, siteURL)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendCloudWelcomeEmail")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string, string, string, string) error); ok {
 		r0 = rf(userEmail, locale, teamInviteID, workSpaceName, dns, siteURL)
@@ -228,6 +276,10 @@ func (_m *ServiceInterface) SendCloudWelcomeEmail(userEmail string, locale strin
 func (_m *ServiceInterface) SendDeactivateAccountEmail(_a0 string, locale string, siteURL string) error {
 	ret := _m.Called(_a0, locale, siteURL)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendDeactivateAccountEmail")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string) error); ok {
 		r0 = rf(_a0, locale, siteURL)
@@ -242,6 +294,10 @@ func (_m *ServiceInterface) SendDeactivateAccountEmail(_a0 string, locale string
 func (_m *ServiceInterface) SendDelinquencyEmail14(_a0 string, locale string, siteURL string, planName string) error {
 	ret := _m.Called(_a0, locale, siteURL, planName)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendDelinquencyEmail14")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string, string) error); ok {
 		r0 = rf(_a0, locale, siteURL, planName)
@@ -256,6 +312,10 @@ func (_m *ServiceInterface) SendDelinquencyEmail14(_a0 string, locale string, si
 func (_m *ServiceInterface) SendDelinquencyEmail30(_a0 string, locale string, siteURL string, planName string) error {
 	ret := _m.Called(_a0, locale, siteURL, planName)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendDelinquencyEmail30")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string, string) error); ok {
 		r0 = rf(_a0, locale, siteURL, planName)
@@ -270,6 +330,10 @@ func (_m *ServiceInterface) SendDelinquencyEmail30(_a0 string, locale string, si
 func (_m *ServiceInterface) SendDelinquencyEmail45(_a0 string, locale string, siteURL string, planName string, delinquencyDate string) error {
 	ret := _m.Called(_a0, locale, siteURL, planName, delinquencyDate)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendDelinquencyEmail45")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string, string, string) error); ok {
 		r0 = rf(_a0, locale, siteURL, planName, delinquencyDate)
@@ -284,6 +348,10 @@ func (_m *ServiceInterface) SendDelinquencyEmail45(_a0 string, locale string, si
 func (_m *ServiceInterface) SendDelinquencyEmail60(_a0 string, locale string, siteURL string) error {
 	ret := _m.Called(_a0, locale, siteURL)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendDelinquencyEmail60")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string) error); ok {
 		r0 = rf(_a0, locale, siteURL)
@@ -298,6 +366,10 @@ func (_m *ServiceInterface) SendDelinquencyEmail60(_a0 string, locale string, si
 func (_m *ServiceInterface) SendDelinquencyEmail7(_a0 string, locale string, siteURL string, planName string) error {
 	ret := _m.Called(_a0, locale, siteURL, planName)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendDelinquencyEmail7")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string, string) error); ok {
 		r0 = rf(_a0, locale, siteURL, planName)
@@ -312,6 +384,10 @@ func (_m *ServiceInterface) SendDelinquencyEmail7(_a0 string, locale string, sit
 func (_m *ServiceInterface) SendDelinquencyEmail75(_a0 string, locale string, siteURL string, planName string, delinquencyDate string) error {
 	ret := _m.Called(_a0, locale, siteURL, planName, delinquencyDate)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendDelinquencyEmail75")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string, string, string) error); ok {
 		r0 = rf(_a0, locale, siteURL, planName, delinquencyDate)
@@ -326,6 +402,10 @@ func (_m *ServiceInterface) SendDelinquencyEmail75(_a0 string, locale string, si
 func (_m *ServiceInterface) SendDelinquencyEmail90(_a0 string, locale string, siteURL string) error {
 	ret := _m.Called(_a0, locale, siteURL)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendDelinquencyEmail90")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string) error); ok {
 		r0 = rf(_a0, locale, siteURL)
@@ -340,6 +420,10 @@ func (_m *ServiceInterface) SendDelinquencyEmail90(_a0 string, locale string, si
 func (_m *ServiceInterface) SendEmailChangeEmail(oldEmail string, newEmail string, locale string, siteURL string) error {
 	ret := _m.Called(oldEmail, newEmail, locale, siteURL)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendEmailChangeEmail")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string, string) error); ok {
 		r0 = rf(oldEmail, newEmail, locale, siteURL)
@@ -354,6 +438,10 @@ func (_m *ServiceInterface) SendEmailChangeEmail(oldEmail string, newEmail strin
 func (_m *ServiceInterface) SendEmailChangeVerifyEmail(newUserEmail string, locale string, siteURL string, token string) error {
 	ret := _m.Called(newUserEmail, locale, siteURL, token)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendEmailChangeVerifyEmail")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string, string) error); ok {
 		r0 = rf(newUserEmail, locale, siteURL, token)
@@ -368,6 +456,10 @@ func (_m *ServiceInterface) SendEmailChangeVerifyEmail(newUserEmail string, loca
 func (_m *ServiceInterface) SendGuestInviteEmails(team *model.Team, channels []*model.Channel, senderName string, senderUserId string, senderProfileImage []byte, invites []string, siteURL string, message string, errorWhenNotSent bool, isSystemAdmin bool, isFirstAdmin bool) error {
 	ret := _m.Called(team, channels, senderName, senderUserId, senderProfileImage, invites, siteURL, message, errorWhenNotSent, isSystemAdmin, isFirstAdmin)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendGuestInviteEmails")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*model.Team, []*model.Channel, string, string, []byte, []string, string, string, bool, bool, bool) error); ok {
 		r0 = rf(team, channels, senderName, senderUserId, senderProfileImage, invites, siteURL, message, errorWhenNotSent, isSystemAdmin, isFirstAdmin)
@@ -382,6 +474,10 @@ func (_m *ServiceInterface) SendGuestInviteEmails(team *model.Team, channels []*
 func (_m *ServiceInterface) SendIPFiltersChangedEmail(_a0 string, userWhoChangedFilter *model.User, siteURL string, portalURL string, locale string, isWorkspaceOwner bool) error {
 	ret := _m.Called(_a0, userWhoChangedFilter, siteURL, portalURL, locale, isWorkspaceOwner)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendIPFiltersChangedEmail")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, *model.User, string, string, string, bool) error); ok {
 		r0 = rf(_a0, userWhoChangedFilter, siteURL, portalURL, locale, isWorkspaceOwner)
@@ -396,6 +492,10 @@ func (_m *ServiceInterface) SendIPFiltersChangedEmail(_a0 string, userWhoChanged
 func (_m *ServiceInterface) SendInviteEmails(team *model.Team, senderName string, senderUserId string, invites []string, siteURL string, reminderData *model.TeamInviteReminderData, errorWhenNotSent bool, isSystemAdmin bool, isFirstAdmin bool) error {
 	ret := _m.Called(team, senderName, senderUserId, invites, siteURL, reminderData, errorWhenNotSent, isSystemAdmin, isFirstAdmin)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendInviteEmails")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*model.Team, string, string, []string, string, *model.TeamInviteReminderData, bool, bool, bool) error); ok {
 		r0 = rf(team, senderName, senderUserId, invites, siteURL, reminderData, errorWhenNotSent, isSystemAdmin, isFirstAdmin)
@@ -410,6 +510,10 @@ func (_m *ServiceInterface) SendInviteEmails(team *model.Team, senderName string
 func (_m *ServiceInterface) SendInviteEmailsToTeamAndChannels(team *model.Team, channels []*model.Channel, senderName string, senderUserId string, senderProfileImage []byte, invites []string, siteURL string, reminderData *model.TeamInviteReminderData, message string, errorWhenNotSent bool, isSystemAdmin bool, isFirstAdmin bool) ([]*model.EmailInviteWithError, error) {
 	ret := _m.Called(team, channels, senderName, senderUserId, senderProfileImage, invites, siteURL, reminderData, message, errorWhenNotSent, isSystemAdmin, isFirstAdmin)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendInviteEmailsToTeamAndChannels")
+	}
+
 	var r0 []*model.EmailInviteWithError
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Team, []*model.Channel, string, string, []byte, []string, string, *model.TeamInviteReminderData, string, bool, bool, bool) ([]*model.EmailInviteWithError, error)); ok {
@@ -436,6 +540,10 @@ func (_m *ServiceInterface) SendInviteEmailsToTeamAndChannels(team *model.Team,
 func (_m *ServiceInterface) SendLicenseUpForRenewalEmail(_a0 string, name string, locale string, siteURL string, ctaTitle string, ctaLink string, ctaText string, daysToExpiration int) error {
 	ret := _m.Called(_a0, name, locale, siteURL, ctaTitle, ctaLink, ctaText, daysToExpiration)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendLicenseUpForRenewalEmail")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string, string, string, string, string, int) error); ok {
 		r0 = rf(_a0, name, locale, siteURL, ctaTitle, ctaLink, ctaText, daysToExpiration)
@@ -450,6 +558,10 @@ func (_m *ServiceInterface) SendLicenseUpForRenewalEmail(_a0 string, name string
 func (_m *ServiceInterface) SendMailWithEmbeddedFiles(to string, subject string, htmlBody string, embeddedFiles map[string]io.Reader, messageID string, inReplyTo string, references string, category string) error {
 	ret := _m.Called(to, subject, htmlBody, embeddedFiles, messageID, inReplyTo, references, category)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendMailWithEmbeddedFiles")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string, map[string]io.Reader, string, string, string, string) error); ok {
 		r0 = rf(to, subject, htmlBody, embeddedFiles, messageID, inReplyTo, references, category)
@@ -464,6 +576,10 @@ func (_m *ServiceInterface) SendMailWithEmbeddedFiles(to string, subject string,
 func (_m *ServiceInterface) SendMfaChangeEmail(_a0 string, activated bool, locale string, siteURL string) error {
 	ret := _m.Called(_a0, activated, locale, siteURL)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendMfaChangeEmail")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, bool, string, string) error); ok {
 		r0 = rf(_a0, activated, locale, siteURL)
@@ -478,6 +594,10 @@ func (_m *ServiceInterface) SendMfaChangeEmail(_a0 string, activated bool, local
 func (_m *ServiceInterface) SendNoCardPaymentFailedEmail(_a0 string, locale string, siteURL string) error {
 	ret := _m.Called(_a0, locale, siteURL)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendNoCardPaymentFailedEmail")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string) error); ok {
 		r0 = rf(_a0, locale, siteURL)
@@ -492,6 +612,10 @@ func (_m *ServiceInterface) SendNoCardPaymentFailedEmail(_a0 string, locale stri
 func (_m *ServiceInterface) SendNotificationMail(to string, subject string, htmlBody string) error {
 	ret := _m.Called(to, subject, htmlBody)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendNotificationMail")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string) error); ok {
 		r0 = rf(to, subject, htmlBody)
@@ -506,6 +630,10 @@ func (_m *ServiceInterface) SendNotificationMail(to string, subject string, html
 func (_m *ServiceInterface) SendPasswordChangeEmail(_a0 string, method string, locale string, siteURL string) error {
 	ret := _m.Called(_a0, method, locale, siteURL)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendPasswordChangeEmail")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string, string) error); ok {
 		r0 = rf(_a0, method, locale, siteURL)
@@ -520,6 +648,10 @@ func (_m *ServiceInterface) SendPasswordChangeEmail(_a0 string, method string, l
 func (_m *ServiceInterface) SendPasswordResetEmail(_a0 string, token *model.Token, locale string, siteURL string) (bool, error) {
 	ret := _m.Called(_a0, token, locale, siteURL)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendPasswordResetEmail")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, *model.Token, string, string) (bool, error)); ok {
@@ -544,6 +676,10 @@ func (_m *ServiceInterface) SendPasswordResetEmail(_a0 string, token *model.Toke
 func (_m *ServiceInterface) SendPaymentFailedEmail(_a0 string, locale string, failedPayment *model.FailedPayment, planName string, siteURL string) (bool, error) {
 	ret := _m.Called(_a0, locale, failedPayment, planName, siteURL)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendPaymentFailedEmail")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, *model.FailedPayment, string, string) (bool, error)); ok {
@@ -568,6 +704,10 @@ func (_m *ServiceInterface) SendPaymentFailedEmail(_a0 string, locale string, fa
 func (_m *ServiceInterface) SendRemoveExpiredLicenseEmail(ctaText string, ctaLink string, _a2 string, locale string, siteURL string) error {
 	ret := _m.Called(ctaText, ctaLink, _a2, locale, siteURL)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendRemoveExpiredLicenseEmail")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string, string, string) error); ok {
 		r0 = rf(ctaText, ctaLink, _a2, locale, siteURL)
@@ -582,6 +722,10 @@ func (_m *ServiceInterface) SendRemoveExpiredLicenseEmail(ctaText string, ctaLin
 func (_m *ServiceInterface) SendSignInChangeEmail(_a0 string, method string, locale string, siteURL string) error {
 	ret := _m.Called(_a0, method, locale, siteURL)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendSignInChangeEmail")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string, string) error); ok {
 		r0 = rf(_a0, method, locale, siteURL)
@@ -596,6 +740,10 @@ func (_m *ServiceInterface) SendSignInChangeEmail(_a0 string, method string, loc
 func (_m *ServiceInterface) SendUserAccessTokenAddedEmail(_a0 string, locale string, siteURL string) error {
 	ret := _m.Called(_a0, locale, siteURL)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendUserAccessTokenAddedEmail")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string) error); ok {
 		r0 = rf(_a0, locale, siteURL)
@@ -610,6 +758,10 @@ func (_m *ServiceInterface) SendUserAccessTokenAddedEmail(_a0 string, locale str
 func (_m *ServiceInterface) SendVerifyEmail(userEmail string, locale string, siteURL string, token string, redirect string) error {
 	ret := _m.Called(userEmail, locale, siteURL, token, redirect)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendVerifyEmail")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string, string, string) error); ok {
 		r0 = rf(userEmail, locale, siteURL, token, redirect)
@@ -624,6 +776,10 @@ func (_m *ServiceInterface) SendVerifyEmail(userEmail string, locale string, sit
 func (_m *ServiceInterface) SendWelcomeEmail(userID string, _a1 string, verified bool, disableWelcomeEmail bool, locale string, siteURL string, redirect string) error {
 	ret := _m.Called(userID, _a1, verified, disableWelcomeEmail, locale, siteURL, redirect)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendWelcomeEmail")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, bool, bool, string, string, string) error); ok {
 		r0 = rf(userID, _a1, verified, disableWelcomeEmail, locale, siteURL, redirect)
@@ -644,13 +800,12 @@ func (_m *ServiceInterface) Stop() {
 	_m.Called()
 }
 
-type mockConstructorTestingTNewServiceInterface interface {
+// NewServiceInterface creates a new instance of ServiceInterface. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewServiceInterface(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewServiceInterface creates a new instance of ServiceInterface. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewServiceInterface(t mockConstructorTestingTNewServiceInterface) *ServiceInterface {
+}) *ServiceInterface {
 	mock := &ServiceInterface{}
 	mock.Mock.Test(t)
 

server/channels/app/platform/mocks/SuiteIFace.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.32.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make platform-mocks`.
 
@@ -20,6 +20,10 @@ type SuiteIFace struct {
 func (_m *SuiteIFace) GetSession(token string) (*model.Session, *model.AppError) {
 	ret := _m.Called(token)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSession")
+	}
+
 	var r0 *model.Session
 	var r1 *model.AppError
 	if rf, ok := ret.Get(0).(func(string) (*model.Session, *model.AppError)); ok {
@@ -48,6 +52,10 @@ func (_m *SuiteIFace) GetSession(token string) (*model.Session, *model.AppError)
 func (_m *SuiteIFace) RolesGrantPermission(roleNames []string, permissionId string) bool {
 	ret := _m.Called(roleNames, permissionId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RolesGrantPermission")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func([]string, string) bool); ok {
 		r0 = rf(roleNames, permissionId)
@@ -62,6 +70,10 @@ func (_m *SuiteIFace) RolesGrantPermission(roleNames []string, permissionId stri
 func (_m *SuiteIFace) UserCanSeeOtherUser(c request.CTX, userID string, otherUserId string) (bool, *model.AppError) {
 	ret := _m.Called(c, userID, otherUserId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UserCanSeeOtherUser")
+	}
+
 	var r0 bool
 	var r1 *model.AppError
 	if rf, ok := ret.Get(0).(func(request.CTX, string, string) (bool, *model.AppError)); ok {

server/channels/store/storetest/mocks/AuditStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type AuditStore struct {
 func (_m *AuditStore) Get(user_id string, offset int, limit int) (model.Audits, error) {
 	ret := _m.Called(user_id, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 model.Audits
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int) (model.Audits, error)); ok {
@@ -44,6 +48,10 @@ func (_m *AuditStore) Get(user_id string, offset int, limit int) (model.Audits,
 func (_m *AuditStore) PermanentDeleteByUser(userID string) error {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteByUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(userID)
@@ -58,6 +66,10 @@ func (_m *AuditStore) PermanentDeleteByUser(userID string) error {
 func (_m *AuditStore) Save(audit *model.Audit) error {
 	ret := _m.Called(audit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*model.Audit) error); ok {
 		r0 = rf(audit)
@@ -68,13 +80,12 @@ func (_m *AuditStore) Save(audit *model.Audit) error {
 	return r0
 }
 
-type mockConstructorTestingTNewAuditStore interface {
+// NewAuditStore creates a new instance of AuditStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewAuditStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewAuditStore creates a new instance of AuditStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewAuditStore(t mockConstructorTestingTNewAuditStore) *AuditStore {
+}) *AuditStore {
 	mock := &AuditStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/BotStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type BotStore struct {
 func (_m *BotStore) Get(userID string, includeDeleted bool) (*model.Bot, error) {
 	ret := _m.Called(userID, includeDeleted)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.Bot
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, bool) (*model.Bot, error)); ok {
@@ -44,6 +48,10 @@ func (_m *BotStore) Get(userID string, includeDeleted bool) (*model.Bot, error)
 func (_m *BotStore) GetAll(options *model.BotGetOptions) ([]*model.Bot, error) {
 	ret := _m.Called(options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []*model.Bot
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.BotGetOptions) ([]*model.Bot, error)); ok {
@@ -70,6 +78,10 @@ func (_m *BotStore) GetAll(options *model.BotGetOptions) ([]*model.Bot, error) {
 func (_m *BotStore) PermanentDelete(userID string) error {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDelete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(userID)
@@ -84,6 +96,10 @@ func (_m *BotStore) PermanentDelete(userID string) error {
 func (_m *BotStore) Save(bot *model.Bot) (*model.Bot, error) {
 	ret := _m.Called(bot)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.Bot
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Bot) (*model.Bot, error)); ok {
@@ -110,6 +126,10 @@ func (_m *BotStore) Save(bot *model.Bot) (*model.Bot, error) {
 func (_m *BotStore) Update(bot *model.Bot) (*model.Bot, error) {
 	ret := _m.Called(bot)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
 	var r0 *model.Bot
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Bot) (*model.Bot, error)); ok {
@@ -132,13 +152,12 @@ func (_m *BotStore) Update(bot *model.Bot) (*model.Bot, error) {
 	return r0, r1
 }
 
-type mockConstructorTestingTNewBotStore interface {
+// NewBotStore creates a new instance of BotStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewBotStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewBotStore creates a new instance of BotStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewBotStore(t mockConstructorTestingTNewBotStore) *BotStore {
+}) *BotStore {
 	mock := &BotStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/ChannelBookmarkStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type ChannelBookmarkStore struct {
 func (_m *ChannelBookmarkStore) Delete(bookmarkId string, deleteFile bool) error {
 	ret := _m.Called(bookmarkId, deleteFile)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, bool) error); ok {
 		r0 = rf(bookmarkId, deleteFile)
@@ -32,6 +36,10 @@ func (_m *ChannelBookmarkStore) Delete(bookmarkId string, deleteFile bool) error
 func (_m *ChannelBookmarkStore) ErrorIfBookmarkFileInfoAlreadyAttached(fileId string) error {
 	ret := _m.Called(fileId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ErrorIfBookmarkFileInfoAlreadyAttached")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(fileId)
@@ -46,6 +54,10 @@ func (_m *ChannelBookmarkStore) ErrorIfBookmarkFileInfoAlreadyAttached(fileId st
 func (_m *ChannelBookmarkStore) Get(Id string, includeDeleted bool) (*model.ChannelBookmarkWithFileInfo, error) {
 	ret := _m.Called(Id, includeDeleted)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.ChannelBookmarkWithFileInfo
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, bool) (*model.ChannelBookmarkWithFileInfo, error)); ok {
@@ -72,6 +84,10 @@ func (_m *ChannelBookmarkStore) Get(Id string, includeDeleted bool) (*model.Chan
 func (_m *ChannelBookmarkStore) GetBookmarksForChannelSince(channelId string, since int64) ([]*model.ChannelBookmarkWithFileInfo, error) {
 	ret := _m.Called(channelId, since)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetBookmarksForChannelSince")
+	}
+
 	var r0 []*model.ChannelBookmarkWithFileInfo
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int64) ([]*model.ChannelBookmarkWithFileInfo, error)); ok {
@@ -98,6 +114,10 @@ func (_m *ChannelBookmarkStore) GetBookmarksForChannelSince(channelId string, si
 func (_m *ChannelBookmarkStore) Save(bookmark *model.ChannelBookmark, increaseSortOrder bool) (*model.ChannelBookmarkWithFileInfo, error) {
 	ret := _m.Called(bookmark, increaseSortOrder)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.ChannelBookmarkWithFileInfo
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.ChannelBookmark, bool) (*model.ChannelBookmarkWithFileInfo, error)); ok {
@@ -124,6 +144,10 @@ func (_m *ChannelBookmarkStore) Save(bookmark *model.ChannelBookmark, increaseSo
 func (_m *ChannelBookmarkStore) Update(bookmark *model.ChannelBookmark) error {
 	ret := _m.Called(bookmark)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*model.ChannelBookmark) error); ok {
 		r0 = rf(bookmark)
@@ -138,6 +162,10 @@ func (_m *ChannelBookmarkStore) Update(bookmark *model.ChannelBookmark) error {
 func (_m *ChannelBookmarkStore) UpdateSortOrder(bookmarkId string, channelId string, newIndex int64) ([]*model.ChannelBookmarkWithFileInfo, error) {
 	ret := _m.Called(bookmarkId, channelId, newIndex)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateSortOrder")
+	}
+
 	var r0 []*model.ChannelBookmarkWithFileInfo
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, int64) ([]*model.ChannelBookmarkWithFileInfo, error)); ok {
@@ -160,13 +188,12 @@ func (_m *ChannelBookmarkStore) UpdateSortOrder(bookmarkId string, channelId str
 	return r0, r1
 }
 
-type mockConstructorTestingTNewChannelBookmarkStore interface {
+// NewChannelBookmarkStore creates a new instance of ChannelBookmarkStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewChannelBookmarkStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewChannelBookmarkStore creates a new instance of ChannelBookmarkStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewChannelBookmarkStore(t mockConstructorTestingTNewChannelBookmarkStore) *ChannelBookmarkStore {
+}) *ChannelBookmarkStore {
 	mock := &ChannelBookmarkStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/ChannelMemberHistoryStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type ChannelMemberHistoryStore struct {
 func (_m *ChannelMemberHistoryStore) DeleteOrphanedRows(limit int) (int64, error) {
 	ret := _m.Called(limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteOrphanedRows")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int) (int64, error)); ok {
@@ -42,6 +46,10 @@ func (_m *ChannelMemberHistoryStore) DeleteOrphanedRows(limit int) (int64, error
 func (_m *ChannelMemberHistoryStore) GetChannelsLeftSince(userID string, since int64) ([]string, error) {
 	ret := _m.Called(userID, since)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetChannelsLeftSince")
+	}
+
 	var r0 []string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int64) ([]string, error)); ok {
@@ -68,6 +76,10 @@ func (_m *ChannelMemberHistoryStore) GetChannelsLeftSince(userID string, since i
 func (_m *ChannelMemberHistoryStore) GetUsersInChannelDuring(startTime int64, endTime int64, channelID string) ([]*model.ChannelMemberHistoryResult, error) {
 	ret := _m.Called(startTime, endTime, channelID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUsersInChannelDuring")
+	}
+
 	var r0 []*model.ChannelMemberHistoryResult
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, int64, string) ([]*model.ChannelMemberHistoryResult, error)); ok {
@@ -94,6 +106,10 @@ func (_m *ChannelMemberHistoryStore) GetUsersInChannelDuring(startTime int64, en
 func (_m *ChannelMemberHistoryStore) LogJoinEvent(userID string, channelID string, joinTime int64) error {
 	ret := _m.Called(userID, channelID, joinTime)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LogJoinEvent")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, int64) error); ok {
 		r0 = rf(userID, channelID, joinTime)
@@ -108,6 +124,10 @@ func (_m *ChannelMemberHistoryStore) LogJoinEvent(userID string, channelID strin
 func (_m *ChannelMemberHistoryStore) LogLeaveEvent(userID string, channelID string, leaveTime int64) error {
 	ret := _m.Called(userID, channelID, leaveTime)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LogLeaveEvent")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, int64) error); ok {
 		r0 = rf(userID, channelID, leaveTime)
@@ -122,6 +142,10 @@ func (_m *ChannelMemberHistoryStore) LogLeaveEvent(userID string, channelID stri
 func (_m *ChannelMemberHistoryStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, error) {
 	ret := _m.Called(endTime, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteBatch")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, int64) (int64, error)); ok {
@@ -146,6 +170,10 @@ func (_m *ChannelMemberHistoryStore) PermanentDeleteBatch(endTime int64, limit i
 func (_m *ChannelMemberHistoryStore) PermanentDeleteBatchForRetentionPolicies(now int64, globalPolicyEndTime int64, limit int64, cursor model.RetentionPolicyCursor) (int64, model.RetentionPolicyCursor, error) {
 	ret := _m.Called(now, globalPolicyEndTime, limit, cursor)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteBatchForRetentionPolicies")
+	}
+
 	var r0 int64
 	var r1 model.RetentionPolicyCursor
 	var r2 error
@@ -173,13 +201,12 @@ func (_m *ChannelMemberHistoryStore) PermanentDeleteBatchForRetentionPolicies(no
 	return r0, r1, r2
 }
 
-type mockConstructorTestingTNewChannelMemberHistoryStore interface {
+// NewChannelMemberHistoryStore creates a new instance of ChannelMemberHistoryStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewChannelMemberHistoryStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewChannelMemberHistoryStore creates a new instance of ChannelMemberHistoryStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewChannelMemberHistoryStore(t mockConstructorTestingTNewChannelMemberHistoryStore) *ChannelMemberHistoryStore {
+}) *ChannelMemberHistoryStore {
 	mock := &ChannelMemberHistoryStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/ClusterDiscoveryStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type ClusterDiscoveryStore struct {
 func (_m *ClusterDiscoveryStore) Cleanup() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Cleanup")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -32,6 +36,10 @@ func (_m *ClusterDiscoveryStore) Cleanup() error {
 func (_m *ClusterDiscoveryStore) Delete(discovery *model.ClusterDiscovery) (bool, error) {
 	ret := _m.Called(discovery)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.ClusterDiscovery) (bool, error)); ok {
@@ -56,6 +64,10 @@ func (_m *ClusterDiscoveryStore) Delete(discovery *model.ClusterDiscovery) (bool
 func (_m *ClusterDiscoveryStore) Exists(discovery *model.ClusterDiscovery) (bool, error) {
 	ret := _m.Called(discovery)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Exists")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.ClusterDiscovery) (bool, error)); ok {
@@ -80,6 +92,10 @@ func (_m *ClusterDiscoveryStore) Exists(discovery *model.ClusterDiscovery) (bool
 func (_m *ClusterDiscoveryStore) GetAll(discoveryType string, clusterName string) ([]*model.ClusterDiscovery, error) {
 	ret := _m.Called(discoveryType, clusterName)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []*model.ClusterDiscovery
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]*model.ClusterDiscovery, error)); ok {
@@ -106,6 +122,10 @@ func (_m *ClusterDiscoveryStore) GetAll(discoveryType string, clusterName string
 func (_m *ClusterDiscoveryStore) Save(discovery *model.ClusterDiscovery) error {
 	ret := _m.Called(discovery)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*model.ClusterDiscovery) error); ok {
 		r0 = rf(discovery)
@@ -120,6 +140,10 @@ func (_m *ClusterDiscoveryStore) Save(discovery *model.ClusterDiscovery) error {
 func (_m *ClusterDiscoveryStore) SetLastPingAt(discovery *model.ClusterDiscovery) error {
 	ret := _m.Called(discovery)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetLastPingAt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*model.ClusterDiscovery) error); ok {
 		r0 = rf(discovery)
@@ -130,13 +154,12 @@ func (_m *ClusterDiscoveryStore) SetLastPingAt(discovery *model.ClusterDiscovery
 	return r0
 }
 
-type mockConstructorTestingTNewClusterDiscoveryStore interface {
+// NewClusterDiscoveryStore creates a new instance of ClusterDiscoveryStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewClusterDiscoveryStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewClusterDiscoveryStore creates a new instance of ClusterDiscoveryStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewClusterDiscoveryStore(t mockConstructorTestingTNewClusterDiscoveryStore) *ClusterDiscoveryStore {
+}) *ClusterDiscoveryStore {
 	mock := &ClusterDiscoveryStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/CommandStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type CommandStore struct {
 func (_m *CommandStore) AnalyticsCommandCount(teamID string) (int64, error) {
 	ret := _m.Called(teamID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AnalyticsCommandCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (int64, error)); ok {
@@ -42,6 +46,10 @@ func (_m *CommandStore) AnalyticsCommandCount(teamID string) (int64, error) {
 func (_m *CommandStore) Delete(commandID string, timestamp int64) error {
 	ret := _m.Called(commandID, timestamp)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, int64) error); ok {
 		r0 = rf(commandID, timestamp)
@@ -56,6 +64,10 @@ func (_m *CommandStore) Delete(commandID string, timestamp int64) error {
 func (_m *CommandStore) Get(id string) (*model.Command, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.Command
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.Command, error)); ok {
@@ -82,6 +94,10 @@ func (_m *CommandStore) Get(id string) (*model.Command, error) {
 func (_m *CommandStore) GetByTeam(teamID string) ([]*model.Command, error) {
 	ret := _m.Called(teamID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByTeam")
+	}
+
 	var r0 []*model.Command
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.Command, error)); ok {
@@ -108,6 +124,10 @@ func (_m *CommandStore) GetByTeam(teamID string) ([]*model.Command, error) {
 func (_m *CommandStore) GetByTrigger(teamID string, trigger string) (*model.Command, error) {
 	ret := _m.Called(teamID, trigger)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByTrigger")
+	}
+
 	var r0 *model.Command
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (*model.Command, error)); ok {
@@ -134,6 +154,10 @@ func (_m *CommandStore) GetByTrigger(teamID string, trigger string) (*model.Comm
 func (_m *CommandStore) PermanentDeleteByTeam(teamID string) error {
 	ret := _m.Called(teamID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteByTeam")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(teamID)
@@ -148,6 +172,10 @@ func (_m *CommandStore) PermanentDeleteByTeam(teamID string) error {
 func (_m *CommandStore) PermanentDeleteByUser(userID string) error {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteByUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(userID)
@@ -162,6 +190,10 @@ func (_m *CommandStore) PermanentDeleteByUser(userID string) error {
 func (_m *CommandStore) Save(webhook *model.Command) (*model.Command, error) {
 	ret := _m.Called(webhook)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.Command
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Command) (*model.Command, error)); ok {
@@ -188,6 +220,10 @@ func (_m *CommandStore) Save(webhook *model.Command) (*model.Command, error) {
 func (_m *CommandStore) Update(hook *model.Command) (*model.Command, error) {
 	ret := _m.Called(hook)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
 	var r0 *model.Command
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Command) (*model.Command, error)); ok {
@@ -210,13 +246,12 @@ func (_m *CommandStore) Update(hook *model.Command) (*model.Command, error) {
 	return r0, r1
 }
 
-type mockConstructorTestingTNewCommandStore interface {
+// NewCommandStore creates a new instance of CommandStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewCommandStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewCommandStore creates a new instance of CommandStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewCommandStore(t mockConstructorTestingTNewCommandStore) *CommandStore {
+}) *CommandStore {
 	mock := &CommandStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/CommandWebhookStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -23,6 +23,10 @@ func (_m *CommandWebhookStore) Cleanup() {
 func (_m *CommandWebhookStore) Get(id string) (*model.CommandWebhook, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.CommandWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.CommandWebhook, error)); ok {
@@ -49,6 +53,10 @@ func (_m *CommandWebhookStore) Get(id string) (*model.CommandWebhook, error) {
 func (_m *CommandWebhookStore) Save(webhook *model.CommandWebhook) (*model.CommandWebhook, error) {
 	ret := _m.Called(webhook)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.CommandWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.CommandWebhook) (*model.CommandWebhook, error)); ok {
@@ -75,6 +83,10 @@ func (_m *CommandWebhookStore) Save(webhook *model.CommandWebhook) (*model.Comma
 func (_m *CommandWebhookStore) TryUse(id string, limit int) error {
 	ret := _m.Called(id, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TryUse")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, int) error); ok {
 		r0 = rf(id, limit)
@@ -85,13 +97,12 @@ func (_m *CommandWebhookStore) TryUse(id string, limit int) error {
 	return r0
 }
 
-type mockConstructorTestingTNewCommandWebhookStore interface {
+// NewCommandWebhookStore creates a new instance of CommandWebhookStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewCommandWebhookStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewCommandWebhookStore creates a new instance of CommandWebhookStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewCommandWebhookStore(t mockConstructorTestingTNewCommandWebhookStore) *CommandWebhookStore {
+}) *CommandWebhookStore {
 	mock := &CommandWebhookStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/ComplianceStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -19,6 +19,10 @@ type ComplianceStore struct {
 func (_m *ComplianceStore) ComplianceExport(compliance *model.Compliance, cursor model.ComplianceExportCursor, limit int) ([]*model.CompliancePost, model.ComplianceExportCursor, error) {
 	ret := _m.Called(compliance, cursor, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ComplianceExport")
+	}
+
 	var r0 []*model.CompliancePost
 	var r1 model.ComplianceExportCursor
 	var r2 error
@@ -52,6 +56,10 @@ func (_m *ComplianceStore) ComplianceExport(compliance *model.Compliance, cursor
 func (_m *ComplianceStore) Get(id string) (*model.Compliance, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.Compliance
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.Compliance, error)); ok {
@@ -78,6 +86,10 @@ func (_m *ComplianceStore) Get(id string) (*model.Compliance, error) {
 func (_m *ComplianceStore) GetAll(offset int, limit int) (model.Compliances, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 model.Compliances
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int, int) (model.Compliances, error)); ok {
@@ -104,6 +116,10 @@ func (_m *ComplianceStore) GetAll(offset int, limit int) (model.Compliances, err
 func (_m *ComplianceStore) MessageExport(c request.CTX, cursor model.MessageExportCursor, limit int) ([]*model.MessageExport, model.MessageExportCursor, error) {
 	ret := _m.Called(c, cursor, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MessageExport")
+	}
+
 	var r0 []*model.MessageExport
 	var r1 model.MessageExportCursor
 	var r2 error
@@ -137,6 +153,10 @@ func (_m *ComplianceStore) MessageExport(c request.CTX, cursor model.MessageExpo
 func (_m *ComplianceStore) Save(compliance *model.Compliance) (*model.Compliance, error) {
 	ret := _m.Called(compliance)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.Compliance
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Compliance) (*model.Compliance, error)); ok {
@@ -163,6 +183,10 @@ func (_m *ComplianceStore) Save(compliance *model.Compliance) (*model.Compliance
 func (_m *ComplianceStore) Update(compliance *model.Compliance) (*model.Compliance, error) {
 	ret := _m.Called(compliance)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
 	var r0 *model.Compliance
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Compliance) (*model.Compliance, error)); ok {
@@ -185,13 +209,12 @@ func (_m *ComplianceStore) Update(compliance *model.Compliance) (*model.Complian
 	return r0, r1
 }
 
-type mockConstructorTestingTNewComplianceStore interface {
+// NewComplianceStore creates a new instance of ComplianceStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewComplianceStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewComplianceStore creates a new instance of ComplianceStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewComplianceStore(t mockConstructorTestingTNewComplianceStore) *ComplianceStore {
+}) *ComplianceStore {
 	mock := &ComplianceStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/DesktopTokensStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -15,6 +15,10 @@ type DesktopTokensStore struct {
 func (_m *DesktopTokensStore) Delete(token string) error {
 	ret := _m.Called(token)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(token)
@@ -29,6 +33,10 @@ func (_m *DesktopTokensStore) Delete(token string) error {
 func (_m *DesktopTokensStore) DeleteByUserId(userId string) error {
 	ret := _m.Called(userId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteByUserId")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(userId)
@@ -43,6 +51,10 @@ func (_m *DesktopTokensStore) DeleteByUserId(userId string) error {
 func (_m *DesktopTokensStore) DeleteOlderThan(minCreatedAt int64) error {
 	ret := _m.Called(minCreatedAt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteOlderThan")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64) error); ok {
 		r0 = rf(minCreatedAt)
@@ -57,6 +69,10 @@ func (_m *DesktopTokensStore) DeleteOlderThan(minCreatedAt int64) error {
 func (_m *DesktopTokensStore) GetUserId(token string, minCreatedAt int64) (*string, error) {
 	ret := _m.Called(token, minCreatedAt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUserId")
+	}
+
 	var r0 *string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int64) (*string, error)); ok {
@@ -83,6 +99,10 @@ func (_m *DesktopTokensStore) GetUserId(token string, minCreatedAt int64) (*stri
 func (_m *DesktopTokensStore) Insert(token string, createAt int64, userId string) error {
 	ret := _m.Called(token, createAt, userId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Insert")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, int64, string) error); ok {
 		r0 = rf(token, createAt, userId)
@@ -93,13 +113,12 @@ func (_m *DesktopTokensStore) Insert(token string, createAt int64, userId string
 	return r0
 }
 
-type mockConstructorTestingTNewDesktopTokensStore interface {
+// NewDesktopTokensStore creates a new instance of DesktopTokensStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewDesktopTokensStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewDesktopTokensStore creates a new instance of DesktopTokensStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewDesktopTokensStore(t mockConstructorTestingTNewDesktopTokensStore) *DesktopTokensStore {
+}) *DesktopTokensStore {
 	mock := &DesktopTokensStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/DraftStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type DraftStore struct {
 func (_m *DraftStore) Delete(userID string, channelID string, rootID string) error {
 	ret := _m.Called(userID, channelID, rootID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string) error); ok {
 		r0 = rf(userID, channelID, rootID)
@@ -32,6 +36,10 @@ func (_m *DraftStore) Delete(userID string, channelID string, rootID string) err
 func (_m *DraftStore) DeleteDraftsAssociatedWithPost(channelID string, rootID string) error {
 	ret := _m.Called(channelID, rootID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteDraftsAssociatedWithPost")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 		r0 = rf(channelID, rootID)
@@ -46,6 +54,10 @@ func (_m *DraftStore) DeleteDraftsAssociatedWithPost(channelID string, rootID st
 func (_m *DraftStore) DeleteEmptyDraftsByCreateAtAndUserId(createAt int64, userId string) error {
 	ret := _m.Called(createAt, userId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteEmptyDraftsByCreateAtAndUserId")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, string) error); ok {
 		r0 = rf(createAt, userId)
@@ -60,6 +72,10 @@ func (_m *DraftStore) DeleteEmptyDraftsByCreateAtAndUserId(createAt int64, userI
 func (_m *DraftStore) DeleteOrphanDraftsByCreateAtAndUserId(createAt int64, userId string) error {
 	ret := _m.Called(createAt, userId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteOrphanDraftsByCreateAtAndUserId")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, string) error); ok {
 		r0 = rf(createAt, userId)
@@ -74,6 +90,10 @@ func (_m *DraftStore) DeleteOrphanDraftsByCreateAtAndUserId(createAt int64, user
 func (_m *DraftStore) Get(userID string, channelID string, rootID string, includeDeleted bool) (*model.Draft, error) {
 	ret := _m.Called(userID, channelID, rootID, includeDeleted)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.Draft
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, string, bool) (*model.Draft, error)); ok {
@@ -100,6 +120,10 @@ func (_m *DraftStore) Get(userID string, channelID string, rootID string, includ
 func (_m *DraftStore) GetDraftsForUser(userID string, teamID string) ([]*model.Draft, error) {
 	ret := _m.Called(userID, teamID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetDraftsForUser")
+	}
+
 	var r0 []*model.Draft
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]*model.Draft, error)); ok {
@@ -126,6 +150,10 @@ func (_m *DraftStore) GetDraftsForUser(userID string, teamID string) ([]*model.D
 func (_m *DraftStore) GetLastCreateAtAndUserIdValuesForEmptyDraftsMigration(createAt int64, userId string) (int64, string, error) {
 	ret := _m.Called(createAt, userId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetLastCreateAtAndUserIdValuesForEmptyDraftsMigration")
+	}
+
 	var r0 int64
 	var r1 string
 	var r2 error
@@ -157,6 +185,10 @@ func (_m *DraftStore) GetLastCreateAtAndUserIdValuesForEmptyDraftsMigration(crea
 func (_m *DraftStore) Upsert(d *model.Draft) (*model.Draft, error) {
 	ret := _m.Called(d)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Upsert")
+	}
+
 	var r0 *model.Draft
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Draft) (*model.Draft, error)); ok {
@@ -179,13 +211,12 @@ func (_m *DraftStore) Upsert(d *model.Draft) (*model.Draft, error) {
 	return r0, r1
 }
 
-type mockConstructorTestingTNewDraftStore interface {
+// NewDraftStore creates a new instance of DraftStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewDraftStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewDraftStore creates a new instance of DraftStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewDraftStore(t mockConstructorTestingTNewDraftStore) *DraftStore {
+}) *DraftStore {
 	mock := &DraftStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/EmojiStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -19,6 +19,10 @@ type EmojiStore struct {
 func (_m *EmojiStore) Delete(emoji *model.Emoji, timestamp int64) error {
 	ret := _m.Called(emoji, timestamp)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*model.Emoji, int64) error); ok {
 		r0 = rf(emoji, timestamp)
@@ -33,6 +37,10 @@ func (_m *EmojiStore) Delete(emoji *model.Emoji, timestamp int64) error {
 func (_m *EmojiStore) Get(c request.CTX, id string, allowFromCache bool) (*model.Emoji, error) {
 	ret := _m.Called(c, id, allowFromCache)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.Emoji
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string, bool) (*model.Emoji, error)); ok {
@@ -59,6 +67,10 @@ func (_m *EmojiStore) Get(c request.CTX, id string, allowFromCache bool) (*model
 func (_m *EmojiStore) GetByName(c request.CTX, name string, allowFromCache bool) (*model.Emoji, error) {
 	ret := _m.Called(c, name, allowFromCache)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByName")
+	}
+
 	var r0 *model.Emoji
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string, bool) (*model.Emoji, error)); ok {
@@ -85,6 +97,10 @@ func (_m *EmojiStore) GetByName(c request.CTX, name string, allowFromCache bool)
 func (_m *EmojiStore) GetList(offset int, limit int, sort string) ([]*model.Emoji, error) {
 	ret := _m.Called(offset, limit, sort)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetList")
+	}
+
 	var r0 []*model.Emoji
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int, int, string) ([]*model.Emoji, error)); ok {
@@ -111,6 +127,10 @@ func (_m *EmojiStore) GetList(offset int, limit int, sort string) ([]*model.Emoj
 func (_m *EmojiStore) GetMultipleByName(c request.CTX, names []string) ([]*model.Emoji, error) {
 	ret := _m.Called(c, names)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMultipleByName")
+	}
+
 	var r0 []*model.Emoji
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, []string) ([]*model.Emoji, error)); ok {
@@ -137,6 +157,10 @@ func (_m *EmojiStore) GetMultipleByName(c request.CTX, names []string) ([]*model
 func (_m *EmojiStore) Save(emoji *model.Emoji) (*model.Emoji, error) {
 	ret := _m.Called(emoji)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.Emoji
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Emoji) (*model.Emoji, error)); ok {
@@ -163,6 +187,10 @@ func (_m *EmojiStore) Save(emoji *model.Emoji) (*model.Emoji, error) {
 func (_m *EmojiStore) Search(name string, prefixOnly bool, limit int) ([]*model.Emoji, error) {
 	ret := _m.Called(name, prefixOnly, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Search")
+	}
+
 	var r0 []*model.Emoji
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, bool, int) ([]*model.Emoji, error)); ok {
@@ -185,13 +213,12 @@ func (_m *EmojiStore) Search(name string, prefixOnly bool, limit int) ([]*model.
 	return r0, r1
 }
 
-type mockConstructorTestingTNewEmojiStore interface {
+// NewEmojiStore creates a new instance of EmojiStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewEmojiStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewEmojiStore creates a new instance of EmojiStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewEmojiStore(t mockConstructorTestingTNewEmojiStore) *EmojiStore {
+}) *EmojiStore {
 	mock := &EmojiStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/FileInfoStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -19,6 +19,10 @@ type FileInfoStore struct {
 func (_m *FileInfoStore) AttachToPost(c request.CTX, fileID string, postID string, channelID string, creatorID string) error {
 	ret := _m.Called(c, fileID, postID, channelID, creatorID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AttachToPost")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string, string, string, string) error); ok {
 		r0 = rf(c, fileID, postID, channelID, creatorID)
@@ -38,6 +42,10 @@ func (_m *FileInfoStore) ClearCaches() {
 func (_m *FileInfoStore) CountAll() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountAll")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -62,6 +70,10 @@ func (_m *FileInfoStore) CountAll() (int64, error) {
 func (_m *FileInfoStore) DeleteForPost(c request.CTX, postID string) (string, error) {
 	ret := _m.Called(c, postID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteForPost")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string) (string, error)); ok {
@@ -86,6 +98,10 @@ func (_m *FileInfoStore) DeleteForPost(c request.CTX, postID string) (string, er
 func (_m *FileInfoStore) Get(id string) (*model.FileInfo, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.FileInfo
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.FileInfo, error)); ok {
@@ -112,6 +128,10 @@ func (_m *FileInfoStore) Get(id string) (*model.FileInfo, error) {
 func (_m *FileInfoStore) GetByIds(ids []string) ([]*model.FileInfo, error) {
 	ret := _m.Called(ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByIds")
+	}
+
 	var r0 []*model.FileInfo
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]string) ([]*model.FileInfo, error)); ok {
@@ -138,6 +158,10 @@ func (_m *FileInfoStore) GetByIds(ids []string) ([]*model.FileInfo, error) {
 func (_m *FileInfoStore) GetByPath(path string) (*model.FileInfo, error) {
 	ret := _m.Called(path)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByPath")
+	}
+
 	var r0 *model.FileInfo
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.FileInfo, error)); ok {
@@ -164,6 +188,10 @@ func (_m *FileInfoStore) GetByPath(path string) (*model.FileInfo, error) {
 func (_m *FileInfoStore) GetFilesBatchForIndexing(startTime int64, startFileID string, includeDeleted bool, limit int) ([]*model.FileForIndexing, error) {
 	ret := _m.Called(startTime, startFileID, includeDeleted, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFilesBatchForIndexing")
+	}
+
 	var r0 []*model.FileForIndexing
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, string, bool, int) ([]*model.FileForIndexing, error)); ok {
@@ -190,6 +218,10 @@ func (_m *FileInfoStore) GetFilesBatchForIndexing(startTime int64, startFileID s
 func (_m *FileInfoStore) GetForPost(postID string, readFromMaster bool, includeDeleted bool, allowFromCache bool) ([]*model.FileInfo, error) {
 	ret := _m.Called(postID, readFromMaster, includeDeleted, allowFromCache)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetForPost")
+	}
+
 	var r0 []*model.FileInfo
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, bool, bool, bool) ([]*model.FileInfo, error)); ok {
@@ -216,6 +248,10 @@ func (_m *FileInfoStore) GetForPost(postID string, readFromMaster bool, includeD
 func (_m *FileInfoStore) GetForUser(userID string) ([]*model.FileInfo, error) {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetForUser")
+	}
+
 	var r0 []*model.FileInfo
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.FileInfo, error)); ok {
@@ -242,6 +278,10 @@ func (_m *FileInfoStore) GetForUser(userID string) ([]*model.FileInfo, error) {
 func (_m *FileInfoStore) GetFromMaster(id string) (*model.FileInfo, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFromMaster")
+	}
+
 	var r0 *model.FileInfo
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.FileInfo, error)); ok {
@@ -268,6 +308,10 @@ func (_m *FileInfoStore) GetFromMaster(id string) (*model.FileInfo, error) {
 func (_m *FileInfoStore) GetStorageUsage(allowFromCache bool, includeDeleted bool) (int64, error) {
 	ret := _m.Called(allowFromCache, includeDeleted)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetStorageUsage")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(bool, bool) (int64, error)); ok {
@@ -292,6 +336,10 @@ func (_m *FileInfoStore) GetStorageUsage(allowFromCache bool, includeDeleted boo
 func (_m *FileInfoStore) GetUptoNSizeFileTime(n int64) (int64, error) {
 	ret := _m.Called(n)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUptoNSizeFileTime")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (int64, error)); ok {
@@ -316,6 +364,10 @@ func (_m *FileInfoStore) GetUptoNSizeFileTime(n int64) (int64, error) {
 func (_m *FileInfoStore) GetWithOptions(page int, perPage int, opt *model.GetFileInfosOptions) ([]*model.FileInfo, error) {
 	ret := _m.Called(page, perPage, opt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetWithOptions")
+	}
+
 	var r0 []*model.FileInfo
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int, int, *model.GetFileInfosOptions) ([]*model.FileInfo, error)); ok {
@@ -347,6 +399,10 @@ func (_m *FileInfoStore) InvalidateFileInfosForPostCache(postID string, deleted
 func (_m *FileInfoStore) PermanentDelete(c request.CTX, fileID string) error {
 	ret := _m.Called(c, fileID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDelete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string) error); ok {
 		r0 = rf(c, fileID)
@@ -361,6 +417,10 @@ func (_m *FileInfoStore) PermanentDelete(c request.CTX, fileID string) error {
 func (_m *FileInfoStore) PermanentDeleteBatch(ctx request.CTX, endTime int64, limit int64) (int64, error) {
 	ret := _m.Called(ctx, endTime, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteBatch")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, int64, int64) (int64, error)); ok {
@@ -385,6 +445,10 @@ func (_m *FileInfoStore) PermanentDeleteBatch(ctx request.CTX, endTime int64, li
 func (_m *FileInfoStore) PermanentDeleteByUser(ctx request.CTX, userID string) (int64, error) {
 	ret := _m.Called(ctx, userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteByUser")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string) (int64, error)); ok {
@@ -409,6 +473,10 @@ func (_m *FileInfoStore) PermanentDeleteByUser(ctx request.CTX, userID string) (
 func (_m *FileInfoStore) Save(ctx request.CTX, info *model.FileInfo) (*model.FileInfo, error) {
 	ret := _m.Called(ctx, info)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.FileInfo
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, *model.FileInfo) (*model.FileInfo, error)); ok {
@@ -435,6 +503,10 @@ func (_m *FileInfoStore) Save(ctx request.CTX, info *model.FileInfo) (*model.Fil
 func (_m *FileInfoStore) Search(ctx request.CTX, paramsList []*model.SearchParams, userID string, teamID string, page int, perPage int) (*model.FileInfoList, error) {
 	ret := _m.Called(ctx, paramsList, userID, teamID, page, perPage)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Search")
+	}
+
 	var r0 *model.FileInfoList
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, []*model.SearchParams, string, string, int, int) (*model.FileInfoList, error)); ok {
@@ -461,6 +533,10 @@ func (_m *FileInfoStore) Search(ctx request.CTX, paramsList []*model.SearchParam
 func (_m *FileInfoStore) SetContent(ctx request.CTX, fileID string, content string) error {
 	ret := _m.Called(ctx, fileID, content)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetContent")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string, string) error); ok {
 		r0 = rf(ctx, fileID, content)
@@ -475,6 +551,10 @@ func (_m *FileInfoStore) SetContent(ctx request.CTX, fileID string, content stri
 func (_m *FileInfoStore) Upsert(rctx request.CTX, info *model.FileInfo) (*model.FileInfo, error) {
 	ret := _m.Called(rctx, info)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Upsert")
+	}
+
 	var r0 *model.FileInfo
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, *model.FileInfo) (*model.FileInfo, error)); ok {
@@ -497,13 +577,12 @@ func (_m *FileInfoStore) Upsert(rctx request.CTX, info *model.FileInfo) (*model.
 	return r0, r1
 }
 
-type mockConstructorTestingTNewFileInfoStore interface {
+// NewFileInfoStore creates a new instance of FileInfoStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewFileInfoStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewFileInfoStore creates a new instance of FileInfoStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewFileInfoStore(t mockConstructorTestingTNewFileInfoStore) *FileInfoStore {
+}) *FileInfoStore {
 	mock := &FileInfoStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/GroupStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type GroupStore struct {
 func (_m *GroupStore) AdminRoleGroupsForSyncableMember(userID string, syncableID string, syncableType model.GroupSyncableType) ([]string, error) {
 	ret := _m.Called(userID, syncableID, syncableType)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AdminRoleGroupsForSyncableMember")
+	}
+
 	var r0 []string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, model.GroupSyncableType) ([]string, error)); ok {
@@ -44,6 +48,10 @@ func (_m *GroupStore) AdminRoleGroupsForSyncableMember(userID string, syncableID
 func (_m *GroupStore) ChannelMembersMinusGroupMembers(channelID string, groupIDs []string, page int, perPage int) ([]*model.UserWithGroups, error) {
 	ret := _m.Called(channelID, groupIDs, page, perPage)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChannelMembersMinusGroupMembers")
+	}
+
 	var r0 []*model.UserWithGroups
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, []string, int, int) ([]*model.UserWithGroups, error)); ok {
@@ -70,6 +78,10 @@ func (_m *GroupStore) ChannelMembersMinusGroupMembers(channelID string, groupIDs
 func (_m *GroupStore) ChannelMembersToAdd(since int64, channelID *string, includeRemovedMembers bool) ([]*model.UserChannelIDPair, error) {
 	ret := _m.Called(since, channelID, includeRemovedMembers)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChannelMembersToAdd")
+	}
+
 	var r0 []*model.UserChannelIDPair
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, *string, bool) ([]*model.UserChannelIDPair, error)); ok {
@@ -96,6 +108,10 @@ func (_m *GroupStore) ChannelMembersToAdd(since int64, channelID *string, includ
 func (_m *GroupStore) ChannelMembersToRemove(channelID *string) ([]*model.ChannelMember, error) {
 	ret := _m.Called(channelID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChannelMembersToRemove")
+	}
+
 	var r0 []*model.ChannelMember
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*string) ([]*model.ChannelMember, error)); ok {
@@ -122,6 +138,10 @@ func (_m *GroupStore) ChannelMembersToRemove(channelID *string) ([]*model.Channe
 func (_m *GroupStore) CountChannelMembersMinusGroupMembers(channelID string, groupIDs []string) (int64, error) {
 	ret := _m.Called(channelID, groupIDs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountChannelMembersMinusGroupMembers")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, []string) (int64, error)); ok {
@@ -146,6 +166,10 @@ func (_m *GroupStore) CountChannelMembersMinusGroupMembers(channelID string, gro
 func (_m *GroupStore) CountGroupsByChannel(channelID string, opts model.GroupSearchOpts) (int64, error) {
 	ret := _m.Called(channelID, opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountGroupsByChannel")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, model.GroupSearchOpts) (int64, error)); ok {
@@ -170,6 +194,10 @@ func (_m *GroupStore) CountGroupsByChannel(channelID string, opts model.GroupSea
 func (_m *GroupStore) CountGroupsByTeam(teamID string, opts model.GroupSearchOpts) (int64, error) {
 	ret := _m.Called(teamID, opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountGroupsByTeam")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, model.GroupSearchOpts) (int64, error)); ok {
@@ -194,6 +222,10 @@ func (_m *GroupStore) CountGroupsByTeam(teamID string, opts model.GroupSearchOpt
 func (_m *GroupStore) CountTeamMembersMinusGroupMembers(teamID string, groupIDs []string) (int64, error) {
 	ret := _m.Called(teamID, groupIDs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountTeamMembersMinusGroupMembers")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, []string) (int64, error)); ok {
@@ -218,6 +250,10 @@ func (_m *GroupStore) CountTeamMembersMinusGroupMembers(teamID string, groupIDs
 func (_m *GroupStore) Create(group *model.Group) (*model.Group, error) {
 	ret := _m.Called(group)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 *model.Group
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Group) (*model.Group, error)); ok {
@@ -244,6 +280,10 @@ func (_m *GroupStore) Create(group *model.Group) (*model.Group, error) {
 func (_m *GroupStore) CreateGroupSyncable(groupSyncable *model.GroupSyncable) (*model.GroupSyncable, error) {
 	ret := _m.Called(groupSyncable)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateGroupSyncable")
+	}
+
 	var r0 *model.GroupSyncable
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.GroupSyncable) (*model.GroupSyncable, error)); ok {
@@ -270,6 +310,10 @@ func (_m *GroupStore) CreateGroupSyncable(groupSyncable *model.GroupSyncable) (*
 func (_m *GroupStore) CreateWithUserIds(group *model.GroupWithUserIds) (*model.Group, error) {
 	ret := _m.Called(group)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateWithUserIds")
+	}
+
 	var r0 *model.Group
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.GroupWithUserIds) (*model.Group, error)); ok {
@@ -296,6 +340,10 @@ func (_m *GroupStore) CreateWithUserIds(group *model.GroupWithUserIds) (*model.G
 func (_m *GroupStore) Delete(groupID string) (*model.Group, error) {
 	ret := _m.Called(groupID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 *model.Group
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.Group, error)); ok {
@@ -322,6 +370,10 @@ func (_m *GroupStore) Delete(groupID string) (*model.Group, error) {
 func (_m *GroupStore) DeleteGroupSyncable(groupID string, syncableID string, syncableType model.GroupSyncableType) (*model.GroupSyncable, error) {
 	ret := _m.Called(groupID, syncableID, syncableType)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteGroupSyncable")
+	}
+
 	var r0 *model.GroupSyncable
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, model.GroupSyncableType) (*model.GroupSyncable, error)); ok {
@@ -348,6 +400,10 @@ func (_m *GroupStore) DeleteGroupSyncable(groupID string, syncableID string, syn
 func (_m *GroupStore) DeleteMember(groupID string, userID string) (*model.GroupMember, error) {
 	ret := _m.Called(groupID, userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteMember")
+	}
+
 	var r0 *model.GroupMember
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (*model.GroupMember, error)); ok {
@@ -374,6 +430,10 @@ func (_m *GroupStore) DeleteMember(groupID string, userID string) (*model.GroupM
 func (_m *GroupStore) DeleteMembers(groupID string, userIDs []string) ([]*model.GroupMember, error) {
 	ret := _m.Called(groupID, userIDs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteMembers")
+	}
+
 	var r0 []*model.GroupMember
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, []string) ([]*model.GroupMember, error)); ok {
@@ -400,6 +460,10 @@ func (_m *GroupStore) DeleteMembers(groupID string, userIDs []string) ([]*model.
 func (_m *GroupStore) DistinctGroupMemberCount() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DistinctGroupMemberCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -424,6 +488,10 @@ func (_m *GroupStore) DistinctGroupMemberCount() (int64, error) {
 func (_m *GroupStore) DistinctGroupMemberCountForSource(source model.GroupSource) (int64, error) {
 	ret := _m.Called(source)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DistinctGroupMemberCountForSource")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(model.GroupSource) (int64, error)); ok {
@@ -448,6 +516,10 @@ func (_m *GroupStore) DistinctGroupMemberCountForSource(source model.GroupSource
 func (_m *GroupStore) Get(groupID string) (*model.Group, error) {
 	ret := _m.Called(groupID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.Group
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.Group, error)); ok {
@@ -474,6 +546,10 @@ func (_m *GroupStore) Get(groupID string) (*model.Group, error) {
 func (_m *GroupStore) GetAllBySource(groupSource model.GroupSource) ([]*model.Group, error) {
 	ret := _m.Called(groupSource)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllBySource")
+	}
+
 	var r0 []*model.Group
 	var r1 error
 	if rf, ok := ret.Get(0).(func(model.GroupSource) ([]*model.Group, error)); ok {
@@ -500,6 +576,10 @@ func (_m *GroupStore) GetAllBySource(groupSource model.GroupSource) ([]*model.Gr
 func (_m *GroupStore) GetAllGroupSyncablesByGroupId(groupID string, syncableType model.GroupSyncableType) ([]*model.GroupSyncable, error) {
 	ret := _m.Called(groupID, syncableType)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllGroupSyncablesByGroupId")
+	}
+
 	var r0 []*model.GroupSyncable
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, model.GroupSyncableType) ([]*model.GroupSyncable, error)); ok {
@@ -526,6 +606,10 @@ func (_m *GroupStore) GetAllGroupSyncablesByGroupId(groupID string, syncableType
 func (_m *GroupStore) GetByIDs(groupIDs []string) ([]*model.Group, error) {
 	ret := _m.Called(groupIDs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByIDs")
+	}
+
 	var r0 []*model.Group
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]string) ([]*model.Group, error)); ok {
@@ -552,6 +636,10 @@ func (_m *GroupStore) GetByIDs(groupIDs []string) ([]*model.Group, error) {
 func (_m *GroupStore) GetByName(name string, opts model.GroupSearchOpts) (*model.Group, error) {
 	ret := _m.Called(name, opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByName")
+	}
+
 	var r0 *model.Group
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, model.GroupSearchOpts) (*model.Group, error)); ok {
@@ -578,6 +666,10 @@ func (_m *GroupStore) GetByName(name string, opts model.GroupSearchOpts) (*model
 func (_m *GroupStore) GetByRemoteID(remoteID string, groupSource model.GroupSource) (*model.Group, error) {
 	ret := _m.Called(remoteID, groupSource)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByRemoteID")
+	}
+
 	var r0 *model.Group
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, model.GroupSource) (*model.Group, error)); ok {
@@ -604,6 +696,10 @@ func (_m *GroupStore) GetByRemoteID(remoteID string, groupSource model.GroupSour
 func (_m *GroupStore) GetByUser(userID string) ([]*model.Group, error) {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByUser")
+	}
+
 	var r0 []*model.Group
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.Group, error)); ok {
@@ -630,6 +726,10 @@ func (_m *GroupStore) GetByUser(userID string) ([]*model.Group, error) {
 func (_m *GroupStore) GetGroupSyncable(groupID string, syncableID string, syncableType model.GroupSyncableType) (*model.GroupSyncable, error) {
 	ret := _m.Called(groupID, syncableID, syncableType)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetGroupSyncable")
+	}
+
 	var r0 *model.GroupSyncable
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, model.GroupSyncableType) (*model.GroupSyncable, error)); ok {
@@ -656,6 +756,10 @@ func (_m *GroupStore) GetGroupSyncable(groupID string, syncableID string, syncab
 func (_m *GroupStore) GetGroups(page int, perPage int, opts model.GroupSearchOpts, viewRestrictions *model.ViewUsersRestrictions) ([]*model.Group, error) {
 	ret := _m.Called(page, perPage, opts, viewRestrictions)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetGroups")
+	}
+
 	var r0 []*model.Group
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int, int, model.GroupSearchOpts, *model.ViewUsersRestrictions) ([]*model.Group, error)); ok {
@@ -682,6 +786,10 @@ func (_m *GroupStore) GetGroups(page int, perPage int, opts model.GroupSearchOpt
 func (_m *GroupStore) GetGroupsAssociatedToChannelsByTeam(teamID string, opts model.GroupSearchOpts) (map[string][]*model.GroupWithSchemeAdmin, error) {
 	ret := _m.Called(teamID, opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetGroupsAssociatedToChannelsByTeam")
+	}
+
 	var r0 map[string][]*model.GroupWithSchemeAdmin
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, model.GroupSearchOpts) (map[string][]*model.GroupWithSchemeAdmin, error)); ok {
@@ -708,6 +816,10 @@ func (_m *GroupStore) GetGroupsAssociatedToChannelsByTeam(teamID string, opts mo
 func (_m *GroupStore) GetGroupsByChannel(channelID string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) {
 	ret := _m.Called(channelID, opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetGroupsByChannel")
+	}
+
 	var r0 []*model.GroupWithSchemeAdmin
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error)); ok {
@@ -734,6 +846,10 @@ func (_m *GroupStore) GetGroupsByChannel(channelID string, opts model.GroupSearc
 func (_m *GroupStore) GetGroupsByTeam(teamID string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) {
 	ret := _m.Called(teamID, opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetGroupsByTeam")
+	}
+
 	var r0 []*model.GroupWithSchemeAdmin
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error)); ok {
@@ -760,6 +876,10 @@ func (_m *GroupStore) GetGroupsByTeam(teamID string, opts model.GroupSearchOpts)
 func (_m *GroupStore) GetMember(groupID string, userID string) (*model.GroupMember, error) {
 	ret := _m.Called(groupID, userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMember")
+	}
+
 	var r0 *model.GroupMember
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (*model.GroupMember, error)); ok {
@@ -786,6 +906,10 @@ func (_m *GroupStore) GetMember(groupID string, userID string) (*model.GroupMemb
 func (_m *GroupStore) GetMemberCount(groupID string) (int64, error) {
 	ret := _m.Called(groupID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMemberCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (int64, error)); ok {
@@ -810,6 +934,10 @@ func (_m *GroupStore) GetMemberCount(groupID string) (int64, error) {
 func (_m *GroupStore) GetMemberCountWithRestrictions(groupID string, viewRestrictions *model.ViewUsersRestrictions) (int64, error) {
 	ret := _m.Called(groupID, viewRestrictions)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMemberCountWithRestrictions")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, *model.ViewUsersRestrictions) (int64, error)); ok {
@@ -834,6 +962,10 @@ func (_m *GroupStore) GetMemberCountWithRestrictions(groupID string, viewRestric
 func (_m *GroupStore) GetMemberUsers(groupID string) ([]*model.User, error) {
 	ret := _m.Called(groupID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMemberUsers")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.User, error)); ok {
@@ -860,6 +992,10 @@ func (_m *GroupStore) GetMemberUsers(groupID string) ([]*model.User, error) {
 func (_m *GroupStore) GetMemberUsersInTeam(groupID string, teamID string) ([]*model.User, error) {
 	ret := _m.Called(groupID, teamID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMemberUsersInTeam")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]*model.User, error)); ok {
@@ -886,6 +1022,10 @@ func (_m *GroupStore) GetMemberUsersInTeam(groupID string, teamID string) ([]*mo
 func (_m *GroupStore) GetMemberUsersNotInChannel(groupID string, channelID string) ([]*model.User, error) {
 	ret := _m.Called(groupID, channelID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMemberUsersNotInChannel")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]*model.User, error)); ok {
@@ -912,6 +1052,10 @@ func (_m *GroupStore) GetMemberUsersNotInChannel(groupID string, channelID strin
 func (_m *GroupStore) GetMemberUsersPage(groupID string, page int, perPage int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) {
 	ret := _m.Called(groupID, page, perPage, viewRestrictions)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMemberUsersPage")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int, *model.ViewUsersRestrictions) ([]*model.User, error)); ok {
@@ -938,6 +1082,10 @@ func (_m *GroupStore) GetMemberUsersPage(groupID string, page int, perPage int,
 func (_m *GroupStore) GetMemberUsersSortedPage(groupID string, page int, perPage int, viewRestrictions *model.ViewUsersRestrictions, teammateNameDisplay string) ([]*model.User, error) {
 	ret := _m.Called(groupID, page, perPage, viewRestrictions, teammateNameDisplay)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMemberUsersSortedPage")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int, *model.ViewUsersRestrictions, string) ([]*model.User, error)); ok {
@@ -964,6 +1112,10 @@ func (_m *GroupStore) GetMemberUsersSortedPage(groupID string, page int, perPage
 func (_m *GroupStore) GetNonMemberUsersPage(groupID string, page int, perPage int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) {
 	ret := _m.Called(groupID, page, perPage, viewRestrictions)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetNonMemberUsersPage")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int, *model.ViewUsersRestrictions) ([]*model.User, error)); ok {
@@ -990,6 +1142,10 @@ func (_m *GroupStore) GetNonMemberUsersPage(groupID string, page int, perPage in
 func (_m *GroupStore) GroupChannelCount() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GroupChannelCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -1014,6 +1170,10 @@ func (_m *GroupStore) GroupChannelCount() (int64, error) {
 func (_m *GroupStore) GroupCount() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GroupCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -1038,6 +1198,10 @@ func (_m *GroupStore) GroupCount() (int64, error) {
 func (_m *GroupStore) GroupCountBySource(source model.GroupSource) (int64, error) {
 	ret := _m.Called(source)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GroupCountBySource")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(model.GroupSource) (int64, error)); ok {
@@ -1062,6 +1226,10 @@ func (_m *GroupStore) GroupCountBySource(source model.GroupSource) (int64, error
 func (_m *GroupStore) GroupCountWithAllowReference() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GroupCountWithAllowReference")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -1086,6 +1254,10 @@ func (_m *GroupStore) GroupCountWithAllowReference() (int64, error) {
 func (_m *GroupStore) GroupMemberCount() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GroupMemberCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -1110,6 +1282,10 @@ func (_m *GroupStore) GroupMemberCount() (int64, error) {
 func (_m *GroupStore) GroupTeamCount() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GroupTeamCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -1134,6 +1310,10 @@ func (_m *GroupStore) GroupTeamCount() (int64, error) {
 func (_m *GroupStore) PermanentDeleteMembersByUser(userID string) error {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteMembersByUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(userID)
@@ -1148,6 +1328,10 @@ func (_m *GroupStore) PermanentDeleteMembersByUser(userID string) error {
 func (_m *GroupStore) PermittedSyncableAdmins(syncableID string, syncableType model.GroupSyncableType) ([]string, error) {
 	ret := _m.Called(syncableID, syncableType)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermittedSyncableAdmins")
+	}
+
 	var r0 []string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, model.GroupSyncableType) ([]string, error)); ok {
@@ -1174,6 +1358,10 @@ func (_m *GroupStore) PermittedSyncableAdmins(syncableID string, syncableType mo
 func (_m *GroupStore) Restore(groupID string) (*model.Group, error) {
 	ret := _m.Called(groupID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Restore")
+	}
+
 	var r0 *model.Group
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.Group, error)); ok {
@@ -1200,6 +1388,10 @@ func (_m *GroupStore) Restore(groupID string) (*model.Group, error) {
 func (_m *GroupStore) TeamMembersMinusGroupMembers(teamID string, groupIDs []string, page int, perPage int) ([]*model.UserWithGroups, error) {
 	ret := _m.Called(teamID, groupIDs, page, perPage)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TeamMembersMinusGroupMembers")
+	}
+
 	var r0 []*model.UserWithGroups
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, []string, int, int) ([]*model.UserWithGroups, error)); ok {
@@ -1226,6 +1418,10 @@ func (_m *GroupStore) TeamMembersMinusGroupMembers(teamID string, groupIDs []str
 func (_m *GroupStore) TeamMembersToAdd(since int64, teamID *string, includeRemovedMembers bool) ([]*model.UserTeamIDPair, error) {
 	ret := _m.Called(since, teamID, includeRemovedMembers)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TeamMembersToAdd")
+	}
+
 	var r0 []*model.UserTeamIDPair
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, *string, bool) ([]*model.UserTeamIDPair, error)); ok {
@@ -1252,6 +1448,10 @@ func (_m *GroupStore) TeamMembersToAdd(since int64, teamID *string, includeRemov
 func (_m *GroupStore) TeamMembersToRemove(teamID *string) ([]*model.TeamMember, error) {
 	ret := _m.Called(teamID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TeamMembersToRemove")
+	}
+
 	var r0 []*model.TeamMember
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*string) ([]*model.TeamMember, error)); ok {
@@ -1278,6 +1478,10 @@ func (_m *GroupStore) TeamMembersToRemove(teamID *string) ([]*model.TeamMember,
 func (_m *GroupStore) Update(group *model.Group) (*model.Group, error) {
 	ret := _m.Called(group)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
 	var r0 *model.Group
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Group) (*model.Group, error)); ok {
@@ -1304,6 +1508,10 @@ func (_m *GroupStore) Update(group *model.Group) (*model.Group, error) {
 func (_m *GroupStore) UpdateGroupSyncable(groupSyncable *model.GroupSyncable) (*model.GroupSyncable, error) {
 	ret := _m.Called(groupSyncable)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateGroupSyncable")
+	}
+
 	var r0 *model.GroupSyncable
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.GroupSyncable) (*model.GroupSyncable, error)); ok {
@@ -1330,6 +1538,10 @@ func (_m *GroupStore) UpdateGroupSyncable(groupSyncable *model.GroupSyncable) (*
 func (_m *GroupStore) UpsertMember(groupID string, userID string) (*model.GroupMember, error) {
 	ret := _m.Called(groupID, userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpsertMember")
+	}
+
 	var r0 *model.GroupMember
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (*model.GroupMember, error)); ok {
@@ -1356,6 +1568,10 @@ func (_m *GroupStore) UpsertMember(groupID string, userID string) (*model.GroupM
 func (_m *GroupStore) UpsertMembers(groupID string, userIDs []string) ([]*model.GroupMember, error) {
 	ret := _m.Called(groupID, userIDs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpsertMembers")
+	}
+
 	var r0 []*model.GroupMember
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, []string) ([]*model.GroupMember, error)); ok {
@@ -1378,13 +1594,12 @@ func (_m *GroupStore) UpsertMembers(groupID string, userIDs []string) ([]*model.
 	return r0, r1
 }
 
-type mockConstructorTestingTNewGroupStore interface {
+// NewGroupStore creates a new instance of GroupStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewGroupStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewGroupStore creates a new instance of GroupStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewGroupStore(t mockConstructorTestingTNewGroupStore) *GroupStore {
+}) *GroupStore {
 	mock := &GroupStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/JobStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -19,6 +19,10 @@ type JobStore struct {
 func (_m *JobStore) Cleanup(expiryTime int64, batchSize int) error {
 	ret := _m.Called(expiryTime, batchSize)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Cleanup")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, int) error); ok {
 		r0 = rf(expiryTime, batchSize)
@@ -33,6 +37,10 @@ func (_m *JobStore) Cleanup(expiryTime int64, batchSize int) error {
 func (_m *JobStore) Delete(id string) (string, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (string, error)); ok {
@@ -57,6 +65,10 @@ func (_m *JobStore) Delete(id string) (string, error) {
 func (_m *JobStore) Get(c request.CTX, id string) (*model.Job, error) {
 	ret := _m.Called(c, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string) (*model.Job, error)); ok {
@@ -83,6 +95,10 @@ func (_m *JobStore) Get(c request.CTX, id string) (*model.Job, error) {
 func (_m *JobStore) GetAllByStatus(c request.CTX, status string) ([]*model.Job, error) {
 	ret := _m.Called(c, status)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllByStatus")
+	}
+
 	var r0 []*model.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string) ([]*model.Job, error)); ok {
@@ -109,6 +125,10 @@ func (_m *JobStore) GetAllByStatus(c request.CTX, status string) ([]*model.Job,
 func (_m *JobStore) GetAllByType(c request.CTX, jobType string) ([]*model.Job, error) {
 	ret := _m.Called(c, jobType)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllByType")
+	}
+
 	var r0 []*model.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string) ([]*model.Job, error)); ok {
@@ -135,6 +155,10 @@ func (_m *JobStore) GetAllByType(c request.CTX, jobType string) ([]*model.Job, e
 func (_m *JobStore) GetAllByTypeAndStatus(c request.CTX, jobType string, status string) ([]*model.Job, error) {
 	ret := _m.Called(c, jobType, status)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllByTypeAndStatus")
+	}
+
 	var r0 []*model.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string, string) ([]*model.Job, error)); ok {
@@ -161,6 +185,10 @@ func (_m *JobStore) GetAllByTypeAndStatus(c request.CTX, jobType string, status
 func (_m *JobStore) GetAllByTypePage(c request.CTX, jobType string, offset int, limit int) ([]*model.Job, error) {
 	ret := _m.Called(c, jobType, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllByTypePage")
+	}
+
 	var r0 []*model.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string, int, int) ([]*model.Job, error)); ok {
@@ -187,6 +215,10 @@ func (_m *JobStore) GetAllByTypePage(c request.CTX, jobType string, offset int,
 func (_m *JobStore) GetAllByTypesPage(c request.CTX, jobTypes []string, offset int, limit int) ([]*model.Job, error) {
 	ret := _m.Called(c, jobTypes, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllByTypesPage")
+	}
+
 	var r0 []*model.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, []string, int, int) ([]*model.Job, error)); ok {
@@ -213,6 +245,10 @@ func (_m *JobStore) GetAllByTypesPage(c request.CTX, jobTypes []string, offset i
 func (_m *JobStore) GetCountByStatusAndType(status string, jobType string) (int64, error) {
 	ret := _m.Called(status, jobType)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetCountByStatusAndType")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (int64, error)); ok {
@@ -237,6 +273,10 @@ func (_m *JobStore) GetCountByStatusAndType(status string, jobType string) (int6
 func (_m *JobStore) GetNewestJobByStatusAndType(status string, jobType string) (*model.Job, error) {
 	ret := _m.Called(status, jobType)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetNewestJobByStatusAndType")
+	}
+
 	var r0 *model.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (*model.Job, error)); ok {
@@ -263,6 +303,10 @@ func (_m *JobStore) GetNewestJobByStatusAndType(status string, jobType string) (
 func (_m *JobStore) GetNewestJobByStatusesAndType(statuses []string, jobType string) (*model.Job, error) {
 	ret := _m.Called(statuses, jobType)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetNewestJobByStatusesAndType")
+	}
+
 	var r0 *model.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]string, string) (*model.Job, error)); ok {
@@ -289,6 +333,10 @@ func (_m *JobStore) GetNewestJobByStatusesAndType(statuses []string, jobType str
 func (_m *JobStore) Save(job *model.Job) (*model.Job, error) {
 	ret := _m.Called(job)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Job) (*model.Job, error)); ok {
@@ -315,6 +363,10 @@ func (_m *JobStore) Save(job *model.Job) (*model.Job, error) {
 func (_m *JobStore) SaveOnce(job *model.Job) (*model.Job, error) {
 	ret := _m.Called(job)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveOnce")
+	}
+
 	var r0 *model.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Job) (*model.Job, error)); ok {
@@ -341,6 +393,10 @@ func (_m *JobStore) SaveOnce(job *model.Job) (*model.Job, error) {
 func (_m *JobStore) UpdateOptimistically(job *model.Job, currentStatus string) (bool, error) {
 	ret := _m.Called(job, currentStatus)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateOptimistically")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Job, string) (bool, error)); ok {
@@ -365,6 +421,10 @@ func (_m *JobStore) UpdateOptimistically(job *model.Job, currentStatus string) (
 func (_m *JobStore) UpdateStatus(id string, status string) (*model.Job, error) {
 	ret := _m.Called(id, status)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateStatus")
+	}
+
 	var r0 *model.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (*model.Job, error)); ok {
@@ -391,6 +451,10 @@ func (_m *JobStore) UpdateStatus(id string, status string) (*model.Job, error) {
 func (_m *JobStore) UpdateStatusOptimistically(id string, currentStatus string, newStatus string) (bool, error) {
 	ret := _m.Called(id, currentStatus, newStatus)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateStatusOptimistically")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, string) (bool, error)); ok {
@@ -411,13 +475,12 @@ func (_m *JobStore) UpdateStatusOptimistically(id string, currentStatus string,
 	return r0, r1
 }
 
-type mockConstructorTestingTNewJobStore interface {
+// NewJobStore creates a new instance of JobStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewJobStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewJobStore creates a new instance of JobStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewJobStore(t mockConstructorTestingTNewJobStore) *JobStore {
+}) *JobStore {
 	mock := &JobStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/LicenseStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -19,6 +19,10 @@ type LicenseStore struct {
 func (_m *LicenseStore) Get(c request.CTX, id string) (*model.LicenseRecord, error) {
 	ret := _m.Called(c, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.LicenseRecord
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string) (*model.LicenseRecord, error)); ok {
@@ -45,6 +49,10 @@ func (_m *LicenseStore) Get(c request.CTX, id string) (*model.LicenseRecord, err
 func (_m *LicenseStore) GetAll() ([]*model.LicenseRecord, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []*model.LicenseRecord
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]*model.LicenseRecord, error)); ok {
@@ -71,6 +79,10 @@ func (_m *LicenseStore) GetAll() ([]*model.LicenseRecord, error) {
 func (_m *LicenseStore) Save(license *model.LicenseRecord) error {
 	ret := _m.Called(license)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*model.LicenseRecord) error); ok {
 		r0 = rf(license)
@@ -81,13 +93,12 @@ func (_m *LicenseStore) Save(license *model.LicenseRecord) error {
 	return r0
 }
 
-type mockConstructorTestingTNewLicenseStore interface {
+// NewLicenseStore creates a new instance of LicenseStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewLicenseStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewLicenseStore creates a new instance of LicenseStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewLicenseStore(t mockConstructorTestingTNewLicenseStore) *LicenseStore {
+}) *LicenseStore {
 	mock := &LicenseStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/LinkMetadataStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type LinkMetadataStore struct {
 func (_m *LinkMetadataStore) Get(url string, timestamp int64) (*model.LinkMetadata, error) {
 	ret := _m.Called(url, timestamp)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.LinkMetadata
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int64) (*model.LinkMetadata, error)); ok {
@@ -44,6 +48,10 @@ func (_m *LinkMetadataStore) Get(url string, timestamp int64) (*model.LinkMetada
 func (_m *LinkMetadataStore) Save(linkMetadata *model.LinkMetadata) (*model.LinkMetadata, error) {
 	ret := _m.Called(linkMetadata)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.LinkMetadata
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.LinkMetadata) (*model.LinkMetadata, error)); ok {
@@ -66,13 +74,12 @@ func (_m *LinkMetadataStore) Save(linkMetadata *model.LinkMetadata) (*model.Link
 	return r0, r1
 }
 
-type mockConstructorTestingTNewLinkMetadataStore interface {
+// NewLinkMetadataStore creates a new instance of LinkMetadataStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewLinkMetadataStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewLinkMetadataStore creates a new instance of LinkMetadataStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewLinkMetadataStore(t mockConstructorTestingTNewLinkMetadataStore) *LinkMetadataStore {
+}) *LinkMetadataStore {
 	mock := &LinkMetadataStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/NotifyAdminStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type NotifyAdminStore struct {
 func (_m *NotifyAdminStore) DeleteBefore(trial bool, now int64) error {
 	ret := _m.Called(trial, now)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteBefore")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(bool, int64) error); ok {
 		r0 = rf(trial, now)
@@ -32,6 +36,10 @@ func (_m *NotifyAdminStore) DeleteBefore(trial bool, now int64) error {
 func (_m *NotifyAdminStore) Get(trial bool) ([]*model.NotifyAdminData, error) {
 	ret := _m.Called(trial)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 []*model.NotifyAdminData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(bool) ([]*model.NotifyAdminData, error)); ok {
@@ -58,6 +66,10 @@ func (_m *NotifyAdminStore) Get(trial bool) ([]*model.NotifyAdminData, error) {
 func (_m *NotifyAdminStore) GetDataByUserIdAndFeature(userId string, feature model.MattermostFeature) ([]*model.NotifyAdminData, error) {
 	ret := _m.Called(userId, feature)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetDataByUserIdAndFeature")
+	}
+
 	var r0 []*model.NotifyAdminData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, model.MattermostFeature) ([]*model.NotifyAdminData, error)); ok {
@@ -84,6 +96,10 @@ func (_m *NotifyAdminStore) GetDataByUserIdAndFeature(userId string, feature mod
 func (_m *NotifyAdminStore) Save(data *model.NotifyAdminData) (*model.NotifyAdminData, error) {
 	ret := _m.Called(data)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.NotifyAdminData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.NotifyAdminData) (*model.NotifyAdminData, error)); ok {
@@ -110,6 +126,10 @@ func (_m *NotifyAdminStore) Save(data *model.NotifyAdminData) (*model.NotifyAdmi
 func (_m *NotifyAdminStore) Update(userId string, requiredPlan string, requiredFeature model.MattermostFeature, now int64) error {
 	ret := _m.Called(userId, requiredPlan, requiredFeature, now)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, model.MattermostFeature, int64) error); ok {
 		r0 = rf(userId, requiredPlan, requiredFeature, now)
@@ -120,13 +140,12 @@ func (_m *NotifyAdminStore) Update(userId string, requiredPlan string, requiredF
 	return r0
 }
 
-type mockConstructorTestingTNewNotifyAdminStore interface {
+// NewNotifyAdminStore creates a new instance of NotifyAdminStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewNotifyAdminStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewNotifyAdminStore creates a new instance of NotifyAdminStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewNotifyAdminStore(t mockConstructorTestingTNewNotifyAdminStore) *NotifyAdminStore {
+}) *NotifyAdminStore {
 	mock := &NotifyAdminStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/OAuthStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type OAuthStore struct {
 func (_m *OAuthStore) DeleteApp(id string) error {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteApp")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(id)
@@ -32,6 +36,10 @@ func (_m *OAuthStore) DeleteApp(id string) error {
 func (_m *OAuthStore) GetAccessData(token string) (*model.AccessData, error) {
 	ret := _m.Called(token)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAccessData")
+	}
+
 	var r0 *model.AccessData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.AccessData, error)); ok {
@@ -58,6 +66,10 @@ func (_m *OAuthStore) GetAccessData(token string) (*model.AccessData, error) {
 func (_m *OAuthStore) GetAccessDataByRefreshToken(token string) (*model.AccessData, error) {
 	ret := _m.Called(token)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAccessDataByRefreshToken")
+	}
+
 	var r0 *model.AccessData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.AccessData, error)); ok {
@@ -84,6 +96,10 @@ func (_m *OAuthStore) GetAccessDataByRefreshToken(token string) (*model.AccessDa
 func (_m *OAuthStore) GetAccessDataByUserForApp(userID string, clientId string) ([]*model.AccessData, error) {
 	ret := _m.Called(userID, clientId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAccessDataByUserForApp")
+	}
+
 	var r0 []*model.AccessData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]*model.AccessData, error)); ok {
@@ -110,6 +126,10 @@ func (_m *OAuthStore) GetAccessDataByUserForApp(userID string, clientId string)
 func (_m *OAuthStore) GetApp(id string) (*model.OAuthApp, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetApp")
+	}
+
 	var r0 *model.OAuthApp
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.OAuthApp, error)); ok {
@@ -136,6 +156,10 @@ func (_m *OAuthStore) GetApp(id string) (*model.OAuthApp, error) {
 func (_m *OAuthStore) GetAppByUser(userID string, offset int, limit int) ([]*model.OAuthApp, error) {
 	ret := _m.Called(userID, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAppByUser")
+	}
+
 	var r0 []*model.OAuthApp
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int) ([]*model.OAuthApp, error)); ok {
@@ -162,6 +186,10 @@ func (_m *OAuthStore) GetAppByUser(userID string, offset int, limit int) ([]*mod
 func (_m *OAuthStore) GetApps(offset int, limit int) ([]*model.OAuthApp, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetApps")
+	}
+
 	var r0 []*model.OAuthApp
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int, int) ([]*model.OAuthApp, error)); ok {
@@ -188,6 +216,10 @@ func (_m *OAuthStore) GetApps(offset int, limit int) ([]*model.OAuthApp, error)
 func (_m *OAuthStore) GetAuthData(code string) (*model.AuthData, error) {
 	ret := _m.Called(code)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAuthData")
+	}
+
 	var r0 *model.AuthData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.AuthData, error)); ok {
@@ -214,6 +246,10 @@ func (_m *OAuthStore) GetAuthData(code string) (*model.AuthData, error) {
 func (_m *OAuthStore) GetAuthorizedApps(userID string, offset int, limit int) ([]*model.OAuthApp, error) {
 	ret := _m.Called(userID, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAuthorizedApps")
+	}
+
 	var r0 []*model.OAuthApp
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int) ([]*model.OAuthApp, error)); ok {
@@ -240,6 +276,10 @@ func (_m *OAuthStore) GetAuthorizedApps(userID string, offset int, limit int) ([
 func (_m *OAuthStore) GetPreviousAccessData(userID string, clientId string) (*model.AccessData, error) {
 	ret := _m.Called(userID, clientId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPreviousAccessData")
+	}
+
 	var r0 *model.AccessData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (*model.AccessData, error)); ok {
@@ -266,6 +306,10 @@ func (_m *OAuthStore) GetPreviousAccessData(userID string, clientId string) (*mo
 func (_m *OAuthStore) PermanentDeleteAuthDataByUser(userID string) error {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteAuthDataByUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(userID)
@@ -280,6 +324,10 @@ func (_m *OAuthStore) PermanentDeleteAuthDataByUser(userID string) error {
 func (_m *OAuthStore) RemoveAccessData(token string) error {
 	ret := _m.Called(token)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveAccessData")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(token)
@@ -294,6 +342,10 @@ func (_m *OAuthStore) RemoveAccessData(token string) error {
 func (_m *OAuthStore) RemoveAllAccessData() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveAllAccessData")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -308,6 +360,10 @@ func (_m *OAuthStore) RemoveAllAccessData() error {
 func (_m *OAuthStore) RemoveAuthData(code string) error {
 	ret := _m.Called(code)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveAuthData")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(code)
@@ -322,6 +378,10 @@ func (_m *OAuthStore) RemoveAuthData(code string) error {
 func (_m *OAuthStore) RemoveAuthDataByClientId(clientId string, userId string) error {
 	ret := _m.Called(clientId, userId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveAuthDataByClientId")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 		r0 = rf(clientId, userId)
@@ -336,6 +396,10 @@ func (_m *OAuthStore) RemoveAuthDataByClientId(clientId string, userId string) e
 func (_m *OAuthStore) RemoveAuthDataByUserId(userId string) error {
 	ret := _m.Called(userId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveAuthDataByUserId")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(userId)
@@ -350,6 +414,10 @@ func (_m *OAuthStore) RemoveAuthDataByUserId(userId string) error {
 func (_m *OAuthStore) SaveAccessData(accessData *model.AccessData) (*model.AccessData, error) {
 	ret := _m.Called(accessData)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveAccessData")
+	}
+
 	var r0 *model.AccessData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.AccessData) (*model.AccessData, error)); ok {
@@ -376,6 +444,10 @@ func (_m *OAuthStore) SaveAccessData(accessData *model.AccessData) (*model.Acces
 func (_m *OAuthStore) SaveApp(app *model.OAuthApp) (*model.OAuthApp, error) {
 	ret := _m.Called(app)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveApp")
+	}
+
 	var r0 *model.OAuthApp
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.OAuthApp) (*model.OAuthApp, error)); ok {
@@ -402,6 +474,10 @@ func (_m *OAuthStore) SaveApp(app *model.OAuthApp) (*model.OAuthApp, error) {
 func (_m *OAuthStore) SaveAuthData(authData *model.AuthData) (*model.AuthData, error) {
 	ret := _m.Called(authData)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveAuthData")
+	}
+
 	var r0 *model.AuthData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.AuthData) (*model.AuthData, error)); ok {
@@ -428,6 +504,10 @@ func (_m *OAuthStore) SaveAuthData(authData *model.AuthData) (*model.AuthData, e
 func (_m *OAuthStore) UpdateAccessData(accessData *model.AccessData) (*model.AccessData, error) {
 	ret := _m.Called(accessData)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateAccessData")
+	}
+
 	var r0 *model.AccessData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.AccessData) (*model.AccessData, error)); ok {
@@ -454,6 +534,10 @@ func (_m *OAuthStore) UpdateAccessData(accessData *model.AccessData) (*model.Acc
 func (_m *OAuthStore) UpdateApp(app *model.OAuthApp) (*model.OAuthApp, error) {
 	ret := _m.Called(app)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateApp")
+	}
+
 	var r0 *model.OAuthApp
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.OAuthApp) (*model.OAuthApp, error)); ok {
@@ -476,13 +560,12 @@ func (_m *OAuthStore) UpdateApp(app *model.OAuthApp) (*model.OAuthApp, error) {
 	return r0, r1
 }
 
-type mockConstructorTestingTNewOAuthStore interface {
+// NewOAuthStore creates a new instance of OAuthStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewOAuthStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewOAuthStore creates a new instance of OAuthStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewOAuthStore(t mockConstructorTestingTNewOAuthStore) *OAuthStore {
+}) *OAuthStore {
 	mock := &OAuthStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/OutgoingOAuthConnectionStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -19,6 +19,10 @@ type OutgoingOAuthConnectionStore struct {
 func (_m *OutgoingOAuthConnectionStore) DeleteConnection(c request.CTX, id string) error {
 	ret := _m.Called(c, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteConnection")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string) error); ok {
 		r0 = rf(c, id)
@@ -33,6 +37,10 @@ func (_m *OutgoingOAuthConnectionStore) DeleteConnection(c request.CTX, id strin
 func (_m *OutgoingOAuthConnectionStore) GetConnection(c request.CTX, id string) (*model.OutgoingOAuthConnection, error) {
 	ret := _m.Called(c, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetConnection")
+	}
+
 	var r0 *model.OutgoingOAuthConnection
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string) (*model.OutgoingOAuthConnection, error)); ok {
@@ -59,6 +67,10 @@ func (_m *OutgoingOAuthConnectionStore) GetConnection(c request.CTX, id string)
 func (_m *OutgoingOAuthConnectionStore) GetConnections(c request.CTX, filters model.OutgoingOAuthConnectionGetConnectionsFilter) ([]*model.OutgoingOAuthConnection, error) {
 	ret := _m.Called(c, filters)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetConnections")
+	}
+
 	var r0 []*model.OutgoingOAuthConnection
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, model.OutgoingOAuthConnectionGetConnectionsFilter) ([]*model.OutgoingOAuthConnection, error)); ok {
@@ -85,6 +97,10 @@ func (_m *OutgoingOAuthConnectionStore) GetConnections(c request.CTX, filters mo
 func (_m *OutgoingOAuthConnectionStore) SaveConnection(c request.CTX, conn *model.OutgoingOAuthConnection) (*model.OutgoingOAuthConnection, error) {
 	ret := _m.Called(c, conn)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveConnection")
+	}
+
 	var r0 *model.OutgoingOAuthConnection
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, *model.OutgoingOAuthConnection) (*model.OutgoingOAuthConnection, error)); ok {
@@ -111,6 +127,10 @@ func (_m *OutgoingOAuthConnectionStore) SaveConnection(c request.CTX, conn *mode
 func (_m *OutgoingOAuthConnectionStore) UpdateConnection(c request.CTX, conn *model.OutgoingOAuthConnection) (*model.OutgoingOAuthConnection, error) {
 	ret := _m.Called(c, conn)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateConnection")
+	}
+
 	var r0 *model.OutgoingOAuthConnection
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, *model.OutgoingOAuthConnection) (*model.OutgoingOAuthConnection, error)); ok {
@@ -133,13 +153,12 @@ func (_m *OutgoingOAuthConnectionStore) UpdateConnection(c request.CTX, conn *mo
 	return r0, r1
 }
 
-type mockConstructorTestingTNewOutgoingOAuthConnectionStore interface {
+// NewOutgoingOAuthConnectionStore creates a new instance of OutgoingOAuthConnectionStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewOutgoingOAuthConnectionStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewOutgoingOAuthConnectionStore creates a new instance of OutgoingOAuthConnectionStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewOutgoingOAuthConnectionStore(t mockConstructorTestingTNewOutgoingOAuthConnectionStore) *OutgoingOAuthConnectionStore {
+}) *OutgoingOAuthConnectionStore {
 	mock := &OutgoingOAuthConnectionStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/PluginStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type PluginStore struct {
 func (_m *PluginStore) CompareAndDelete(keyVal *model.PluginKeyValue, oldValue []byte) (bool, error) {
 	ret := _m.Called(keyVal, oldValue)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CompareAndDelete")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.PluginKeyValue, []byte) (bool, error)); ok {
@@ -42,6 +46,10 @@ func (_m *PluginStore) CompareAndDelete(keyVal *model.PluginKeyValue, oldValue [
 func (_m *PluginStore) CompareAndSet(keyVal *model.PluginKeyValue, oldValue []byte) (bool, error) {
 	ret := _m.Called(keyVal, oldValue)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CompareAndSet")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.PluginKeyValue, []byte) (bool, error)); ok {
@@ -66,6 +74,10 @@ func (_m *PluginStore) CompareAndSet(keyVal *model.PluginKeyValue, oldValue []by
 func (_m *PluginStore) Delete(pluginID string, key string) error {
 	ret := _m.Called(pluginID, key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 		r0 = rf(pluginID, key)
@@ -80,6 +92,10 @@ func (_m *PluginStore) Delete(pluginID string, key string) error {
 func (_m *PluginStore) DeleteAllExpired() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteAllExpired")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -94,6 +110,10 @@ func (_m *PluginStore) DeleteAllExpired() error {
 func (_m *PluginStore) DeleteAllForPlugin(PluginID string) error {
 	ret := _m.Called(PluginID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteAllForPlugin")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(PluginID)
@@ -108,6 +128,10 @@ func (_m *PluginStore) DeleteAllForPlugin(PluginID string) error {
 func (_m *PluginStore) Get(pluginID string, key string) (*model.PluginKeyValue, error) {
 	ret := _m.Called(pluginID, key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.PluginKeyValue
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (*model.PluginKeyValue, error)); ok {
@@ -134,6 +158,10 @@ func (_m *PluginStore) Get(pluginID string, key string) (*model.PluginKeyValue,
 func (_m *PluginStore) List(pluginID string, page int, perPage int) ([]string, error) {
 	ret := _m.Called(pluginID, page, perPage)
 
+	if len(ret) == 0 {
+		panic("no return value specified for List")
+	}
+
 	var r0 []string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int) ([]string, error)); ok {
@@ -160,6 +188,10 @@ func (_m *PluginStore) List(pluginID string, page int, perPage int) ([]string, e
 func (_m *PluginStore) SaveOrUpdate(keyVal *model.PluginKeyValue) (*model.PluginKeyValue, error) {
 	ret := _m.Called(keyVal)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveOrUpdate")
+	}
+
 	var r0 *model.PluginKeyValue
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.PluginKeyValue) (*model.PluginKeyValue, error)); ok {
@@ -186,6 +218,10 @@ func (_m *PluginStore) SaveOrUpdate(keyVal *model.PluginKeyValue) (*model.Plugin
 func (_m *PluginStore) SetWithOptions(pluginID string, key string, value []byte, options model.PluginKVSetOptions) (bool, error) {
 	ret := _m.Called(pluginID, key, value, options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetWithOptions")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, []byte, model.PluginKVSetOptions) (bool, error)); ok {
@@ -206,13 +242,12 @@ func (_m *PluginStore) SetWithOptions(pluginID string, key string, value []byte,
 	return r0, r1
 }
 
-type mockConstructorTestingTNewPluginStore interface {
+// NewPluginStore creates a new instance of PluginStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewPluginStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewPluginStore creates a new instance of PluginStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewPluginStore(t mockConstructorTestingTNewPluginStore) *PluginStore {
+}) *PluginStore {
 	mock := &PluginStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/PostAcknowledgementStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type PostAcknowledgementStore struct {
 func (_m *PostAcknowledgementStore) Delete(acknowledgement *model.PostAcknowledgement) error {
 	ret := _m.Called(acknowledgement)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*model.PostAcknowledgement) error); ok {
 		r0 = rf(acknowledgement)
@@ -32,6 +36,10 @@ func (_m *PostAcknowledgementStore) Delete(acknowledgement *model.PostAcknowledg
 func (_m *PostAcknowledgementStore) Get(postID string, userID string) (*model.PostAcknowledgement, error) {
 	ret := _m.Called(postID, userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.PostAcknowledgement
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (*model.PostAcknowledgement, error)); ok {
@@ -58,6 +66,10 @@ func (_m *PostAcknowledgementStore) Get(postID string, userID string) (*model.Po
 func (_m *PostAcknowledgementStore) GetForPost(postID string) ([]*model.PostAcknowledgement, error) {
 	ret := _m.Called(postID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetForPost")
+	}
+
 	var r0 []*model.PostAcknowledgement
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.PostAcknowledgement, error)); ok {
@@ -84,6 +96,10 @@ func (_m *PostAcknowledgementStore) GetForPost(postID string) ([]*model.PostAckn
 func (_m *PostAcknowledgementStore) GetForPosts(postIds []string) ([]*model.PostAcknowledgement, error) {
 	ret := _m.Called(postIds)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetForPosts")
+	}
+
 	var r0 []*model.PostAcknowledgement
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]string) ([]*model.PostAcknowledgement, error)); ok {
@@ -110,6 +126,10 @@ func (_m *PostAcknowledgementStore) GetForPosts(postIds []string) ([]*model.Post
 func (_m *PostAcknowledgementStore) Save(postID string, userID string, acknowledgedAt int64) (*model.PostAcknowledgement, error) {
 	ret := _m.Called(postID, userID, acknowledgedAt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.PostAcknowledgement
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, int64) (*model.PostAcknowledgement, error)); ok {
@@ -132,13 +152,12 @@ func (_m *PostAcknowledgementStore) Save(postID string, userID string, acknowled
 	return r0, r1
 }
 
-type mockConstructorTestingTNewPostAcknowledgementStore interface {
+// NewPostAcknowledgementStore creates a new instance of PostAcknowledgementStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewPostAcknowledgementStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewPostAcknowledgementStore creates a new instance of PostAcknowledgementStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewPostAcknowledgementStore(t mockConstructorTestingTNewPostAcknowledgementStore) *PostAcknowledgementStore {
+}) *PostAcknowledgementStore {
 	mock := &PostAcknowledgementStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/PostPersistentNotificationStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type PostPersistentNotificationStore struct {
 func (_m *PostPersistentNotificationStore) Delete(postIds []string) error {
 	ret := _m.Called(postIds)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func([]string) error); ok {
 		r0 = rf(postIds)
@@ -32,6 +36,10 @@ func (_m *PostPersistentNotificationStore) Delete(postIds []string) error {
 func (_m *PostPersistentNotificationStore) DeleteByChannel(channelIds []string) error {
 	ret := _m.Called(channelIds)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteByChannel")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func([]string) error); ok {
 		r0 = rf(channelIds)
@@ -46,6 +54,10 @@ func (_m *PostPersistentNotificationStore) DeleteByChannel(channelIds []string)
 func (_m *PostPersistentNotificationStore) DeleteByTeam(teamIds []string) error {
 	ret := _m.Called(teamIds)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteByTeam")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func([]string) error); ok {
 		r0 = rf(teamIds)
@@ -60,6 +72,10 @@ func (_m *PostPersistentNotificationStore) DeleteByTeam(teamIds []string) error
 func (_m *PostPersistentNotificationStore) DeleteExpired(maxSentCount int16) error {
 	ret := _m.Called(maxSentCount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteExpired")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int16) error); ok {
 		r0 = rf(maxSentCount)
@@ -74,6 +90,10 @@ func (_m *PostPersistentNotificationStore) DeleteExpired(maxSentCount int16) err
 func (_m *PostPersistentNotificationStore) Get(params model.GetPersistentNotificationsPostsParams) ([]*model.PostPersistentNotifications, error) {
 	ret := _m.Called(params)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 []*model.PostPersistentNotifications
 	var r1 error
 	if rf, ok := ret.Get(0).(func(model.GetPersistentNotificationsPostsParams) ([]*model.PostPersistentNotifications, error)); ok {
@@ -100,6 +120,10 @@ func (_m *PostPersistentNotificationStore) Get(params model.GetPersistentNotific
 func (_m *PostPersistentNotificationStore) GetSingle(postID string) (*model.PostPersistentNotifications, error) {
 	ret := _m.Called(postID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSingle")
+	}
+
 	var r0 *model.PostPersistentNotifications
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.PostPersistentNotifications, error)); ok {
@@ -126,6 +150,10 @@ func (_m *PostPersistentNotificationStore) GetSingle(postID string) (*model.Post
 func (_m *PostPersistentNotificationStore) UpdateLastActivity(postIds []string) error {
 	ret := _m.Called(postIds)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateLastActivity")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func([]string) error); ok {
 		r0 = rf(postIds)
@@ -136,13 +164,12 @@ func (_m *PostPersistentNotificationStore) UpdateLastActivity(postIds []string)
 	return r0
 }
 
-type mockConstructorTestingTNewPostPersistentNotificationStore interface {
+// NewPostPersistentNotificationStore creates a new instance of PostPersistentNotificationStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewPostPersistentNotificationStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewPostPersistentNotificationStore creates a new instance of PostPersistentNotificationStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewPostPersistentNotificationStore(t mockConstructorTestingTNewPostPersistentNotificationStore) *PostPersistentNotificationStore {
+}) *PostPersistentNotificationStore {
 	mock := &PostPersistentNotificationStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/PostPriorityStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type PostPriorityStore struct {
 func (_m *PostPriorityStore) GetForPost(postId string) (*model.PostPriority, error) {
 	ret := _m.Called(postId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetForPost")
+	}
+
 	var r0 *model.PostPriority
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.PostPriority, error)); ok {
@@ -44,6 +48,10 @@ func (_m *PostPriorityStore) GetForPost(postId string) (*model.PostPriority, err
 func (_m *PostPriorityStore) GetForPosts(ids []string) ([]*model.PostPriority, error) {
 	ret := _m.Called(ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetForPosts")
+	}
+
 	var r0 []*model.PostPriority
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]string) ([]*model.PostPriority, error)); ok {
@@ -66,13 +74,12 @@ func (_m *PostPriorityStore) GetForPosts(ids []string) ([]*model.PostPriority, e
 	return r0, r1
 }
 
-type mockConstructorTestingTNewPostPriorityStore interface {
+// NewPostPriorityStore creates a new instance of PostPriorityStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewPostPriorityStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewPostPriorityStore creates a new instance of PostPriorityStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewPostPriorityStore(t mockConstructorTestingTNewPostPriorityStore) *PostPriorityStore {
+}) *PostPriorityStore {
 	mock := &PostPriorityStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/PostStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -24,6 +24,10 @@ type PostStore struct {
 func (_m *PostStore) AnalyticsPostCount(options *model.PostCountOptions) (int64, error) {
 	ret := _m.Called(options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AnalyticsPostCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.PostCountOptions) (int64, error)); ok {
@@ -48,6 +52,10 @@ func (_m *PostStore) AnalyticsPostCount(options *model.PostCountOptions) (int64,
 func (_m *PostStore) AnalyticsPostCountsByDay(options *model.AnalyticsPostCountsOptions) (model.AnalyticsRows, error) {
 	ret := _m.Called(options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AnalyticsPostCountsByDay")
+	}
+
 	var r0 model.AnalyticsRows
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.AnalyticsPostCountsOptions) (model.AnalyticsRows, error)); ok {
@@ -74,6 +82,10 @@ func (_m *PostStore) AnalyticsPostCountsByDay(options *model.AnalyticsPostCounts
 func (_m *PostStore) AnalyticsUserCountsWithPostsByDay(teamID string) (model.AnalyticsRows, error) {
 	ret := _m.Called(teamID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AnalyticsUserCountsWithPostsByDay")
+	}
+
 	var r0 model.AnalyticsRows
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (model.AnalyticsRows, error)); ok {
@@ -105,6 +117,10 @@ func (_m *PostStore) ClearCaches() {
 func (_m *PostStore) Delete(rctx request.CTX, postID string, timestamp int64, deleteByID string) error {
 	ret := _m.Called(rctx, postID, timestamp, deleteByID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string, int64, string) error); ok {
 		r0 = rf(rctx, postID, timestamp, deleteByID)
@@ -119,6 +135,10 @@ func (_m *PostStore) Delete(rctx request.CTX, postID string, timestamp int64, de
 func (_m *PostStore) Get(ctx context.Context, id string, opts model.GetPostsOptions, userID string, sanitizeOptions map[string]bool) (*model.PostList, error) {
 	ret := _m.Called(ctx, id, opts, userID, sanitizeOptions)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.PostList
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, model.GetPostsOptions, string, map[string]bool) (*model.PostList, error)); ok {
@@ -145,6 +165,10 @@ func (_m *PostStore) Get(ctx context.Context, id string, opts model.GetPostsOpti
 func (_m *PostStore) GetDirectPostParentsForExportAfter(limit int, afterID string, includeArchivedChannels bool) ([]*model.DirectPostForExport, error) {
 	ret := _m.Called(limit, afterID, includeArchivedChannels)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetDirectPostParentsForExportAfter")
+	}
+
 	var r0 []*model.DirectPostForExport
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int, string, bool) ([]*model.DirectPostForExport, error)); ok {
@@ -171,6 +195,10 @@ func (_m *PostStore) GetDirectPostParentsForExportAfter(limit int, afterID strin
 func (_m *PostStore) GetEditHistoryForPost(postId string) ([]*model.Post, error) {
 	ret := _m.Called(postId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetEditHistoryForPost")
+	}
+
 	var r0 []*model.Post
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.Post, error)); ok {
@@ -197,6 +225,10 @@ func (_m *PostStore) GetEditHistoryForPost(postId string) ([]*model.Post, error)
 func (_m *PostStore) GetEtag(channelID string, allowFromCache bool, collapsedThreads bool) string {
 	ret := _m.Called(channelID, allowFromCache, collapsedThreads)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetEtag")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func(string, bool, bool) string); ok {
 		r0 = rf(channelID, allowFromCache, collapsedThreads)
@@ -211,6 +243,10 @@ func (_m *PostStore) GetEtag(channelID string, allowFromCache bool, collapsedThr
 func (_m *PostStore) GetFlaggedPosts(userID string, offset int, limit int) (*model.PostList, error) {
 	ret := _m.Called(userID, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFlaggedPosts")
+	}
+
 	var r0 *model.PostList
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int) (*model.PostList, error)); ok {
@@ -237,6 +273,10 @@ func (_m *PostStore) GetFlaggedPosts(userID string, offset int, limit int) (*mod
 func (_m *PostStore) GetFlaggedPostsForChannel(userID string, channelID string, offset int, limit int) (*model.PostList, error) {
 	ret := _m.Called(userID, channelID, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFlaggedPostsForChannel")
+	}
+
 	var r0 *model.PostList
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, int, int) (*model.PostList, error)); ok {
@@ -263,6 +303,10 @@ func (_m *PostStore) GetFlaggedPostsForChannel(userID string, channelID string,
 func (_m *PostStore) GetFlaggedPostsForTeam(userID string, teamID string, offset int, limit int) (*model.PostList, error) {
 	ret := _m.Called(userID, teamID, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFlaggedPostsForTeam")
+	}
+
 	var r0 *model.PostList
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, int, int) (*model.PostList, error)); ok {
@@ -289,6 +333,10 @@ func (_m *PostStore) GetFlaggedPostsForTeam(userID string, teamID string, offset
 func (_m *PostStore) GetMaxPostSize() int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMaxPostSize")
+	}
+
 	var r0 int
 	if rf, ok := ret.Get(0).(func() int); ok {
 		r0 = rf()
@@ -303,6 +351,10 @@ func (_m *PostStore) GetMaxPostSize() int {
 func (_m *PostStore) GetNthRecentPostTime(n int64) (int64, error) {
 	ret := _m.Called(n)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetNthRecentPostTime")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (int64, error)); ok {
@@ -327,6 +379,10 @@ func (_m *PostStore) GetNthRecentPostTime(n int64) (int64, error) {
 func (_m *PostStore) GetOldest() (*model.Post, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetOldest")
+	}
+
 	var r0 *model.Post
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (*model.Post, error)); ok {
@@ -353,6 +409,10 @@ func (_m *PostStore) GetOldest() (*model.Post, error) {
 func (_m *PostStore) GetOldestEntityCreationTime() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetOldestEntityCreationTime")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -377,6 +437,10 @@ func (_m *PostStore) GetOldestEntityCreationTime() (int64, error) {
 func (_m *PostStore) GetParentsForExportAfter(limit int, afterID string, includeArchivedChannels bool) ([]*model.PostForExport, error) {
 	ret := _m.Called(limit, afterID, includeArchivedChannels)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetParentsForExportAfter")
+	}
+
 	var r0 []*model.PostForExport
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int, string, bool) ([]*model.PostForExport, error)); ok {
@@ -403,6 +467,10 @@ func (_m *PostStore) GetParentsForExportAfter(limit int, afterID string, include
 func (_m *PostStore) GetPostAfterTime(channelID string, timestamp int64, collapsedThreads bool) (*model.Post, error) {
 	ret := _m.Called(channelID, timestamp, collapsedThreads)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPostAfterTime")
+	}
+
 	var r0 *model.Post
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int64, bool) (*model.Post, error)); ok {
@@ -429,6 +497,10 @@ func (_m *PostStore) GetPostAfterTime(channelID string, timestamp int64, collaps
 func (_m *PostStore) GetPostIdAfterTime(channelID string, timestamp int64, collapsedThreads bool) (string, error) {
 	ret := _m.Called(channelID, timestamp, collapsedThreads)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPostIdAfterTime")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int64, bool) (string, error)); ok {
@@ -453,6 +525,10 @@ func (_m *PostStore) GetPostIdAfterTime(channelID string, timestamp int64, colla
 func (_m *PostStore) GetPostIdBeforeTime(channelID string, timestamp int64, collapsedThreads bool) (string, error) {
 	ret := _m.Called(channelID, timestamp, collapsedThreads)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPostIdBeforeTime")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int64, bool) (string, error)); ok {
@@ -477,6 +553,10 @@ func (_m *PostStore) GetPostIdBeforeTime(channelID string, timestamp int64, coll
 func (_m *PostStore) GetPostReminderMetadata(postID string) (*store.PostReminderMetadata, error) {
 	ret := _m.Called(postID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPostReminderMetadata")
+	}
+
 	var r0 *store.PostReminderMetadata
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*store.PostReminderMetadata, error)); ok {
@@ -503,6 +583,10 @@ func (_m *PostStore) GetPostReminderMetadata(postID string) (*store.PostReminder
 func (_m *PostStore) GetPostReminders(now int64) ([]*model.PostReminder, error) {
 	ret := _m.Called(now)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPostReminders")
+	}
+
 	var r0 []*model.PostReminder
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) ([]*model.PostReminder, error)); ok {
@@ -529,6 +613,10 @@ func (_m *PostStore) GetPostReminders(now int64) ([]*model.PostReminder, error)
 func (_m *PostStore) GetPosts(options model.GetPostsOptions, allowFromCache bool, sanitizeOptions map[string]bool) (*model.PostList, error) {
 	ret := _m.Called(options, allowFromCache, sanitizeOptions)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPosts")
+	}
+
 	var r0 *model.PostList
 	var r1 error
 	if rf, ok := ret.Get(0).(func(model.GetPostsOptions, bool, map[string]bool) (*model.PostList, error)); ok {
@@ -555,6 +643,10 @@ func (_m *PostStore) GetPosts(options model.GetPostsOptions, allowFromCache bool
 func (_m *PostStore) GetPostsAfter(options model.GetPostsOptions, sanitizeOptions map[string]bool) (*model.PostList, error) {
 	ret := _m.Called(options, sanitizeOptions)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPostsAfter")
+	}
+
 	var r0 *model.PostList
 	var r1 error
 	if rf, ok := ret.Get(0).(func(model.GetPostsOptions, map[string]bool) (*model.PostList, error)); ok {
@@ -581,6 +673,10 @@ func (_m *PostStore) GetPostsAfter(options model.GetPostsOptions, sanitizeOption
 func (_m *PostStore) GetPostsBatchForIndexing(startTime int64, startPostID string, limit int) ([]*model.PostForIndexing, error) {
 	ret := _m.Called(startTime, startPostID, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPostsBatchForIndexing")
+	}
+
 	var r0 []*model.PostForIndexing
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, string, int) ([]*model.PostForIndexing, error)); ok {
@@ -607,6 +703,10 @@ func (_m *PostStore) GetPostsBatchForIndexing(startTime int64, startPostID strin
 func (_m *PostStore) GetPostsBefore(options model.GetPostsOptions, sanitizeOptions map[string]bool) (*model.PostList, error) {
 	ret := _m.Called(options, sanitizeOptions)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPostsBefore")
+	}
+
 	var r0 *model.PostList
 	var r1 error
 	if rf, ok := ret.Get(0).(func(model.GetPostsOptions, map[string]bool) (*model.PostList, error)); ok {
@@ -633,6 +733,10 @@ func (_m *PostStore) GetPostsBefore(options model.GetPostsOptions, sanitizeOptio
 func (_m *PostStore) GetPostsByIds(postIds []string) ([]*model.Post, error) {
 	ret := _m.Called(postIds)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPostsByIds")
+	}
+
 	var r0 []*model.Post
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]string) ([]*model.Post, error)); ok {
@@ -659,6 +763,10 @@ func (_m *PostStore) GetPostsByIds(postIds []string) ([]*model.Post, error) {
 func (_m *PostStore) GetPostsByThread(threadID string, since int64) ([]*model.Post, error) {
 	ret := _m.Called(threadID, since)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPostsByThread")
+	}
+
 	var r0 []*model.Post
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int64) ([]*model.Post, error)); ok {
@@ -685,6 +793,10 @@ func (_m *PostStore) GetPostsByThread(threadID string, since int64) ([]*model.Po
 func (_m *PostStore) GetPostsCreatedAt(channelID string, timestamp int64) ([]*model.Post, error) {
 	ret := _m.Called(channelID, timestamp)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPostsCreatedAt")
+	}
+
 	var r0 []*model.Post
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int64) ([]*model.Post, error)); ok {
@@ -711,6 +823,10 @@ func (_m *PostStore) GetPostsCreatedAt(channelID string, timestamp int64) ([]*mo
 func (_m *PostStore) GetPostsSince(options model.GetPostsSinceOptions, allowFromCache bool, sanitizeOptions map[string]bool) (*model.PostList, error) {
 	ret := _m.Called(options, allowFromCache, sanitizeOptions)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPostsSince")
+	}
+
 	var r0 *model.PostList
 	var r1 error
 	if rf, ok := ret.Get(0).(func(model.GetPostsSinceOptions, bool, map[string]bool) (*model.PostList, error)); ok {
@@ -737,6 +853,10 @@ func (_m *PostStore) GetPostsSince(options model.GetPostsSinceOptions, allowFrom
 func (_m *PostStore) GetPostsSinceForSync(options model.GetPostsSinceForSyncOptions, cursor model.GetPostsSinceForSyncCursor, limit int) ([]*model.Post, model.GetPostsSinceForSyncCursor, error) {
 	ret := _m.Called(options, cursor, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPostsSinceForSync")
+	}
+
 	var r0 []*model.Post
 	var r1 model.GetPostsSinceForSyncCursor
 	var r2 error
@@ -770,6 +890,10 @@ func (_m *PostStore) GetPostsSinceForSync(options model.GetPostsSinceForSyncOpti
 func (_m *PostStore) GetRepliesForExport(parentID string) ([]*model.ReplyForExport, error) {
 	ret := _m.Called(parentID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRepliesForExport")
+	}
+
 	var r0 []*model.ReplyForExport
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.ReplyForExport, error)); ok {
@@ -796,6 +920,10 @@ func (_m *PostStore) GetRepliesForExport(parentID string) ([]*model.ReplyForExpo
 func (_m *PostStore) GetSingle(id string, inclDeleted bool) (*model.Post, error) {
 	ret := _m.Called(id, inclDeleted)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSingle")
+	}
+
 	var r0 *model.Post
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, bool) (*model.Post, error)); ok {
@@ -822,6 +950,10 @@ func (_m *PostStore) GetSingle(id string, inclDeleted bool) (*model.Post, error)
 func (_m *PostStore) HasAutoResponsePostByUserSince(options model.GetPostsSinceOptions, userId string) (bool, error) {
 	ret := _m.Called(options, userId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HasAutoResponsePostByUserSince")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(model.GetPostsSinceOptions, string) (bool, error)); ok {
@@ -851,6 +983,10 @@ func (_m *PostStore) InvalidateLastPostTimeCache(channelID string) {
 func (_m *PostStore) Overwrite(rctx request.CTX, post *model.Post) (*model.Post, error) {
 	ret := _m.Called(rctx, post)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Overwrite")
+	}
+
 	var r0 *model.Post
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, *model.Post) (*model.Post, error)); ok {
@@ -877,6 +1013,10 @@ func (_m *PostStore) Overwrite(rctx request.CTX, post *model.Post) (*model.Post,
 func (_m *PostStore) OverwriteMultiple(posts []*model.Post) ([]*model.Post, int, error) {
 	ret := _m.Called(posts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OverwriteMultiple")
+	}
+
 	var r0 []*model.Post
 	var r1 int
 	var r2 error
@@ -910,6 +1050,10 @@ func (_m *PostStore) OverwriteMultiple(posts []*model.Post) ([]*model.Post, int,
 func (_m *PostStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, error) {
 	ret := _m.Called(endTime, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteBatch")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, int64) (int64, error)); ok {
@@ -934,6 +1078,10 @@ func (_m *PostStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, er
 func (_m *PostStore) PermanentDeleteBatchForRetentionPolicies(now int64, globalPolicyEndTime int64, limit int64, cursor model.RetentionPolicyCursor) (int64, model.RetentionPolicyCursor, error) {
 	ret := _m.Called(now, globalPolicyEndTime, limit, cursor)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteBatchForRetentionPolicies")
+	}
+
 	var r0 int64
 	var r1 model.RetentionPolicyCursor
 	var r2 error
@@ -965,6 +1113,10 @@ func (_m *PostStore) PermanentDeleteBatchForRetentionPolicies(now int64, globalP
 func (_m *PostStore) PermanentDeleteByChannel(rctx request.CTX, channelID string) error {
 	ret := _m.Called(rctx, channelID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteByChannel")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string) error); ok {
 		r0 = rf(rctx, channelID)
@@ -979,6 +1131,10 @@ func (_m *PostStore) PermanentDeleteByChannel(rctx request.CTX, channelID string
 func (_m *PostStore) PermanentDeleteByUser(rctx request.CTX, userID string) error {
 	ret := _m.Called(rctx, userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteByUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string) error); ok {
 		r0 = rf(rctx, userID)
@@ -993,6 +1149,10 @@ func (_m *PostStore) PermanentDeleteByUser(rctx request.CTX, userID string) erro
 func (_m *PostStore) Save(rctx request.CTX, post *model.Post) (*model.Post, error) {
 	ret := _m.Called(rctx, post)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.Post
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, *model.Post) (*model.Post, error)); ok {
@@ -1019,6 +1179,10 @@ func (_m *PostStore) Save(rctx request.CTX, post *model.Post) (*model.Post, erro
 func (_m *PostStore) SaveMultiple(posts []*model.Post) ([]*model.Post, int, error) {
 	ret := _m.Called(posts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveMultiple")
+	}
+
 	var r0 []*model.Post
 	var r1 int
 	var r2 error
@@ -1052,6 +1216,10 @@ func (_m *PostStore) SaveMultiple(posts []*model.Post) ([]*model.Post, int, erro
 func (_m *PostStore) Search(teamID string, userID string, params *model.SearchParams) (*model.PostList, error) {
 	ret := _m.Called(teamID, userID, params)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Search")
+	}
+
 	var r0 *model.PostList
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, *model.SearchParams) (*model.PostList, error)); ok {
@@ -1078,6 +1246,10 @@ func (_m *PostStore) Search(teamID string, userID string, params *model.SearchPa
 func (_m *PostStore) SearchPostsForUser(rctx request.CTX, paramsList []*model.SearchParams, userID string, teamID string, page int, perPage int) (*model.PostSearchResults, error) {
 	ret := _m.Called(rctx, paramsList, userID, teamID, page, perPage)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SearchPostsForUser")
+	}
+
 	var r0 *model.PostSearchResults
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, []*model.SearchParams, string, string, int, int) (*model.PostSearchResults, error)); ok {
@@ -1104,6 +1276,10 @@ func (_m *PostStore) SearchPostsForUser(rctx request.CTX, paramsList []*model.Se
 func (_m *PostStore) SetPostReminder(reminder *model.PostReminder) error {
 	ret := _m.Called(reminder)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetPostReminder")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*model.PostReminder) error); ok {
 		r0 = rf(reminder)
@@ -1118,6 +1294,10 @@ func (_m *PostStore) SetPostReminder(reminder *model.PostReminder) error {
 func (_m *PostStore) Update(rctx request.CTX, newPost *model.Post, oldPost *model.Post) (*model.Post, error) {
 	ret := _m.Called(rctx, newPost, oldPost)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
 	var r0 *model.Post
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, *model.Post, *model.Post) (*model.Post, error)); ok {
@@ -1140,13 +1320,12 @@ func (_m *PostStore) Update(rctx request.CTX, newPost *model.Post, oldPost *mode
 	return r0, r1
 }
 
-type mockConstructorTestingTNewPostStore interface {
+// NewPostStore creates a new instance of PostStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewPostStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewPostStore creates a new instance of PostStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewPostStore(t mockConstructorTestingTNewPostStore) *PostStore {
+}) *PostStore {
 	mock := &PostStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/PreferenceStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type PreferenceStore struct {
 func (_m *PreferenceStore) CleanupFlagsBatch(limit int64) (int64, error) {
 	ret := _m.Called(limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CleanupFlagsBatch")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (int64, error)); ok {
@@ -42,6 +46,10 @@ func (_m *PreferenceStore) CleanupFlagsBatch(limit int64) (int64, error) {
 func (_m *PreferenceStore) Delete(userID string, category string, name string) error {
 	ret := _m.Called(userID, category, name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string) error); ok {
 		r0 = rf(userID, category, name)
@@ -56,6 +64,10 @@ func (_m *PreferenceStore) Delete(userID string, category string, name string) e
 func (_m *PreferenceStore) DeleteCategory(userID string, category string) error {
 	ret := _m.Called(userID, category)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteCategory")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 		r0 = rf(userID, category)
@@ -70,6 +82,10 @@ func (_m *PreferenceStore) DeleteCategory(userID string, category string) error
 func (_m *PreferenceStore) DeleteCategoryAndName(category string, name string) error {
 	ret := _m.Called(category, name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteCategoryAndName")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 		r0 = rf(category, name)
@@ -84,6 +100,10 @@ func (_m *PreferenceStore) DeleteCategoryAndName(category string, name string) e
 func (_m *PreferenceStore) DeleteOrphanedRows(limit int) (int64, error) {
 	ret := _m.Called(limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteOrphanedRows")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int) (int64, error)); ok {
@@ -108,6 +128,10 @@ func (_m *PreferenceStore) DeleteOrphanedRows(limit int) (int64, error) {
 func (_m *PreferenceStore) Get(userID string, category string, name string) (*model.Preference, error) {
 	ret := _m.Called(userID, category, name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.Preference
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, string) (*model.Preference, error)); ok {
@@ -134,6 +158,10 @@ func (_m *PreferenceStore) Get(userID string, category string, name string) (*mo
 func (_m *PreferenceStore) GetAll(userID string) (model.Preferences, error) {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 model.Preferences
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (model.Preferences, error)); ok {
@@ -160,6 +188,10 @@ func (_m *PreferenceStore) GetAll(userID string) (model.Preferences, error) {
 func (_m *PreferenceStore) GetCategory(userID string, category string) (model.Preferences, error) {
 	ret := _m.Called(userID, category)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetCategory")
+	}
+
 	var r0 model.Preferences
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (model.Preferences, error)); ok {
@@ -186,6 +218,10 @@ func (_m *PreferenceStore) GetCategory(userID string, category string) (model.Pr
 func (_m *PreferenceStore) GetCategoryAndName(category string, nane string) (model.Preferences, error) {
 	ret := _m.Called(category, nane)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetCategoryAndName")
+	}
+
 	var r0 model.Preferences
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (model.Preferences, error)); ok {
@@ -212,6 +248,10 @@ func (_m *PreferenceStore) GetCategoryAndName(category string, nane string) (mod
 func (_m *PreferenceStore) PermanentDeleteByUser(userID string) error {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteByUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(userID)
@@ -226,6 +266,10 @@ func (_m *PreferenceStore) PermanentDeleteByUser(userID string) error {
 func (_m *PreferenceStore) Save(preferences model.Preferences) error {
 	ret := _m.Called(preferences)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(model.Preferences) error); ok {
 		r0 = rf(preferences)
@@ -236,13 +280,12 @@ func (_m *PreferenceStore) Save(preferences model.Preferences) error {
 	return r0
 }
 
-type mockConstructorTestingTNewPreferenceStore interface {
+// NewPreferenceStore creates a new instance of PreferenceStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewPreferenceStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewPreferenceStore creates a new instance of PreferenceStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewPreferenceStore(t mockConstructorTestingTNewPreferenceStore) *PreferenceStore {
+}) *PreferenceStore {
 	mock := &PreferenceStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/ProductNoticesStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type ProductNoticesStore struct {
 func (_m *ProductNoticesStore) Clear(notices []string) error {
 	ret := _m.Called(notices)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Clear")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func([]string) error); ok {
 		r0 = rf(notices)
@@ -32,6 +36,10 @@ func (_m *ProductNoticesStore) Clear(notices []string) error {
 func (_m *ProductNoticesStore) ClearOldNotices(currentNotices model.ProductNotices) error {
 	ret := _m.Called(currentNotices)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ClearOldNotices")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(model.ProductNotices) error); ok {
 		r0 = rf(currentNotices)
@@ -46,6 +54,10 @@ func (_m *ProductNoticesStore) ClearOldNotices(currentNotices model.ProductNotic
 func (_m *ProductNoticesStore) GetViews(userID string) ([]model.ProductNoticeViewState, error) {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetViews")
+	}
+
 	var r0 []model.ProductNoticeViewState
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]model.ProductNoticeViewState, error)); ok {
@@ -72,6 +84,10 @@ func (_m *ProductNoticesStore) GetViews(userID string) ([]model.ProductNoticeVie
 func (_m *ProductNoticesStore) View(userID string, notices []string) error {
 	ret := _m.Called(userID, notices)
 
+	if len(ret) == 0 {
+		panic("no return value specified for View")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, []string) error); ok {
 		r0 = rf(userID, notices)
@@ -82,13 +98,12 @@ func (_m *ProductNoticesStore) View(userID string, notices []string) error {
 	return r0
 }
 
-type mockConstructorTestingTNewProductNoticesStore interface {
+// NewProductNoticesStore creates a new instance of ProductNoticesStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewProductNoticesStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewProductNoticesStore creates a new instance of ProductNoticesStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewProductNoticesStore(t mockConstructorTestingTNewProductNoticesStore) *ProductNoticesStore {
+}) *ProductNoticesStore {
 	mock := &ProductNoticesStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/ReactionStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type ReactionStore struct {
 func (_m *ReactionStore) BulkGetForPosts(postIds []string) ([]*model.Reaction, error) {
 	ret := _m.Called(postIds)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BulkGetForPosts")
+	}
+
 	var r0 []*model.Reaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]string) ([]*model.Reaction, error)); ok {
@@ -44,6 +48,10 @@ func (_m *ReactionStore) BulkGetForPosts(postIds []string) ([]*model.Reaction, e
 func (_m *ReactionStore) Delete(reaction *model.Reaction) (*model.Reaction, error) {
 	ret := _m.Called(reaction)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 *model.Reaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Reaction) (*model.Reaction, error)); ok {
@@ -70,6 +78,10 @@ func (_m *ReactionStore) Delete(reaction *model.Reaction) (*model.Reaction, erro
 func (_m *ReactionStore) DeleteAllWithEmojiName(emojiName string) error {
 	ret := _m.Called(emojiName)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteAllWithEmojiName")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(emojiName)
@@ -84,6 +96,10 @@ func (_m *ReactionStore) DeleteAllWithEmojiName(emojiName string) error {
 func (_m *ReactionStore) DeleteOrphanedRowsByIds(r *model.RetentionIdsForDeletion) error {
 	ret := _m.Called(r)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteOrphanedRowsByIds")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*model.RetentionIdsForDeletion) error); ok {
 		r0 = rf(r)
@@ -98,6 +114,10 @@ func (_m *ReactionStore) DeleteOrphanedRowsByIds(r *model.RetentionIdsForDeletio
 func (_m *ReactionStore) ExistsOnPost(postId string, emojiName string) (bool, error) {
 	ret := _m.Called(postId, emojiName)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ExistsOnPost")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (bool, error)); ok {
@@ -122,6 +142,10 @@ func (_m *ReactionStore) ExistsOnPost(postId string, emojiName string) (bool, er
 func (_m *ReactionStore) GetForPost(postID string, allowFromCache bool) ([]*model.Reaction, error) {
 	ret := _m.Called(postID, allowFromCache)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetForPost")
+	}
+
 	var r0 []*model.Reaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, bool) ([]*model.Reaction, error)); ok {
@@ -148,6 +172,10 @@ func (_m *ReactionStore) GetForPost(postID string, allowFromCache bool) ([]*mode
 func (_m *ReactionStore) GetForPostSince(postId string, since int64, excludeRemoteId string, inclDeleted bool) ([]*model.Reaction, error) {
 	ret := _m.Called(postId, since, excludeRemoteId, inclDeleted)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetForPostSince")
+	}
+
 	var r0 []*model.Reaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int64, string, bool) ([]*model.Reaction, error)); ok {
@@ -174,6 +202,10 @@ func (_m *ReactionStore) GetForPostSince(postId string, since int64, excludeRemo
 func (_m *ReactionStore) GetUniqueCountForPost(postId string) (int, error) {
 	ret := _m.Called(postId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUniqueCountForPost")
+	}
+
 	var r0 int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (int, error)); ok {
@@ -198,6 +230,10 @@ func (_m *ReactionStore) GetUniqueCountForPost(postId string) (int, error) {
 func (_m *ReactionStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, error) {
 	ret := _m.Called(endTime, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteBatch")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, int64) (int64, error)); ok {
@@ -222,6 +258,10 @@ func (_m *ReactionStore) PermanentDeleteBatch(endTime int64, limit int64) (int64
 func (_m *ReactionStore) PermanentDeleteByUser(userID string) error {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteByUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(userID)
@@ -236,6 +276,10 @@ func (_m *ReactionStore) PermanentDeleteByUser(userID string) error {
 func (_m *ReactionStore) Save(reaction *model.Reaction) (*model.Reaction, error) {
 	ret := _m.Called(reaction)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.Reaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Reaction) (*model.Reaction, error)); ok {
@@ -258,13 +302,12 @@ func (_m *ReactionStore) Save(reaction *model.Reaction) (*model.Reaction, error)
 	return r0, r1
 }
 
-type mockConstructorTestingTNewReactionStore interface {
+// NewReactionStore creates a new instance of ReactionStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewReactionStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewReactionStore creates a new instance of ReactionStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewReactionStore(t mockConstructorTestingTNewReactionStore) *ReactionStore {
+}) *ReactionStore {
 	mock := &ReactionStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/RemoteClusterStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type RemoteClusterStore struct {
 func (_m *RemoteClusterStore) Delete(remoteClusterId string) (bool, error) {
 	ret := _m.Called(remoteClusterId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (bool, error)); ok {
@@ -42,6 +46,10 @@ func (_m *RemoteClusterStore) Delete(remoteClusterId string) (bool, error) {
 func (_m *RemoteClusterStore) Get(remoteClusterId string) (*model.RemoteCluster, error) {
 	ret := _m.Called(remoteClusterId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.RemoteCluster
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.RemoteCluster, error)); ok {
@@ -68,6 +76,10 @@ func (_m *RemoteClusterStore) Get(remoteClusterId string) (*model.RemoteCluster,
 func (_m *RemoteClusterStore) GetAll(filter model.RemoteClusterQueryFilter) ([]*model.RemoteCluster, error) {
 	ret := _m.Called(filter)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []*model.RemoteCluster
 	var r1 error
 	if rf, ok := ret.Get(0).(func(model.RemoteClusterQueryFilter) ([]*model.RemoteCluster, error)); ok {
@@ -94,6 +106,10 @@ func (_m *RemoteClusterStore) GetAll(filter model.RemoteClusterQueryFilter) ([]*
 func (_m *RemoteClusterStore) GetByPluginID(pluginID string) (*model.RemoteCluster, error) {
 	ret := _m.Called(pluginID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByPluginID")
+	}
+
 	var r0 *model.RemoteCluster
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.RemoteCluster, error)); ok {
@@ -120,6 +136,10 @@ func (_m *RemoteClusterStore) GetByPluginID(pluginID string) (*model.RemoteClust
 func (_m *RemoteClusterStore) Save(rc *model.RemoteCluster) (*model.RemoteCluster, error) {
 	ret := _m.Called(rc)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.RemoteCluster
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.RemoteCluster) (*model.RemoteCluster, error)); ok {
@@ -146,6 +166,10 @@ func (_m *RemoteClusterStore) Save(rc *model.RemoteCluster) (*model.RemoteCluste
 func (_m *RemoteClusterStore) SetLastPingAt(remoteClusterId string) error {
 	ret := _m.Called(remoteClusterId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetLastPingAt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(remoteClusterId)
@@ -160,6 +184,10 @@ func (_m *RemoteClusterStore) SetLastPingAt(remoteClusterId string) error {
 func (_m *RemoteClusterStore) Update(rc *model.RemoteCluster) (*model.RemoteCluster, error) {
 	ret := _m.Called(rc)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
 	var r0 *model.RemoteCluster
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.RemoteCluster) (*model.RemoteCluster, error)); ok {
@@ -186,6 +214,10 @@ func (_m *RemoteClusterStore) Update(rc *model.RemoteCluster) (*model.RemoteClus
 func (_m *RemoteClusterStore) UpdateTopics(remoteClusterId string, topics string) (*model.RemoteCluster, error) {
 	ret := _m.Called(remoteClusterId, topics)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTopics")
+	}
+
 	var r0 *model.RemoteCluster
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (*model.RemoteCluster, error)); ok {
@@ -208,13 +240,12 @@ func (_m *RemoteClusterStore) UpdateTopics(remoteClusterId string, topics string
 	return r0, r1
 }
 
-type mockConstructorTestingTNewRemoteClusterStore interface {
+// NewRemoteClusterStore creates a new instance of RemoteClusterStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewRemoteClusterStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewRemoteClusterStore creates a new instance of RemoteClusterStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewRemoteClusterStore(t mockConstructorTestingTNewRemoteClusterStore) *RemoteClusterStore {
+}) *RemoteClusterStore {
 	mock := &RemoteClusterStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/RetentionPolicyStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type RetentionPolicyStore struct {
 func (_m *RetentionPolicyStore) AddChannels(policyId string, channelIds []string) error {
 	ret := _m.Called(policyId, channelIds)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AddChannels")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, []string) error); ok {
 		r0 = rf(policyId, channelIds)
@@ -32,6 +36,10 @@ func (_m *RetentionPolicyStore) AddChannels(policyId string, channelIds []string
 func (_m *RetentionPolicyStore) AddTeams(policyId string, teamIds []string) error {
 	ret := _m.Called(policyId, teamIds)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AddTeams")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, []string) error); ok {
 		r0 = rf(policyId, teamIds)
@@ -46,6 +54,10 @@ func (_m *RetentionPolicyStore) AddTeams(policyId string, teamIds []string) erro
 func (_m *RetentionPolicyStore) Delete(id string) error {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(id)
@@ -60,6 +72,10 @@ func (_m *RetentionPolicyStore) Delete(id string) error {
 func (_m *RetentionPolicyStore) DeleteOrphanedRows(limit int) (int64, error) {
 	ret := _m.Called(limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteOrphanedRows")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int) (int64, error)); ok {
@@ -84,6 +100,10 @@ func (_m *RetentionPolicyStore) DeleteOrphanedRows(limit int) (int64, error) {
 func (_m *RetentionPolicyStore) Get(id string) (*model.RetentionPolicyWithTeamAndChannelCounts, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.RetentionPolicyWithTeamAndChannelCounts
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.RetentionPolicyWithTeamAndChannelCounts, error)); ok {
@@ -110,6 +130,10 @@ func (_m *RetentionPolicyStore) Get(id string) (*model.RetentionPolicyWithTeamAn
 func (_m *RetentionPolicyStore) GetAll(offset int, limit int) ([]*model.RetentionPolicyWithTeamAndChannelCounts, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []*model.RetentionPolicyWithTeamAndChannelCounts
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int, int) ([]*model.RetentionPolicyWithTeamAndChannelCounts, error)); ok {
@@ -136,6 +160,10 @@ func (_m *RetentionPolicyStore) GetAll(offset int, limit int) ([]*model.Retentio
 func (_m *RetentionPolicyStore) GetChannelPoliciesCountForUser(userID string) (int64, error) {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetChannelPoliciesCountForUser")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (int64, error)); ok {
@@ -160,6 +188,10 @@ func (_m *RetentionPolicyStore) GetChannelPoliciesCountForUser(userID string) (i
 func (_m *RetentionPolicyStore) GetChannelPoliciesForUser(userID string, offset int, limit int) ([]*model.RetentionPolicyForChannel, error) {
 	ret := _m.Called(userID, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetChannelPoliciesForUser")
+	}
+
 	var r0 []*model.RetentionPolicyForChannel
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int) ([]*model.RetentionPolicyForChannel, error)); ok {
@@ -186,6 +218,10 @@ func (_m *RetentionPolicyStore) GetChannelPoliciesForUser(userID string, offset
 func (_m *RetentionPolicyStore) GetChannels(policyId string, offset int, limit int) (model.ChannelListWithTeamData, error) {
 	ret := _m.Called(policyId, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetChannels")
+	}
+
 	var r0 model.ChannelListWithTeamData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int) (model.ChannelListWithTeamData, error)); ok {
@@ -212,6 +248,10 @@ func (_m *RetentionPolicyStore) GetChannels(policyId string, offset int, limit i
 func (_m *RetentionPolicyStore) GetChannelsCount(policyId string) (int64, error) {
 	ret := _m.Called(policyId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetChannelsCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (int64, error)); ok {
@@ -236,6 +276,10 @@ func (_m *RetentionPolicyStore) GetChannelsCount(policyId string) (int64, error)
 func (_m *RetentionPolicyStore) GetCount() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -260,6 +304,10 @@ func (_m *RetentionPolicyStore) GetCount() (int64, error) {
 func (_m *RetentionPolicyStore) GetIdsForDeletionByTableName(tableName string, limit int) ([]*model.RetentionIdsForDeletion, error) {
 	ret := _m.Called(tableName, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetIdsForDeletionByTableName")
+	}
+
 	var r0 []*model.RetentionIdsForDeletion
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int) ([]*model.RetentionIdsForDeletion, error)); ok {
@@ -286,6 +334,10 @@ func (_m *RetentionPolicyStore) GetIdsForDeletionByTableName(tableName string, l
 func (_m *RetentionPolicyStore) GetTeamPoliciesCountForUser(userID string) (int64, error) {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTeamPoliciesCountForUser")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (int64, error)); ok {
@@ -310,6 +362,10 @@ func (_m *RetentionPolicyStore) GetTeamPoliciesCountForUser(userID string) (int6
 func (_m *RetentionPolicyStore) GetTeamPoliciesForUser(userID string, offset int, limit int) ([]*model.RetentionPolicyForTeam, error) {
 	ret := _m.Called(userID, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTeamPoliciesForUser")
+	}
+
 	var r0 []*model.RetentionPolicyForTeam
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int) ([]*model.RetentionPolicyForTeam, error)); ok {
@@ -336,6 +392,10 @@ func (_m *RetentionPolicyStore) GetTeamPoliciesForUser(userID string, offset int
 func (_m *RetentionPolicyStore) GetTeams(policyId string, offset int, limit int) ([]*model.Team, error) {
 	ret := _m.Called(policyId, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTeams")
+	}
+
 	var r0 []*model.Team
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int) ([]*model.Team, error)); ok {
@@ -362,6 +422,10 @@ func (_m *RetentionPolicyStore) GetTeams(policyId string, offset int, limit int)
 func (_m *RetentionPolicyStore) GetTeamsCount(policyId string) (int64, error) {
 	ret := _m.Called(policyId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTeamsCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (int64, error)); ok {
@@ -386,6 +450,10 @@ func (_m *RetentionPolicyStore) GetTeamsCount(policyId string) (int64, error) {
 func (_m *RetentionPolicyStore) Patch(patch *model.RetentionPolicyWithTeamAndChannelIDs) (*model.RetentionPolicyWithTeamAndChannelCounts, error) {
 	ret := _m.Called(patch)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Patch")
+	}
+
 	var r0 *model.RetentionPolicyWithTeamAndChannelCounts
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.RetentionPolicyWithTeamAndChannelIDs) (*model.RetentionPolicyWithTeamAndChannelCounts, error)); ok {
@@ -412,6 +480,10 @@ func (_m *RetentionPolicyStore) Patch(patch *model.RetentionPolicyWithTeamAndCha
 func (_m *RetentionPolicyStore) RemoveChannels(policyId string, channelIds []string) error {
 	ret := _m.Called(policyId, channelIds)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveChannels")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, []string) error); ok {
 		r0 = rf(policyId, channelIds)
@@ -426,6 +498,10 @@ func (_m *RetentionPolicyStore) RemoveChannels(policyId string, channelIds []str
 func (_m *RetentionPolicyStore) RemoveTeams(policyId string, teamIds []string) error {
 	ret := _m.Called(policyId, teamIds)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveTeams")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, []string) error); ok {
 		r0 = rf(policyId, teamIds)
@@ -440,6 +516,10 @@ func (_m *RetentionPolicyStore) RemoveTeams(policyId string, teamIds []string) e
 func (_m *RetentionPolicyStore) Save(policy *model.RetentionPolicyWithTeamAndChannelIDs) (*model.RetentionPolicyWithTeamAndChannelCounts, error) {
 	ret := _m.Called(policy)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.RetentionPolicyWithTeamAndChannelCounts
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.RetentionPolicyWithTeamAndChannelIDs) (*model.RetentionPolicyWithTeamAndChannelCounts, error)); ok {
@@ -462,13 +542,12 @@ func (_m *RetentionPolicyStore) Save(policy *model.RetentionPolicyWithTeamAndCha
 	return r0, r1
 }
 
-type mockConstructorTestingTNewRetentionPolicyStore interface {
+// NewRetentionPolicyStore creates a new instance of RetentionPolicyStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewRetentionPolicyStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewRetentionPolicyStore creates a new instance of RetentionPolicyStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewRetentionPolicyStore(t mockConstructorTestingTNewRetentionPolicyStore) *RetentionPolicyStore {
+}) *RetentionPolicyStore {
 	mock := &RetentionPolicyStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/RoleStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -20,6 +20,10 @@ type RoleStore struct {
 func (_m *RoleStore) AllChannelSchemeRoles() ([]*model.Role, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AllChannelSchemeRoles")
+	}
+
 	var r0 []*model.Role
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]*model.Role, error)); ok {
@@ -46,6 +50,10 @@ func (_m *RoleStore) AllChannelSchemeRoles() ([]*model.Role, error) {
 func (_m *RoleStore) ChannelHigherScopedPermissions(roleNames []string) (map[string]*model.RolePermissions, error) {
 	ret := _m.Called(roleNames)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChannelHigherScopedPermissions")
+	}
+
 	var r0 map[string]*model.RolePermissions
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]string) (map[string]*model.RolePermissions, error)); ok {
@@ -72,6 +80,10 @@ func (_m *RoleStore) ChannelHigherScopedPermissions(roleNames []string) (map[str
 func (_m *RoleStore) ChannelRolesUnderTeamRole(roleName string) ([]*model.Role, error) {
 	ret := _m.Called(roleName)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChannelRolesUnderTeamRole")
+	}
+
 	var r0 []*model.Role
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.Role, error)); ok {
@@ -98,6 +110,10 @@ func (_m *RoleStore) ChannelRolesUnderTeamRole(roleName string) ([]*model.Role,
 func (_m *RoleStore) Delete(roleID string) (*model.Role, error) {
 	ret := _m.Called(roleID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 *model.Role
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.Role, error)); ok {
@@ -124,6 +140,10 @@ func (_m *RoleStore) Delete(roleID string) (*model.Role, error) {
 func (_m *RoleStore) Get(roleID string) (*model.Role, error) {
 	ret := _m.Called(roleID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.Role
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.Role, error)); ok {
@@ -150,6 +170,10 @@ func (_m *RoleStore) Get(roleID string) (*model.Role, error) {
 func (_m *RoleStore) GetAll() ([]*model.Role, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []*model.Role
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]*model.Role, error)); ok {
@@ -176,6 +200,10 @@ func (_m *RoleStore) GetAll() ([]*model.Role, error) {
 func (_m *RoleStore) GetByName(ctx context.Context, name string) (*model.Role, error) {
 	ret := _m.Called(ctx, name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByName")
+	}
+
 	var r0 *model.Role
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string) (*model.Role, error)); ok {
@@ -202,6 +230,10 @@ func (_m *RoleStore) GetByName(ctx context.Context, name string) (*model.Role, e
 func (_m *RoleStore) GetByNames(names []string) ([]*model.Role, error) {
 	ret := _m.Called(names)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByNames")
+	}
+
 	var r0 []*model.Role
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]string) ([]*model.Role, error)); ok {
@@ -228,6 +260,10 @@ func (_m *RoleStore) GetByNames(names []string) ([]*model.Role, error) {
 func (_m *RoleStore) PermanentDeleteAll() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteAll")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -242,6 +278,10 @@ func (_m *RoleStore) PermanentDeleteAll() error {
 func (_m *RoleStore) Save(role *model.Role) (*model.Role, error) {
 	ret := _m.Called(role)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.Role
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Role) (*model.Role, error)); ok {
@@ -264,13 +304,12 @@ func (_m *RoleStore) Save(role *model.Role) (*model.Role, error) {
 	return r0, r1
 }
 
-type mockConstructorTestingTNewRoleStore interface {
+// NewRoleStore creates a new instance of RoleStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewRoleStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewRoleStore creates a new instance of RoleStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewRoleStore(t mockConstructorTestingTNewRoleStore) *RoleStore {
+}) *RoleStore {
 	mock := &RoleStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/SchemeStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type SchemeStore struct {
 func (_m *SchemeStore) CountByScope(scope string) (int64, error) {
 	ret := _m.Called(scope)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountByScope")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (int64, error)); ok {
@@ -42,6 +46,10 @@ func (_m *SchemeStore) CountByScope(scope string) (int64, error) {
 func (_m *SchemeStore) CountWithoutPermission(scope string, permissionID string, roleScope model.RoleScope, roleType model.RoleType) (int64, error) {
 	ret := _m.Called(scope, permissionID, roleScope, roleType)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountWithoutPermission")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, model.RoleScope, model.RoleType) (int64, error)); ok {
@@ -66,6 +74,10 @@ func (_m *SchemeStore) CountWithoutPermission(scope string, permissionID string,
 func (_m *SchemeStore) Delete(schemeID string) (*model.Scheme, error) {
 	ret := _m.Called(schemeID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 *model.Scheme
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.Scheme, error)); ok {
@@ -92,6 +104,10 @@ func (_m *SchemeStore) Delete(schemeID string) (*model.Scheme, error) {
 func (_m *SchemeStore) Get(schemeID string) (*model.Scheme, error) {
 	ret := _m.Called(schemeID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.Scheme
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.Scheme, error)); ok {
@@ -118,6 +134,10 @@ func (_m *SchemeStore) Get(schemeID string) (*model.Scheme, error) {
 func (_m *SchemeStore) GetAllPage(scope string, offset int, limit int) ([]*model.Scheme, error) {
 	ret := _m.Called(scope, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllPage")
+	}
+
 	var r0 []*model.Scheme
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int) ([]*model.Scheme, error)); ok {
@@ -144,6 +164,10 @@ func (_m *SchemeStore) GetAllPage(scope string, offset int, limit int) ([]*model
 func (_m *SchemeStore) GetByName(schemeName string) (*model.Scheme, error) {
 	ret := _m.Called(schemeName)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByName")
+	}
+
 	var r0 *model.Scheme
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.Scheme, error)); ok {
@@ -170,6 +194,10 @@ func (_m *SchemeStore) GetByName(schemeName string) (*model.Scheme, error) {
 func (_m *SchemeStore) PermanentDeleteAll() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteAll")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -184,6 +212,10 @@ func (_m *SchemeStore) PermanentDeleteAll() error {
 func (_m *SchemeStore) Save(scheme *model.Scheme) (*model.Scheme, error) {
 	ret := _m.Called(scheme)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.Scheme
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Scheme) (*model.Scheme, error)); ok {
@@ -206,13 +238,12 @@ func (_m *SchemeStore) Save(scheme *model.Scheme) (*model.Scheme, error) {
 	return r0, r1
 }
 
-type mockConstructorTestingTNewSchemeStore interface {
+// NewSchemeStore creates a new instance of SchemeStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewSchemeStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewSchemeStore creates a new instance of SchemeStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewSchemeStore(t mockConstructorTestingTNewSchemeStore) *SchemeStore {
+}) *SchemeStore {
 	mock := &SchemeStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/SessionStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -19,6 +19,10 @@ type SessionStore struct {
 func (_m *SessionStore) AnalyticsSessionCount() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AnalyticsSessionCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -43,6 +47,10 @@ func (_m *SessionStore) AnalyticsSessionCount() (int64, error) {
 func (_m *SessionStore) Cleanup(expiryTime int64, batchSize int64) error {
 	ret := _m.Called(expiryTime, batchSize)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Cleanup")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, int64) error); ok {
 		r0 = rf(expiryTime, batchSize)
@@ -57,6 +65,10 @@ func (_m *SessionStore) Cleanup(expiryTime int64, batchSize int64) error {
 func (_m *SessionStore) Get(c request.CTX, sessionIDOrToken string) (*model.Session, error) {
 	ret := _m.Called(c, sessionIDOrToken)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.Session
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string) (*model.Session, error)); ok {
@@ -83,6 +95,10 @@ func (_m *SessionStore) Get(c request.CTX, sessionIDOrToken string) (*model.Sess
 func (_m *SessionStore) GetLRUSessions(c request.CTX, userID string, limit uint64, offset uint64) ([]*model.Session, error) {
 	ret := _m.Called(c, userID, limit, offset)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetLRUSessions")
+	}
+
 	var r0 []*model.Session
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string, uint64, uint64) ([]*model.Session, error)); ok {
@@ -109,6 +125,10 @@ func (_m *SessionStore) GetLRUSessions(c request.CTX, userID string, limit uint6
 func (_m *SessionStore) GetSessions(c request.CTX, userID string) ([]*model.Session, error) {
 	ret := _m.Called(c, userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSessions")
+	}
+
 	var r0 []*model.Session
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string) ([]*model.Session, error)); ok {
@@ -135,6 +155,10 @@ func (_m *SessionStore) GetSessions(c request.CTX, userID string) ([]*model.Sess
 func (_m *SessionStore) GetSessionsExpired(thresholdMillis int64, mobileOnly bool, unnotifiedOnly bool) ([]*model.Session, error) {
 	ret := _m.Called(thresholdMillis, mobileOnly, unnotifiedOnly)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSessionsExpired")
+	}
+
 	var r0 []*model.Session
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, bool, bool) ([]*model.Session, error)); ok {
@@ -161,6 +185,10 @@ func (_m *SessionStore) GetSessionsExpired(thresholdMillis int64, mobileOnly boo
 func (_m *SessionStore) GetSessionsWithActiveDeviceIds(userID string) ([]*model.Session, error) {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSessionsWithActiveDeviceIds")
+	}
+
 	var r0 []*model.Session
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.Session, error)); ok {
@@ -187,6 +215,10 @@ func (_m *SessionStore) GetSessionsWithActiveDeviceIds(userID string) ([]*model.
 func (_m *SessionStore) PermanentDeleteSessionsByUser(teamID string) error {
 	ret := _m.Called(teamID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteSessionsByUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(teamID)
@@ -201,6 +233,10 @@ func (_m *SessionStore) PermanentDeleteSessionsByUser(teamID string) error {
 func (_m *SessionStore) Remove(sessionIDOrToken string) error {
 	ret := _m.Called(sessionIDOrToken)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Remove")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(sessionIDOrToken)
@@ -215,6 +251,10 @@ func (_m *SessionStore) Remove(sessionIDOrToken string) error {
 func (_m *SessionStore) RemoveAllSessions() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveAllSessions")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -229,6 +269,10 @@ func (_m *SessionStore) RemoveAllSessions() error {
 func (_m *SessionStore) Save(c request.CTX, session *model.Session) (*model.Session, error) {
 	ret := _m.Called(c, session)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.Session
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, *model.Session) (*model.Session, error)); ok {
@@ -255,6 +299,10 @@ func (_m *SessionStore) Save(c request.CTX, session *model.Session) (*model.Sess
 func (_m *SessionStore) UpdateDeviceId(id string, deviceID string, expiresAt int64) (string, error) {
 	ret := _m.Called(id, deviceID, expiresAt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateDeviceId")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, int64) (string, error)); ok {
@@ -279,6 +327,10 @@ func (_m *SessionStore) UpdateDeviceId(id string, deviceID string, expiresAt int
 func (_m *SessionStore) UpdateExpiredNotify(sessionid string, notified bool) error {
 	ret := _m.Called(sessionid, notified)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateExpiredNotify")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, bool) error); ok {
 		r0 = rf(sessionid, notified)
@@ -293,6 +345,10 @@ func (_m *SessionStore) UpdateExpiredNotify(sessionid string, notified bool) err
 func (_m *SessionStore) UpdateExpiresAt(sessionID string, timestamp int64) error {
 	ret := _m.Called(sessionID, timestamp)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateExpiresAt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, int64) error); ok {
 		r0 = rf(sessionID, timestamp)
@@ -307,6 +363,10 @@ func (_m *SessionStore) UpdateExpiresAt(sessionID string, timestamp int64) error
 func (_m *SessionStore) UpdateLastActivityAt(sessionID string, timestamp int64) error {
 	ret := _m.Called(sessionID, timestamp)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateLastActivityAt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, int64) error); ok {
 		r0 = rf(sessionID, timestamp)
@@ -321,6 +381,10 @@ func (_m *SessionStore) UpdateLastActivityAt(sessionID string, timestamp int64)
 func (_m *SessionStore) UpdateProps(session *model.Session) error {
 	ret := _m.Called(session)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateProps")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*model.Session) error); ok {
 		r0 = rf(session)
@@ -335,6 +399,10 @@ func (_m *SessionStore) UpdateProps(session *model.Session) error {
 func (_m *SessionStore) UpdateRoles(userID string, roles string) (string, error) {
 	ret := _m.Called(userID, roles)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateRoles")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (string, error)); ok {
@@ -355,13 +423,12 @@ func (_m *SessionStore) UpdateRoles(userID string, roles string) (string, error)
 	return r0, r1
 }
 
-type mockConstructorTestingTNewSessionStore interface {
+// NewSessionStore creates a new instance of SessionStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewSessionStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewSessionStore creates a new instance of SessionStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewSessionStore(t mockConstructorTestingTNewSessionStore) *SessionStore {
+}) *SessionStore {
 	mock := &SessionStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/SharedChannelStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type SharedChannelStore struct {
 func (_m *SharedChannelStore) Delete(channelId string) (bool, error) {
 	ret := _m.Called(channelId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (bool, error)); ok {
@@ -42,6 +46,10 @@ func (_m *SharedChannelStore) Delete(channelId string) (bool, error) {
 func (_m *SharedChannelStore) DeleteRemote(remoteId string) (bool, error) {
 	ret := _m.Called(remoteId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteRemote")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (bool, error)); ok {
@@ -66,6 +74,10 @@ func (_m *SharedChannelStore) DeleteRemote(remoteId string) (bool, error) {
 func (_m *SharedChannelStore) Get(channelId string) (*model.SharedChannel, error) {
 	ret := _m.Called(channelId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.SharedChannel
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.SharedChannel, error)); ok {
@@ -92,6 +104,10 @@ func (_m *SharedChannelStore) Get(channelId string) (*model.SharedChannel, error
 func (_m *SharedChannelStore) GetAll(offset int, limit int, opts model.SharedChannelFilterOpts) ([]*model.SharedChannel, error) {
 	ret := _m.Called(offset, limit, opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []*model.SharedChannel
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int, int, model.SharedChannelFilterOpts) ([]*model.SharedChannel, error)); ok {
@@ -118,6 +134,10 @@ func (_m *SharedChannelStore) GetAll(offset int, limit int, opts model.SharedCha
 func (_m *SharedChannelStore) GetAllCount(opts model.SharedChannelFilterOpts) (int64, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(model.SharedChannelFilterOpts) (int64, error)); ok {
@@ -142,6 +162,10 @@ func (_m *SharedChannelStore) GetAllCount(opts model.SharedChannelFilterOpts) (i
 func (_m *SharedChannelStore) GetAttachment(fileId string, remoteId string) (*model.SharedChannelAttachment, error) {
 	ret := _m.Called(fileId, remoteId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAttachment")
+	}
+
 	var r0 *model.SharedChannelAttachment
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (*model.SharedChannelAttachment, error)); ok {
@@ -168,6 +192,10 @@ func (_m *SharedChannelStore) GetAttachment(fileId string, remoteId string) (*mo
 func (_m *SharedChannelStore) GetRemote(id string) (*model.SharedChannelRemote, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRemote")
+	}
+
 	var r0 *model.SharedChannelRemote
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.SharedChannelRemote, error)); ok {
@@ -194,6 +222,10 @@ func (_m *SharedChannelStore) GetRemote(id string) (*model.SharedChannelRemote,
 func (_m *SharedChannelStore) GetRemoteByIds(channelId string, remoteId string) (*model.SharedChannelRemote, error) {
 	ret := _m.Called(channelId, remoteId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRemoteByIds")
+	}
+
 	var r0 *model.SharedChannelRemote
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (*model.SharedChannelRemote, error)); ok {
@@ -220,6 +252,10 @@ func (_m *SharedChannelStore) GetRemoteByIds(channelId string, remoteId string)
 func (_m *SharedChannelStore) GetRemoteForUser(remoteId string, userId string) (*model.RemoteCluster, error) {
 	ret := _m.Called(remoteId, userId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRemoteForUser")
+	}
+
 	var r0 *model.RemoteCluster
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (*model.RemoteCluster, error)); ok {
@@ -246,6 +282,10 @@ func (_m *SharedChannelStore) GetRemoteForUser(remoteId string, userId string) (
 func (_m *SharedChannelStore) GetRemotes(opts model.SharedChannelRemoteFilterOpts) ([]*model.SharedChannelRemote, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRemotes")
+	}
+
 	var r0 []*model.SharedChannelRemote
 	var r1 error
 	if rf, ok := ret.Get(0).(func(model.SharedChannelRemoteFilterOpts) ([]*model.SharedChannelRemote, error)); ok {
@@ -272,6 +312,10 @@ func (_m *SharedChannelStore) GetRemotes(opts model.SharedChannelRemoteFilterOpt
 func (_m *SharedChannelStore) GetRemotesStatus(channelId string) ([]*model.SharedChannelRemoteStatus, error) {
 	ret := _m.Called(channelId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRemotesStatus")
+	}
+
 	var r0 []*model.SharedChannelRemoteStatus
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.SharedChannelRemoteStatus, error)); ok {
@@ -298,6 +342,10 @@ func (_m *SharedChannelStore) GetRemotesStatus(channelId string) ([]*model.Share
 func (_m *SharedChannelStore) GetSingleUser(userID string, channelID string, remoteID string) (*model.SharedChannelUser, error) {
 	ret := _m.Called(userID, channelID, remoteID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSingleUser")
+	}
+
 	var r0 *model.SharedChannelUser
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, string) (*model.SharedChannelUser, error)); ok {
@@ -324,6 +372,10 @@ func (_m *SharedChannelStore) GetSingleUser(userID string, channelID string, rem
 func (_m *SharedChannelStore) GetUsersForSync(filter model.GetUsersForSyncFilter) ([]*model.User, error) {
 	ret := _m.Called(filter)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUsersForSync")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(model.GetUsersForSyncFilter) ([]*model.User, error)); ok {
@@ -350,6 +402,10 @@ func (_m *SharedChannelStore) GetUsersForSync(filter model.GetUsersForSyncFilter
 func (_m *SharedChannelStore) GetUsersForUser(userID string) ([]*model.SharedChannelUser, error) {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUsersForUser")
+	}
+
 	var r0 []*model.SharedChannelUser
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.SharedChannelUser, error)); ok {
@@ -376,6 +432,10 @@ func (_m *SharedChannelStore) GetUsersForUser(userID string) ([]*model.SharedCha
 func (_m *SharedChannelStore) HasChannel(channelID string) (bool, error) {
 	ret := _m.Called(channelID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HasChannel")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (bool, error)); ok {
@@ -400,6 +460,10 @@ func (_m *SharedChannelStore) HasChannel(channelID string) (bool, error) {
 func (_m *SharedChannelStore) HasRemote(channelID string, remoteId string) (bool, error) {
 	ret := _m.Called(channelID, remoteId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HasRemote")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (bool, error)); ok {
@@ -424,6 +488,10 @@ func (_m *SharedChannelStore) HasRemote(channelID string, remoteId string) (bool
 func (_m *SharedChannelStore) Save(sc *model.SharedChannel) (*model.SharedChannel, error) {
 	ret := _m.Called(sc)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.SharedChannel
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.SharedChannel) (*model.SharedChannel, error)); ok {
@@ -450,6 +518,10 @@ func (_m *SharedChannelStore) Save(sc *model.SharedChannel) (*model.SharedChanne
 func (_m *SharedChannelStore) SaveAttachment(remote *model.SharedChannelAttachment) (*model.SharedChannelAttachment, error) {
 	ret := _m.Called(remote)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveAttachment")
+	}
+
 	var r0 *model.SharedChannelAttachment
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.SharedChannelAttachment) (*model.SharedChannelAttachment, error)); ok {
@@ -476,6 +548,10 @@ func (_m *SharedChannelStore) SaveAttachment(remote *model.SharedChannelAttachme
 func (_m *SharedChannelStore) SaveRemote(remote *model.SharedChannelRemote) (*model.SharedChannelRemote, error) {
 	ret := _m.Called(remote)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveRemote")
+	}
+
 	var r0 *model.SharedChannelRemote
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.SharedChannelRemote) (*model.SharedChannelRemote, error)); ok {
@@ -502,6 +578,10 @@ func (_m *SharedChannelStore) SaveRemote(remote *model.SharedChannelRemote) (*mo
 func (_m *SharedChannelStore) SaveUser(remote *model.SharedChannelUser) (*model.SharedChannelUser, error) {
 	ret := _m.Called(remote)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveUser")
+	}
+
 	var r0 *model.SharedChannelUser
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.SharedChannelUser) (*model.SharedChannelUser, error)); ok {
@@ -528,6 +608,10 @@ func (_m *SharedChannelStore) SaveUser(remote *model.SharedChannelUser) (*model.
 func (_m *SharedChannelStore) Update(sc *model.SharedChannel) (*model.SharedChannel, error) {
 	ret := _m.Called(sc)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
 	var r0 *model.SharedChannel
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.SharedChannel) (*model.SharedChannel, error)); ok {
@@ -554,6 +638,10 @@ func (_m *SharedChannelStore) Update(sc *model.SharedChannel) (*model.SharedChan
 func (_m *SharedChannelStore) UpdateAttachmentLastSyncAt(id string, syncTime int64) error {
 	ret := _m.Called(id, syncTime)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateAttachmentLastSyncAt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, int64) error); ok {
 		r0 = rf(id, syncTime)
@@ -568,6 +656,10 @@ func (_m *SharedChannelStore) UpdateAttachmentLastSyncAt(id string, syncTime int
 func (_m *SharedChannelStore) UpdateRemote(remote *model.SharedChannelRemote) (*model.SharedChannelRemote, error) {
 	ret := _m.Called(remote)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateRemote")
+	}
+
 	var r0 *model.SharedChannelRemote
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.SharedChannelRemote) (*model.SharedChannelRemote, error)); ok {
@@ -594,6 +686,10 @@ func (_m *SharedChannelStore) UpdateRemote(remote *model.SharedChannelRemote) (*
 func (_m *SharedChannelStore) UpdateRemoteCursor(id string, cursor model.GetPostsSinceForSyncCursor) error {
 	ret := _m.Called(id, cursor)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateRemoteCursor")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, model.GetPostsSinceForSyncCursor) error); ok {
 		r0 = rf(id, cursor)
@@ -608,6 +704,10 @@ func (_m *SharedChannelStore) UpdateRemoteCursor(id string, cursor model.GetPost
 func (_m *SharedChannelStore) UpdateUserLastSyncAt(userID string, channelID string, remoteID string) error {
 	ret := _m.Called(userID, channelID, remoteID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateUserLastSyncAt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, string) error); ok {
 		r0 = rf(userID, channelID, remoteID)
@@ -622,6 +722,10 @@ func (_m *SharedChannelStore) UpdateUserLastSyncAt(userID string, channelID stri
 func (_m *SharedChannelStore) UpsertAttachment(remote *model.SharedChannelAttachment) (string, error) {
 	ret := _m.Called(remote)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpsertAttachment")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.SharedChannelAttachment) (string, error)); ok {
@@ -642,13 +746,12 @@ func (_m *SharedChannelStore) UpsertAttachment(remote *model.SharedChannelAttach
 	return r0, r1
 }
 
-type mockConstructorTestingTNewSharedChannelStore interface {
+// NewSharedChannelStore creates a new instance of SharedChannelStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewSharedChannelStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewSharedChannelStore creates a new instance of SharedChannelStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewSharedChannelStore(t mockConstructorTestingTNewSharedChannelStore) *SharedChannelStore {
+}) *SharedChannelStore {
 	mock := &SharedChannelStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/StatusStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type StatusStore struct {
 func (_m *StatusStore) Get(userID string) (*model.Status, error) {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.Status
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.Status, error)); ok {
@@ -44,6 +48,10 @@ func (_m *StatusStore) Get(userID string) (*model.Status, error) {
 func (_m *StatusStore) GetByIds(userIds []string) ([]*model.Status, error) {
 	ret := _m.Called(userIds)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByIds")
+	}
+
 	var r0 []*model.Status
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]string) ([]*model.Status, error)); ok {
@@ -70,6 +78,10 @@ func (_m *StatusStore) GetByIds(userIds []string) ([]*model.Status, error) {
 func (_m *StatusStore) GetTotalActiveUsersCount() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTotalActiveUsersCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -94,6 +106,10 @@ func (_m *StatusStore) GetTotalActiveUsersCount() (int64, error) {
 func (_m *StatusStore) ResetAll() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ResetAll")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -108,6 +124,10 @@ func (_m *StatusStore) ResetAll() error {
 func (_m *StatusStore) SaveOrUpdate(status *model.Status) error {
 	ret := _m.Called(status)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveOrUpdate")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*model.Status) error); ok {
 		r0 = rf(status)
@@ -122,6 +142,10 @@ func (_m *StatusStore) SaveOrUpdate(status *model.Status) error {
 func (_m *StatusStore) UpdateExpiredDNDStatuses() ([]*model.Status, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateExpiredDNDStatuses")
+	}
+
 	var r0 []*model.Status
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]*model.Status, error)); ok {
@@ -148,6 +172,10 @@ func (_m *StatusStore) UpdateExpiredDNDStatuses() ([]*model.Status, error) {
 func (_m *StatusStore) UpdateLastActivityAt(userID string, lastActivityAt int64) error {
 	ret := _m.Called(userID, lastActivityAt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateLastActivityAt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, int64) error); ok {
 		r0 = rf(userID, lastActivityAt)
@@ -158,13 +186,12 @@ func (_m *StatusStore) UpdateLastActivityAt(userID string, lastActivityAt int64)
 	return r0
 }
 
-type mockConstructorTestingTNewStatusStore interface {
+// NewStatusStore creates a new instance of StatusStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewStatusStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewStatusStore creates a new instance of StatusStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewStatusStore(t mockConstructorTestingTNewStatusStore) *StatusStore {
+}) *StatusStore {
 	mock := &StatusStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/Store.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -28,6 +28,10 @@ type Store struct {
 func (_m *Store) Audit() store.AuditStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Audit")
+	}
+
 	var r0 store.AuditStore
 	if rf, ok := ret.Get(0).(func() store.AuditStore); ok {
 		r0 = rf()
@@ -44,6 +48,10 @@ func (_m *Store) Audit() store.AuditStore {
 func (_m *Store) Bot() store.BotStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Bot")
+	}
+
 	var r0 store.BotStore
 	if rf, ok := ret.Get(0).(func() store.BotStore); ok {
 		r0 = rf()
@@ -60,6 +68,10 @@ func (_m *Store) Bot() store.BotStore {
 func (_m *Store) Channel() store.ChannelStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Channel")
+	}
+
 	var r0 store.ChannelStore
 	if rf, ok := ret.Get(0).(func() store.ChannelStore); ok {
 		r0 = rf()
@@ -76,6 +88,10 @@ func (_m *Store) Channel() store.ChannelStore {
 func (_m *Store) ChannelBookmark() store.ChannelBookmarkStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChannelBookmark")
+	}
+
 	var r0 store.ChannelBookmarkStore
 	if rf, ok := ret.Get(0).(func() store.ChannelBookmarkStore); ok {
 		r0 = rf()
@@ -92,6 +108,10 @@ func (_m *Store) ChannelBookmark() store.ChannelBookmarkStore {
 func (_m *Store) ChannelMemberHistory() store.ChannelMemberHistoryStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChannelMemberHistory")
+	}
+
 	var r0 store.ChannelMemberHistoryStore
 	if rf, ok := ret.Get(0).(func() store.ChannelMemberHistoryStore); ok {
 		r0 = rf()
@@ -108,6 +128,10 @@ func (_m *Store) ChannelMemberHistory() store.ChannelMemberHistoryStore {
 func (_m *Store) CheckIntegrity() <-chan model.IntegrityCheckResult {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CheckIntegrity")
+	}
+
 	var r0 <-chan model.IntegrityCheckResult
 	if rf, ok := ret.Get(0).(func() <-chan model.IntegrityCheckResult); ok {
 		r0 = rf()
@@ -129,6 +153,10 @@ func (_m *Store) Close() {
 func (_m *Store) ClusterDiscovery() store.ClusterDiscoveryStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ClusterDiscovery")
+	}
+
 	var r0 store.ClusterDiscoveryStore
 	if rf, ok := ret.Get(0).(func() store.ClusterDiscoveryStore); ok {
 		r0 = rf()
@@ -145,6 +173,10 @@ func (_m *Store) ClusterDiscovery() store.ClusterDiscoveryStore {
 func (_m *Store) Command() store.CommandStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Command")
+	}
+
 	var r0 store.CommandStore
 	if rf, ok := ret.Get(0).(func() store.CommandStore); ok {
 		r0 = rf()
@@ -161,6 +193,10 @@ func (_m *Store) Command() store.CommandStore {
 func (_m *Store) CommandWebhook() store.CommandWebhookStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CommandWebhook")
+	}
+
 	var r0 store.CommandWebhookStore
 	if rf, ok := ret.Get(0).(func() store.CommandWebhookStore); ok {
 		r0 = rf()
@@ -177,6 +213,10 @@ func (_m *Store) CommandWebhook() store.CommandWebhookStore {
 func (_m *Store) Compliance() store.ComplianceStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Compliance")
+	}
+
 	var r0 store.ComplianceStore
 	if rf, ok := ret.Get(0).(func() store.ComplianceStore); ok {
 		r0 = rf()
@@ -193,6 +233,10 @@ func (_m *Store) Compliance() store.ComplianceStore {
 func (_m *Store) Context() context.Context {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Context")
+	}
+
 	var r0 context.Context
 	if rf, ok := ret.Get(0).(func() context.Context); ok {
 		r0 = rf()
@@ -209,6 +253,10 @@ func (_m *Store) Context() context.Context {
 func (_m *Store) DesktopTokens() store.DesktopTokensStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DesktopTokens")
+	}
+
 	var r0 store.DesktopTokensStore
 	if rf, ok := ret.Get(0).(func() store.DesktopTokensStore); ok {
 		r0 = rf()
@@ -225,6 +273,10 @@ func (_m *Store) DesktopTokens() store.DesktopTokensStore {
 func (_m *Store) Draft() store.DraftStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Draft")
+	}
+
 	var r0 store.DraftStore
 	if rf, ok := ret.Get(0).(func() store.DraftStore); ok {
 		r0 = rf()
@@ -246,6 +298,10 @@ func (_m *Store) DropAllTables() {
 func (_m *Store) Emoji() store.EmojiStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Emoji")
+	}
+
 	var r0 store.EmojiStore
 	if rf, ok := ret.Get(0).(func() store.EmojiStore); ok {
 		r0 = rf()
@@ -262,6 +318,10 @@ func (_m *Store) Emoji() store.EmojiStore {
 func (_m *Store) FileInfo() store.FileInfoStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FileInfo")
+	}
+
 	var r0 store.FileInfoStore
 	if rf, ok := ret.Get(0).(func() store.FileInfoStore); ok {
 		r0 = rf()
@@ -278,6 +338,10 @@ func (_m *Store) FileInfo() store.FileInfoStore {
 func (_m *Store) GetAppliedMigrations() ([]model.AppliedMigration, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAppliedMigrations")
+	}
+
 	var r0 []model.AppliedMigration
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]model.AppliedMigration, error)); ok {
@@ -304,6 +368,10 @@ func (_m *Store) GetAppliedMigrations() ([]model.AppliedMigration, error) {
 func (_m *Store) GetDBSchemaVersion() (int, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetDBSchemaVersion")
+	}
+
 	var r0 int
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int, error)); ok {
@@ -328,6 +396,10 @@ func (_m *Store) GetDBSchemaVersion() (int, error) {
 func (_m *Store) GetDbVersion(numerical bool) (string, error) {
 	ret := _m.Called(numerical)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetDbVersion")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(bool) (string, error)); ok {
@@ -352,6 +424,10 @@ func (_m *Store) GetDbVersion(numerical bool) (string, error) {
 func (_m *Store) GetInternalMasterDB() *sql.DB {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetInternalMasterDB")
+	}
+
 	var r0 *sql.DB
 	if rf, ok := ret.Get(0).(func() *sql.DB); ok {
 		r0 = rf()
@@ -368,6 +444,10 @@ func (_m *Store) GetInternalMasterDB() *sql.DB {
 func (_m *Store) GetInternalReplicaDB() *sql.DB {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetInternalReplicaDB")
+	}
+
 	var r0 *sql.DB
 	if rf, ok := ret.Get(0).(func() *sql.DB); ok {
 		r0 = rf()
@@ -384,6 +464,10 @@ func (_m *Store) GetInternalReplicaDB() *sql.DB {
 func (_m *Store) GetLocalSchemaVersion() (int, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetLocalSchemaVersion")
+	}
+
 	var r0 int
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int, error)); ok {
@@ -408,6 +492,10 @@ func (_m *Store) GetLocalSchemaVersion() (int, error) {
 func (_m *Store) Group() store.GroupStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Group")
+	}
+
 	var r0 store.GroupStore
 	if rf, ok := ret.Get(0).(func() store.GroupStore); ok {
 		r0 = rf()
@@ -424,6 +512,10 @@ func (_m *Store) Group() store.GroupStore {
 func (_m *Store) Job() store.JobStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Job")
+	}
+
 	var r0 store.JobStore
 	if rf, ok := ret.Get(0).(func() store.JobStore); ok {
 		r0 = rf()
@@ -440,6 +532,10 @@ func (_m *Store) Job() store.JobStore {
 func (_m *Store) License() store.LicenseStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for License")
+	}
+
 	var r0 store.LicenseStore
 	if rf, ok := ret.Get(0).(func() store.LicenseStore); ok {
 		r0 = rf()
@@ -456,6 +552,10 @@ func (_m *Store) License() store.LicenseStore {
 func (_m *Store) LinkMetadata() store.LinkMetadataStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LinkMetadata")
+	}
+
 	var r0 store.LinkMetadataStore
 	if rf, ok := ret.Get(0).(func() store.LinkMetadataStore); ok {
 		r0 = rf()
@@ -477,6 +577,10 @@ func (_m *Store) LockToMaster() {
 func (_m *Store) Logger() mlog.LoggerIFace {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Logger")
+	}
+
 	var r0 mlog.LoggerIFace
 	if rf, ok := ret.Get(0).(func() mlog.LoggerIFace); ok {
 		r0 = rf()
@@ -498,6 +602,10 @@ func (_m *Store) MarkSystemRanUnitTests() {
 func (_m *Store) NotifyAdmin() store.NotifyAdminStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for NotifyAdmin")
+	}
+
 	var r0 store.NotifyAdminStore
 	if rf, ok := ret.Get(0).(func() store.NotifyAdminStore); ok {
 		r0 = rf()
@@ -514,6 +622,10 @@ func (_m *Store) NotifyAdmin() store.NotifyAdminStore {
 func (_m *Store) OAuth() store.OAuthStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for OAuth")
+	}
+
 	var r0 store.OAuthStore
 	if rf, ok := ret.Get(0).(func() store.OAuthStore); ok {
 		r0 = rf()
@@ -530,6 +642,10 @@ func (_m *Store) OAuth() store.OAuthStore {
 func (_m *Store) OutgoingOAuthConnection() store.OutgoingOAuthConnectionStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for OutgoingOAuthConnection")
+	}
+
 	var r0 store.OutgoingOAuthConnectionStore
 	if rf, ok := ret.Get(0).(func() store.OutgoingOAuthConnectionStore); ok {
 		r0 = rf()
@@ -546,6 +662,10 @@ func (_m *Store) OutgoingOAuthConnection() store.OutgoingOAuthConnectionStore {
 func (_m *Store) Plugin() store.PluginStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Plugin")
+	}
+
 	var r0 store.PluginStore
 	if rf, ok := ret.Get(0).(func() store.PluginStore); ok {
 		r0 = rf()
@@ -562,6 +682,10 @@ func (_m *Store) Plugin() store.PluginStore {
 func (_m *Store) Post() store.PostStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Post")
+	}
+
 	var r0 store.PostStore
 	if rf, ok := ret.Get(0).(func() store.PostStore); ok {
 		r0 = rf()
@@ -578,6 +702,10 @@ func (_m *Store) Post() store.PostStore {
 func (_m *Store) PostAcknowledgement() store.PostAcknowledgementStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for PostAcknowledgement")
+	}
+
 	var r0 store.PostAcknowledgementStore
 	if rf, ok := ret.Get(0).(func() store.PostAcknowledgementStore); ok {
 		r0 = rf()
@@ -594,6 +722,10 @@ func (_m *Store) PostAcknowledgement() store.PostAcknowledgementStore {
 func (_m *Store) PostPersistentNotification() store.PostPersistentNotificationStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for PostPersistentNotification")
+	}
+
 	var r0 store.PostPersistentNotificationStore
 	if rf, ok := ret.Get(0).(func() store.PostPersistentNotificationStore); ok {
 		r0 = rf()
@@ -610,6 +742,10 @@ func (_m *Store) PostPersistentNotification() store.PostPersistentNotificationSt
 func (_m *Store) PostPriority() store.PostPriorityStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for PostPriority")
+	}
+
 	var r0 store.PostPriorityStore
 	if rf, ok := ret.Get(0).(func() store.PostPriorityStore); ok {
 		r0 = rf()
@@ -626,6 +762,10 @@ func (_m *Store) PostPriority() store.PostPriorityStore {
 func (_m *Store) Preference() store.PreferenceStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Preference")
+	}
+
 	var r0 store.PreferenceStore
 	if rf, ok := ret.Get(0).(func() store.PreferenceStore); ok {
 		r0 = rf()
@@ -642,6 +782,10 @@ func (_m *Store) Preference() store.PreferenceStore {
 func (_m *Store) ProductNotices() store.ProductNoticesStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ProductNotices")
+	}
+
 	var r0 store.ProductNoticesStore
 	if rf, ok := ret.Get(0).(func() store.ProductNoticesStore); ok {
 		r0 = rf()
@@ -658,6 +802,10 @@ func (_m *Store) ProductNotices() store.ProductNoticesStore {
 func (_m *Store) Reaction() store.ReactionStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Reaction")
+	}
+
 	var r0 store.ReactionStore
 	if rf, ok := ret.Get(0).(func() store.ReactionStore); ok {
 		r0 = rf()
@@ -679,6 +827,10 @@ func (_m *Store) RecycleDBConnections(d time.Duration) {
 func (_m *Store) RemoteCluster() store.RemoteClusterStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoteCluster")
+	}
+
 	var r0 store.RemoteClusterStore
 	if rf, ok := ret.Get(0).(func() store.RemoteClusterStore); ok {
 		r0 = rf()
@@ -695,6 +847,10 @@ func (_m *Store) RemoteCluster() store.RemoteClusterStore {
 func (_m *Store) ReplicaLagAbs() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ReplicaLagAbs")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -709,6 +865,10 @@ func (_m *Store) ReplicaLagAbs() error {
 func (_m *Store) ReplicaLagTime() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ReplicaLagTime")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -723,6 +883,10 @@ func (_m *Store) ReplicaLagTime() error {
 func (_m *Store) RetentionPolicy() store.RetentionPolicyStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for RetentionPolicy")
+	}
+
 	var r0 store.RetentionPolicyStore
 	if rf, ok := ret.Get(0).(func() store.RetentionPolicyStore); ok {
 		r0 = rf()
@@ -739,6 +903,10 @@ func (_m *Store) RetentionPolicy() store.RetentionPolicyStore {
 func (_m *Store) Role() store.RoleStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Role")
+	}
+
 	var r0 store.RoleStore
 	if rf, ok := ret.Get(0).(func() store.RoleStore); ok {
 		r0 = rf()
@@ -755,6 +923,10 @@ func (_m *Store) Role() store.RoleStore {
 func (_m *Store) Scheme() store.SchemeStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Scheme")
+	}
+
 	var r0 store.SchemeStore
 	if rf, ok := ret.Get(0).(func() store.SchemeStore); ok {
 		r0 = rf()
@@ -771,6 +943,10 @@ func (_m *Store) Scheme() store.SchemeStore {
 func (_m *Store) Session() store.SessionStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Session")
+	}
+
 	var r0 store.SessionStore
 	if rf, ok := ret.Get(0).(func() store.SessionStore); ok {
 		r0 = rf()
@@ -792,6 +968,10 @@ func (_m *Store) SetContext(_a0 context.Context) {
 func (_m *Store) SharedChannel() store.SharedChannelStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SharedChannel")
+	}
+
 	var r0 store.SharedChannelStore
 	if rf, ok := ret.Get(0).(func() store.SharedChannelStore); ok {
 		r0 = rf()
@@ -808,6 +988,10 @@ func (_m *Store) SharedChannel() store.SharedChannelStore {
 func (_m *Store) Status() store.StatusStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Status")
+	}
+
 	var r0 store.StatusStore
 	if rf, ok := ret.Get(0).(func() store.StatusStore); ok {
 		r0 = rf()
@@ -824,6 +1008,10 @@ func (_m *Store) Status() store.StatusStore {
 func (_m *Store) System() store.SystemStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for System")
+	}
+
 	var r0 store.SystemStore
 	if rf, ok := ret.Get(0).(func() store.SystemStore); ok {
 		r0 = rf()
@@ -840,6 +1028,10 @@ func (_m *Store) System() store.SystemStore {
 func (_m *Store) Team() store.TeamStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Team")
+	}
+
 	var r0 store.TeamStore
 	if rf, ok := ret.Get(0).(func() store.TeamStore); ok {
 		r0 = rf()
@@ -856,6 +1048,10 @@ func (_m *Store) Team() store.TeamStore {
 func (_m *Store) TermsOfService() store.TermsOfServiceStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TermsOfService")
+	}
+
 	var r0 store.TermsOfServiceStore
 	if rf, ok := ret.Get(0).(func() store.TermsOfServiceStore); ok {
 		r0 = rf()
@@ -872,6 +1068,10 @@ func (_m *Store) TermsOfService() store.TermsOfServiceStore {
 func (_m *Store) Thread() store.ThreadStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Thread")
+	}
+
 	var r0 store.ThreadStore
 	if rf, ok := ret.Get(0).(func() store.ThreadStore); ok {
 		r0 = rf()
@@ -888,6 +1088,10 @@ func (_m *Store) Thread() store.ThreadStore {
 func (_m *Store) Token() store.TokenStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Token")
+	}
+
 	var r0 store.TokenStore
 	if rf, ok := ret.Get(0).(func() store.TokenStore); ok {
 		r0 = rf()
@@ -904,6 +1108,10 @@ func (_m *Store) Token() store.TokenStore {
 func (_m *Store) TotalMasterDbConnections() int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TotalMasterDbConnections")
+	}
+
 	var r0 int
 	if rf, ok := ret.Get(0).(func() int); ok {
 		r0 = rf()
@@ -918,6 +1126,10 @@ func (_m *Store) TotalMasterDbConnections() int {
 func (_m *Store) TotalReadDbConnections() int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TotalReadDbConnections")
+	}
+
 	var r0 int
 	if rf, ok := ret.Get(0).(func() int); ok {
 		r0 = rf()
@@ -932,6 +1144,10 @@ func (_m *Store) TotalReadDbConnections() int {
 func (_m *Store) TotalSearchDbConnections() int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TotalSearchDbConnections")
+	}
+
 	var r0 int
 	if rf, ok := ret.Get(0).(func() int); ok {
 		r0 = rf()
@@ -946,6 +1162,10 @@ func (_m *Store) TotalSearchDbConnections() int {
 func (_m *Store) TrueUpReview() store.TrueUpReviewStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TrueUpReview")
+	}
+
 	var r0 store.TrueUpReviewStore
 	if rf, ok := ret.Get(0).(func() store.TrueUpReviewStore); ok {
 		r0 = rf()
@@ -967,6 +1187,10 @@ func (_m *Store) UnlockFromMaster() {
 func (_m *Store) UploadSession() store.UploadSessionStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for UploadSession")
+	}
+
 	var r0 store.UploadSessionStore
 	if rf, ok := ret.Get(0).(func() store.UploadSessionStore); ok {
 		r0 = rf()
@@ -983,6 +1207,10 @@ func (_m *Store) UploadSession() store.UploadSessionStore {
 func (_m *Store) User() store.UserStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for User")
+	}
+
 	var r0 store.UserStore
 	if rf, ok := ret.Get(0).(func() store.UserStore); ok {
 		r0 = rf()
@@ -999,6 +1227,10 @@ func (_m *Store) User() store.UserStore {
 func (_m *Store) UserAccessToken() store.UserAccessTokenStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for UserAccessToken")
+	}
+
 	var r0 store.UserAccessTokenStore
 	if rf, ok := ret.Get(0).(func() store.UserAccessTokenStore); ok {
 		r0 = rf()
@@ -1015,6 +1247,10 @@ func (_m *Store) UserAccessToken() store.UserAccessTokenStore {
 func (_m *Store) UserTermsOfService() store.UserTermsOfServiceStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for UserTermsOfService")
+	}
+
 	var r0 store.UserTermsOfServiceStore
 	if rf, ok := ret.Get(0).(func() store.UserTermsOfServiceStore); ok {
 		r0 = rf()
@@ -1031,6 +1267,10 @@ func (_m *Store) UserTermsOfService() store.UserTermsOfServiceStore {
 func (_m *Store) Webhook() store.WebhookStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Webhook")
+	}
+
 	var r0 store.WebhookStore
 	if rf, ok := ret.Get(0).(func() store.WebhookStore); ok {
 		r0 = rf()
@@ -1043,13 +1283,12 @@ func (_m *Store) Webhook() store.WebhookStore {
 	return r0
 }
 
-type mockConstructorTestingTNewStore interface {
+// NewStore creates a new instance of Store. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewStore creates a new instance of Store. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewStore(t mockConstructorTestingTNewStore) *Store {
+}) *Store {
 	mock := &Store{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/SystemStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type SystemStore struct {
 func (_m *SystemStore) Get() (model.StringMap, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 model.StringMap
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (model.StringMap, error)); ok {
@@ -44,6 +48,10 @@ func (_m *SystemStore) Get() (model.StringMap, error) {
 func (_m *SystemStore) GetByName(name string) (*model.System, error) {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByName")
+	}
+
 	var r0 *model.System
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.System, error)); ok {
@@ -70,6 +78,10 @@ func (_m *SystemStore) GetByName(name string) (*model.System, error) {
 func (_m *SystemStore) InsertIfExists(system *model.System) (*model.System, error) {
 	ret := _m.Called(system)
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsertIfExists")
+	}
+
 	var r0 *model.System
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.System) (*model.System, error)); ok {
@@ -96,6 +108,10 @@ func (_m *SystemStore) InsertIfExists(system *model.System) (*model.System, erro
 func (_m *SystemStore) PermanentDeleteByName(name string) (*model.System, error) {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteByName")
+	}
+
 	var r0 *model.System
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.System, error)); ok {
@@ -122,6 +138,10 @@ func (_m *SystemStore) PermanentDeleteByName(name string) (*model.System, error)
 func (_m *SystemStore) Save(system *model.System) error {
 	ret := _m.Called(system)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*model.System) error); ok {
 		r0 = rf(system)
@@ -136,6 +156,10 @@ func (_m *SystemStore) Save(system *model.System) error {
 func (_m *SystemStore) SaveOrUpdate(system *model.System) error {
 	ret := _m.Called(system)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveOrUpdate")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*model.System) error); ok {
 		r0 = rf(system)
@@ -150,6 +174,10 @@ func (_m *SystemStore) SaveOrUpdate(system *model.System) error {
 func (_m *SystemStore) Update(system *model.System) error {
 	ret := _m.Called(system)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*model.System) error); ok {
 		r0 = rf(system)
@@ -160,13 +188,12 @@ func (_m *SystemStore) Update(system *model.System) error {
 	return r0
 }
 
-type mockConstructorTestingTNewSystemStore interface {
+// NewSystemStore creates a new instance of SystemStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewSystemStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewSystemStore creates a new instance of SystemStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewSystemStore(t mockConstructorTestingTNewSystemStore) *SystemStore {
+}) *SystemStore {
 	mock := &SystemStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/TeamStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -19,6 +19,10 @@ type TeamStore struct {
 func (_m *TeamStore) AnalyticsGetTeamCountForScheme(schemeID string) (int64, error) {
 	ret := _m.Called(schemeID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AnalyticsGetTeamCountForScheme")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (int64, error)); ok {
@@ -43,6 +47,10 @@ func (_m *TeamStore) AnalyticsGetTeamCountForScheme(schemeID string) (int64, err
 func (_m *TeamStore) AnalyticsTeamCount(opts *model.TeamSearch) (int64, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AnalyticsTeamCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.TeamSearch) (int64, error)); ok {
@@ -67,6 +75,10 @@ func (_m *TeamStore) AnalyticsTeamCount(opts *model.TeamSearch) (int64, error) {
 func (_m *TeamStore) ClearAllCustomRoleAssignments() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ClearAllCustomRoleAssignments")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -86,6 +98,10 @@ func (_m *TeamStore) ClearCaches() {
 func (_m *TeamStore) Get(id string) (*model.Team, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.Team
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.Team, error)); ok {
@@ -112,6 +128,10 @@ func (_m *TeamStore) Get(id string) (*model.Team, error) {
 func (_m *TeamStore) GetActiveMemberCount(teamID string, restrictions *model.ViewUsersRestrictions) (int64, error) {
 	ret := _m.Called(teamID, restrictions)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetActiveMemberCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, *model.ViewUsersRestrictions) (int64, error)); ok {
@@ -136,6 +156,10 @@ func (_m *TeamStore) GetActiveMemberCount(teamID string, restrictions *model.Vie
 func (_m *TeamStore) GetAll() ([]*model.Team, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []*model.Team
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]*model.Team, error)); ok {
@@ -162,6 +186,10 @@ func (_m *TeamStore) GetAll() ([]*model.Team, error) {
 func (_m *TeamStore) GetAllForExportAfter(limit int, afterID string) ([]*model.TeamForExport, error) {
 	ret := _m.Called(limit, afterID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllForExportAfter")
+	}
+
 	var r0 []*model.TeamForExport
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int, string) ([]*model.TeamForExport, error)); ok {
@@ -188,6 +216,10 @@ func (_m *TeamStore) GetAllForExportAfter(limit int, afterID string) ([]*model.T
 func (_m *TeamStore) GetAllPage(offset int, limit int, opts *model.TeamSearch) ([]*model.Team, error) {
 	ret := _m.Called(offset, limit, opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllPage")
+	}
+
 	var r0 []*model.Team
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int, int, *model.TeamSearch) ([]*model.Team, error)); ok {
@@ -214,6 +246,10 @@ func (_m *TeamStore) GetAllPage(offset int, limit int, opts *model.TeamSearch) (
 func (_m *TeamStore) GetAllPrivateTeamListing() ([]*model.Team, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllPrivateTeamListing")
+	}
+
 	var r0 []*model.Team
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]*model.Team, error)); ok {
@@ -240,6 +276,10 @@ func (_m *TeamStore) GetAllPrivateTeamListing() ([]*model.Team, error) {
 func (_m *TeamStore) GetAllTeamListing() ([]*model.Team, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllTeamListing")
+	}
+
 	var r0 []*model.Team
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]*model.Team, error)); ok {
@@ -266,6 +306,10 @@ func (_m *TeamStore) GetAllTeamListing() ([]*model.Team, error) {
 func (_m *TeamStore) GetByEmptyInviteID() ([]*model.Team, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByEmptyInviteID")
+	}
+
 	var r0 []*model.Team
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]*model.Team, error)); ok {
@@ -292,6 +336,10 @@ func (_m *TeamStore) GetByEmptyInviteID() ([]*model.Team, error) {
 func (_m *TeamStore) GetByInviteId(inviteID string) (*model.Team, error) {
 	ret := _m.Called(inviteID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByInviteId")
+	}
+
 	var r0 *model.Team
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.Team, error)); ok {
@@ -318,6 +366,10 @@ func (_m *TeamStore) GetByInviteId(inviteID string) (*model.Team, error) {
 func (_m *TeamStore) GetByName(name string) (*model.Team, error) {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByName")
+	}
+
 	var r0 *model.Team
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.Team, error)); ok {
@@ -344,6 +396,10 @@ func (_m *TeamStore) GetByName(name string) (*model.Team, error) {
 func (_m *TeamStore) GetByNames(name []string) ([]*model.Team, error) {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByNames")
+	}
+
 	var r0 []*model.Team
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]string) ([]*model.Team, error)); ok {
@@ -370,6 +426,10 @@ func (_m *TeamStore) GetByNames(name []string) ([]*model.Team, error) {
 func (_m *TeamStore) GetChannelUnreadsForAllTeams(excludeTeamID string, userID string) ([]*model.ChannelUnread, error) {
 	ret := _m.Called(excludeTeamID, userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetChannelUnreadsForAllTeams")
+	}
+
 	var r0 []*model.ChannelUnread
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]*model.ChannelUnread, error)); ok {
@@ -396,6 +456,10 @@ func (_m *TeamStore) GetChannelUnreadsForAllTeams(excludeTeamID string, userID s
 func (_m *TeamStore) GetChannelUnreadsForTeam(teamID string, userID string) ([]*model.ChannelUnread, error) {
 	ret := _m.Called(teamID, userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetChannelUnreadsForTeam")
+	}
+
 	var r0 []*model.ChannelUnread
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]*model.ChannelUnread, error)); ok {
@@ -422,6 +486,10 @@ func (_m *TeamStore) GetChannelUnreadsForTeam(teamID string, userID string) ([]*
 func (_m *TeamStore) GetCommonTeamIDsForMultipleUsers(userIDs []string) ([]string, error) {
 	ret := _m.Called(userIDs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetCommonTeamIDsForMultipleUsers")
+	}
+
 	var r0 []string
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]string) ([]string, error)); ok {
@@ -448,6 +516,10 @@ func (_m *TeamStore) GetCommonTeamIDsForMultipleUsers(userIDs []string) ([]strin
 func (_m *TeamStore) GetCommonTeamIDsForTwoUsers(userID string, otherUserID string) ([]string, error) {
 	ret := _m.Called(userID, otherUserID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetCommonTeamIDsForTwoUsers")
+	}
+
 	var r0 []string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]string, error)); ok {
@@ -474,6 +546,10 @@ func (_m *TeamStore) GetCommonTeamIDsForTwoUsers(userID string, otherUserID stri
 func (_m *TeamStore) GetMany(ids []string) ([]*model.Team, error) {
 	ret := _m.Called(ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMany")
+	}
+
 	var r0 []*model.Team
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]string) ([]*model.Team, error)); ok {
@@ -500,6 +576,10 @@ func (_m *TeamStore) GetMany(ids []string) ([]*model.Team, error) {
 func (_m *TeamStore) GetMember(c request.CTX, teamID string, userID string) (*model.TeamMember, error) {
 	ret := _m.Called(c, teamID, userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMember")
+	}
+
 	var r0 *model.TeamMember
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string, string) (*model.TeamMember, error)); ok {
@@ -526,6 +606,10 @@ func (_m *TeamStore) GetMember(c request.CTX, teamID string, userID string) (*mo
 func (_m *TeamStore) GetMembers(teamID string, offset int, limit int, teamMembersGetOptions *model.TeamMembersGetOptions) ([]*model.TeamMember, error) {
 	ret := _m.Called(teamID, offset, limit, teamMembersGetOptions)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMembers")
+	}
+
 	var r0 []*model.TeamMember
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int, *model.TeamMembersGetOptions) ([]*model.TeamMember, error)); ok {
@@ -552,6 +636,10 @@ func (_m *TeamStore) GetMembers(teamID string, offset int, limit int, teamMember
 func (_m *TeamStore) GetMembersByIds(teamID string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, error) {
 	ret := _m.Called(teamID, userIds, restrictions)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMembersByIds")
+	}
+
 	var r0 []*model.TeamMember
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, []string, *model.ViewUsersRestrictions) ([]*model.TeamMember, error)); ok {
@@ -578,6 +666,10 @@ func (_m *TeamStore) GetMembersByIds(teamID string, userIds []string, restrictio
 func (_m *TeamStore) GetTeamMembersForExport(userID string) ([]*model.TeamMemberForExport, error) {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTeamMembersForExport")
+	}
+
 	var r0 []*model.TeamMemberForExport
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.TeamMemberForExport, error)); ok {
@@ -604,6 +696,10 @@ func (_m *TeamStore) GetTeamMembersForExport(userID string) ([]*model.TeamMember
 func (_m *TeamStore) GetTeamsByScheme(schemeID string, offset int, limit int) ([]*model.Team, error) {
 	ret := _m.Called(schemeID, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTeamsByScheme")
+	}
+
 	var r0 []*model.Team
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int) ([]*model.Team, error)); ok {
@@ -630,6 +726,10 @@ func (_m *TeamStore) GetTeamsByScheme(schemeID string, offset int, limit int) ([
 func (_m *TeamStore) GetTeamsByUserId(userID string) ([]*model.Team, error) {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTeamsByUserId")
+	}
+
 	var r0 []*model.Team
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.Team, error)); ok {
@@ -656,6 +756,10 @@ func (_m *TeamStore) GetTeamsByUserId(userID string) ([]*model.Team, error) {
 func (_m *TeamStore) GetTeamsForUser(c request.CTX, userID string, excludeTeamID string, includeDeleted bool) ([]*model.TeamMember, error) {
 	ret := _m.Called(c, userID, excludeTeamID, includeDeleted)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTeamsForUser")
+	}
+
 	var r0 []*model.TeamMember
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string, string, bool) ([]*model.TeamMember, error)); ok {
@@ -682,6 +786,10 @@ func (_m *TeamStore) GetTeamsForUser(c request.CTX, userID string, excludeTeamID
 func (_m *TeamStore) GetTeamsForUserWithPagination(userID string, page int, perPage int) ([]*model.TeamMember, error) {
 	ret := _m.Called(userID, page, perPage)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTeamsForUserWithPagination")
+	}
+
 	var r0 []*model.TeamMember
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int) ([]*model.TeamMember, error)); ok {
@@ -708,6 +816,10 @@ func (_m *TeamStore) GetTeamsForUserWithPagination(userID string, page int, perP
 func (_m *TeamStore) GetTotalMemberCount(teamID string, restrictions *model.ViewUsersRestrictions) (int64, error) {
 	ret := _m.Called(teamID, restrictions)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTotalMemberCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, *model.ViewUsersRestrictions) (int64, error)); ok {
@@ -732,6 +844,10 @@ func (_m *TeamStore) GetTotalMemberCount(teamID string, restrictions *model.View
 func (_m *TeamStore) GetUserTeamIds(userID string, allowFromCache bool) ([]string, error) {
 	ret := _m.Called(userID, allowFromCache)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUserTeamIds")
+	}
+
 	var r0 []string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, bool) ([]string, error)); ok {
@@ -758,6 +874,10 @@ func (_m *TeamStore) GetUserTeamIds(userID string, allowFromCache bool) ([]strin
 func (_m *TeamStore) GroupSyncedTeamCount() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GroupSyncedTeamCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -787,6 +907,10 @@ func (_m *TeamStore) InvalidateAllTeamIdsForUser(userID string) {
 func (_m *TeamStore) MigrateTeamMembers(fromTeamID string, fromUserID string) (map[string]string, error) {
 	ret := _m.Called(fromTeamID, fromUserID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MigrateTeamMembers")
+	}
+
 	var r0 map[string]string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (map[string]string, error)); ok {
@@ -813,6 +937,10 @@ func (_m *TeamStore) MigrateTeamMembers(fromTeamID string, fromUserID string) (m
 func (_m *TeamStore) PermanentDelete(teamID string) error {
 	ret := _m.Called(teamID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDelete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(teamID)
@@ -827,6 +955,10 @@ func (_m *TeamStore) PermanentDelete(teamID string) error {
 func (_m *TeamStore) RemoveAllMembersByTeam(teamID string) error {
 	ret := _m.Called(teamID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveAllMembersByTeam")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(teamID)
@@ -841,6 +973,10 @@ func (_m *TeamStore) RemoveAllMembersByTeam(teamID string) error {
 func (_m *TeamStore) RemoveAllMembersByUser(ctx request.CTX, userID string) error {
 	ret := _m.Called(ctx, userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveAllMembersByUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string) error); ok {
 		r0 = rf(ctx, userID)
@@ -855,6 +991,10 @@ func (_m *TeamStore) RemoveAllMembersByUser(ctx request.CTX, userID string) erro
 func (_m *TeamStore) RemoveMember(rctx request.CTX, teamID string, userID string) error {
 	ret := _m.Called(rctx, teamID, userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveMember")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string, string) error); ok {
 		r0 = rf(rctx, teamID, userID)
@@ -869,6 +1009,10 @@ func (_m *TeamStore) RemoveMember(rctx request.CTX, teamID string, userID string
 func (_m *TeamStore) RemoveMembers(rctx request.CTX, teamID string, userIds []string) error {
 	ret := _m.Called(rctx, teamID, userIds)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveMembers")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string, []string) error); ok {
 		r0 = rf(rctx, teamID, userIds)
@@ -883,6 +1027,10 @@ func (_m *TeamStore) RemoveMembers(rctx request.CTX, teamID string, userIds []st
 func (_m *TeamStore) ResetAllTeamSchemes() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ResetAllTeamSchemes")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -897,6 +1045,10 @@ func (_m *TeamStore) ResetAllTeamSchemes() error {
 func (_m *TeamStore) Save(team *model.Team) (*model.Team, error) {
 	ret := _m.Called(team)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.Team
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Team) (*model.Team, error)); ok {
@@ -923,6 +1075,10 @@ func (_m *TeamStore) Save(team *model.Team) (*model.Team, error) {
 func (_m *TeamStore) SaveMember(rctx request.CTX, member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) {
 	ret := _m.Called(rctx, member, maxUsersPerTeam)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveMember")
+	}
+
 	var r0 *model.TeamMember
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, *model.TeamMember, int) (*model.TeamMember, error)); ok {
@@ -949,6 +1105,10 @@ func (_m *TeamStore) SaveMember(rctx request.CTX, member *model.TeamMember, maxU
 func (_m *TeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersPerTeam int) ([]*model.TeamMember, error) {
 	ret := _m.Called(members, maxUsersPerTeam)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveMultipleMembers")
+	}
+
 	var r0 []*model.TeamMember
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]*model.TeamMember, int) ([]*model.TeamMember, error)); ok {
@@ -975,6 +1135,10 @@ func (_m *TeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersPe
 func (_m *TeamStore) SearchAll(opts *model.TeamSearch) ([]*model.Team, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SearchAll")
+	}
+
 	var r0 []*model.Team
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.TeamSearch) ([]*model.Team, error)); ok {
@@ -1001,6 +1165,10 @@ func (_m *TeamStore) SearchAll(opts *model.TeamSearch) ([]*model.Team, error) {
 func (_m *TeamStore) SearchAllPaged(opts *model.TeamSearch) ([]*model.Team, int64, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SearchAllPaged")
+	}
+
 	var r0 []*model.Team
 	var r1 int64
 	var r2 error
@@ -1034,6 +1202,10 @@ func (_m *TeamStore) SearchAllPaged(opts *model.TeamSearch) ([]*model.Team, int6
 func (_m *TeamStore) SearchOpen(opts *model.TeamSearch) ([]*model.Team, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SearchOpen")
+	}
+
 	var r0 []*model.Team
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.TeamSearch) ([]*model.Team, error)); ok {
@@ -1060,6 +1232,10 @@ func (_m *TeamStore) SearchOpen(opts *model.TeamSearch) ([]*model.Team, error) {
 func (_m *TeamStore) SearchPrivate(opts *model.TeamSearch) ([]*model.Team, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SearchPrivate")
+	}
+
 	var r0 []*model.Team
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.TeamSearch) ([]*model.Team, error)); ok {
@@ -1086,6 +1262,10 @@ func (_m *TeamStore) SearchPrivate(opts *model.TeamSearch) ([]*model.Team, error
 func (_m *TeamStore) Update(team *model.Team) (*model.Team, error) {
 	ret := _m.Called(team)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
 	var r0 *model.Team
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.Team) (*model.Team, error)); ok {
@@ -1112,6 +1292,10 @@ func (_m *TeamStore) Update(team *model.Team) (*model.Team, error) {
 func (_m *TeamStore) UpdateLastTeamIconUpdate(teamID string, curTime int64) error {
 	ret := _m.Called(teamID, curTime)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateLastTeamIconUpdate")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, int64) error); ok {
 		r0 = rf(teamID, curTime)
@@ -1126,6 +1310,10 @@ func (_m *TeamStore) UpdateLastTeamIconUpdate(teamID string, curTime int64) erro
 func (_m *TeamStore) UpdateMember(rctx request.CTX, member *model.TeamMember) (*model.TeamMember, error) {
 	ret := _m.Called(rctx, member)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateMember")
+	}
+
 	var r0 *model.TeamMember
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, *model.TeamMember) (*model.TeamMember, error)); ok {
@@ -1152,6 +1340,10 @@ func (_m *TeamStore) UpdateMember(rctx request.CTX, member *model.TeamMember) (*
 func (_m *TeamStore) UpdateMembersRole(teamID string, userIDs []string) error {
 	ret := _m.Called(teamID, userIDs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateMembersRole")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, []string) error); ok {
 		r0 = rf(teamID, userIDs)
@@ -1166,6 +1358,10 @@ func (_m *TeamStore) UpdateMembersRole(teamID string, userIDs []string) error {
 func (_m *TeamStore) UpdateMultipleMembers(members []*model.TeamMember) ([]*model.TeamMember, error) {
 	ret := _m.Called(members)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateMultipleMembers")
+	}
+
 	var r0 []*model.TeamMember
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]*model.TeamMember) ([]*model.TeamMember, error)); ok {
@@ -1192,6 +1388,10 @@ func (_m *TeamStore) UpdateMultipleMembers(members []*model.TeamMember) ([]*mode
 func (_m *TeamStore) UserBelongsToTeams(userID string, teamIds []string) (bool, error) {
 	ret := _m.Called(userID, teamIds)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UserBelongsToTeams")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, []string) (bool, error)); ok {
@@ -1212,13 +1412,12 @@ func (_m *TeamStore) UserBelongsToTeams(userID string, teamIds []string) (bool,
 	return r0, r1
 }
 
-type mockConstructorTestingTNewTeamStore interface {
+// NewTeamStore creates a new instance of TeamStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewTeamStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewTeamStore creates a new instance of TeamStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewTeamStore(t mockConstructorTestingTNewTeamStore) *TeamStore {
+}) *TeamStore {
 	mock := &TeamStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/TermsOfServiceStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type TermsOfServiceStore struct {
 func (_m *TermsOfServiceStore) Get(id string, allowFromCache bool) (*model.TermsOfService, error) {
 	ret := _m.Called(id, allowFromCache)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.TermsOfService
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, bool) (*model.TermsOfService, error)); ok {
@@ -44,6 +48,10 @@ func (_m *TermsOfServiceStore) Get(id string, allowFromCache bool) (*model.Terms
 func (_m *TermsOfServiceStore) GetLatest(allowFromCache bool) (*model.TermsOfService, error) {
 	ret := _m.Called(allowFromCache)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetLatest")
+	}
+
 	var r0 *model.TermsOfService
 	var r1 error
 	if rf, ok := ret.Get(0).(func(bool) (*model.TermsOfService, error)); ok {
@@ -70,6 +78,10 @@ func (_m *TermsOfServiceStore) GetLatest(allowFromCache bool) (*model.TermsOfSer
 func (_m *TermsOfServiceStore) Save(termsOfService *model.TermsOfService) (*model.TermsOfService, error) {
 	ret := _m.Called(termsOfService)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.TermsOfService
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.TermsOfService) (*model.TermsOfService, error)); ok {
@@ -92,13 +104,12 @@ func (_m *TermsOfServiceStore) Save(termsOfService *model.TermsOfService) (*mode
 	return r0, r1
 }
 
-type mockConstructorTestingTNewTermsOfServiceStore interface {
+// NewTermsOfServiceStore creates a new instance of TermsOfServiceStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewTermsOfServiceStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewTermsOfServiceStore creates a new instance of TermsOfServiceStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewTermsOfServiceStore(t mockConstructorTestingTNewTermsOfServiceStore) *TermsOfServiceStore {
+}) *TermsOfServiceStore {
 	mock := &TermsOfServiceStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/ThreadStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -19,6 +19,10 @@ type ThreadStore struct {
 func (_m *ThreadStore) DeleteMembershipForUser(userId string, postID string) error {
 	ret := _m.Called(userId, postID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteMembershipForUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 		r0 = rf(userId, postID)
@@ -33,6 +37,10 @@ func (_m *ThreadStore) DeleteMembershipForUser(userId string, postID string) err
 func (_m *ThreadStore) DeleteMembershipsForChannel(userID string, channelID string) error {
 	ret := _m.Called(userID, channelID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteMembershipsForChannel")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 		r0 = rf(userID, channelID)
@@ -47,6 +55,10 @@ func (_m *ThreadStore) DeleteMembershipsForChannel(userID string, channelID stri
 func (_m *ThreadStore) DeleteOrphanedRows(limit int) (int64, error) {
 	ret := _m.Called(limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteOrphanedRows")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int) (int64, error)); ok {
@@ -71,6 +83,10 @@ func (_m *ThreadStore) DeleteOrphanedRows(limit int) (int64, error) {
 func (_m *ThreadStore) Get(id string) (*model.Thread, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.Thread
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.Thread, error)); ok {
@@ -97,6 +113,10 @@ func (_m *ThreadStore) Get(id string) (*model.Thread, error) {
 func (_m *ThreadStore) GetMembershipForUser(userId string, postID string) (*model.ThreadMembership, error) {
 	ret := _m.Called(userId, postID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMembershipForUser")
+	}
+
 	var r0 *model.ThreadMembership
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (*model.ThreadMembership, error)); ok {
@@ -123,6 +143,10 @@ func (_m *ThreadStore) GetMembershipForUser(userId string, postID string) (*mode
 func (_m *ThreadStore) GetMembershipsForUser(userId string, teamID string) ([]*model.ThreadMembership, error) {
 	ret := _m.Called(userId, teamID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMembershipsForUser")
+	}
+
 	var r0 []*model.ThreadMembership
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]*model.ThreadMembership, error)); ok {
@@ -149,6 +173,10 @@ func (_m *ThreadStore) GetMembershipsForUser(userId string, teamID string) ([]*m
 func (_m *ThreadStore) GetTeamsUnreadForUser(userID string, teamIDs []string, includeUrgentMentionCount bool) (map[string]*model.TeamUnread, error) {
 	ret := _m.Called(userID, teamIDs, includeUrgentMentionCount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTeamsUnreadForUser")
+	}
+
 	var r0 map[string]*model.TeamUnread
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, []string, bool) (map[string]*model.TeamUnread, error)); ok {
@@ -175,6 +203,10 @@ func (_m *ThreadStore) GetTeamsUnreadForUser(userID string, teamIDs []string, in
 func (_m *ThreadStore) GetThreadFollowers(threadID string, fetchOnlyActive bool) ([]string, error) {
 	ret := _m.Called(threadID, fetchOnlyActive)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetThreadFollowers")
+	}
+
 	var r0 []string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, bool) ([]string, error)); ok {
@@ -201,6 +233,10 @@ func (_m *ThreadStore) GetThreadFollowers(threadID string, fetchOnlyActive bool)
 func (_m *ThreadStore) GetThreadForUser(threadMembership *model.ThreadMembership, extended bool, postPriorityIsEnabled bool) (*model.ThreadResponse, error) {
 	ret := _m.Called(threadMembership, extended, postPriorityIsEnabled)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetThreadForUser")
+	}
+
 	var r0 *model.ThreadResponse
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.ThreadMembership, bool, bool) (*model.ThreadResponse, error)); ok {
@@ -227,6 +263,10 @@ func (_m *ThreadStore) GetThreadForUser(threadMembership *model.ThreadMembership
 func (_m *ThreadStore) GetThreadUnreadReplyCount(threadMembership *model.ThreadMembership) (int64, error) {
 	ret := _m.Called(threadMembership)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetThreadUnreadReplyCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.ThreadMembership) (int64, error)); ok {
@@ -251,6 +291,10 @@ func (_m *ThreadStore) GetThreadUnreadReplyCount(threadMembership *model.ThreadM
 func (_m *ThreadStore) GetThreadsForUser(userId string, teamID string, opts model.GetUserThreadsOpts) ([]*model.ThreadResponse, error) {
 	ret := _m.Called(userId, teamID, opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetThreadsForUser")
+	}
+
 	var r0 []*model.ThreadResponse
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, model.GetUserThreadsOpts) ([]*model.ThreadResponse, error)); ok {
@@ -277,6 +321,10 @@ func (_m *ThreadStore) GetThreadsForUser(userId string, teamID string, opts mode
 func (_m *ThreadStore) GetTotalThreads(userId string, teamID string, opts model.GetUserThreadsOpts) (int64, error) {
 	ret := _m.Called(userId, teamID, opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTotalThreads")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, model.GetUserThreadsOpts) (int64, error)); ok {
@@ -301,6 +349,10 @@ func (_m *ThreadStore) GetTotalThreads(userId string, teamID string, opts model.
 func (_m *ThreadStore) GetTotalUnreadMentions(userId string, teamID string, opts model.GetUserThreadsOpts) (int64, error) {
 	ret := _m.Called(userId, teamID, opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTotalUnreadMentions")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, model.GetUserThreadsOpts) (int64, error)); ok {
@@ -325,6 +377,10 @@ func (_m *ThreadStore) GetTotalUnreadMentions(userId string, teamID string, opts
 func (_m *ThreadStore) GetTotalUnreadThreads(userId string, teamID string, opts model.GetUserThreadsOpts) (int64, error) {
 	ret := _m.Called(userId, teamID, opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTotalUnreadThreads")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, model.GetUserThreadsOpts) (int64, error)); ok {
@@ -349,6 +405,10 @@ func (_m *ThreadStore) GetTotalUnreadThreads(userId string, teamID string, opts
 func (_m *ThreadStore) GetTotalUnreadUrgentMentions(userId string, teamID string, opts model.GetUserThreadsOpts) (int64, error) {
 	ret := _m.Called(userId, teamID, opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTotalUnreadUrgentMentions")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, model.GetUserThreadsOpts) (int64, error)); ok {
@@ -373,6 +433,10 @@ func (_m *ThreadStore) GetTotalUnreadUrgentMentions(userId string, teamID string
 func (_m *ThreadStore) MaintainMembership(userID string, postID string, opts store.ThreadMembershipOpts) (*model.ThreadMembership, error) {
 	ret := _m.Called(userID, postID, opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MaintainMembership")
+	}
+
 	var r0 *model.ThreadMembership
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, store.ThreadMembershipOpts) (*model.ThreadMembership, error)); ok {
@@ -399,6 +463,10 @@ func (_m *ThreadStore) MaintainMembership(userID string, postID string, opts sto
 func (_m *ThreadStore) MarkAllAsRead(userID string, threadIds []string) error {
 	ret := _m.Called(userID, threadIds)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MarkAllAsRead")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, []string) error); ok {
 		r0 = rf(userID, threadIds)
@@ -413,6 +481,10 @@ func (_m *ThreadStore) MarkAllAsRead(userID string, threadIds []string) error {
 func (_m *ThreadStore) MarkAllAsReadByChannels(userID string, channelIDs []string) error {
 	ret := _m.Called(userID, channelIDs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MarkAllAsReadByChannels")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, []string) error); ok {
 		r0 = rf(userID, channelIDs)
@@ -427,6 +499,10 @@ func (_m *ThreadStore) MarkAllAsReadByChannels(userID string, channelIDs []strin
 func (_m *ThreadStore) MarkAllAsReadByTeam(userID string, teamID string) error {
 	ret := _m.Called(userID, teamID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MarkAllAsReadByTeam")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 		r0 = rf(userID, teamID)
@@ -441,6 +517,10 @@ func (_m *ThreadStore) MarkAllAsReadByTeam(userID string, teamID string) error {
 func (_m *ThreadStore) MarkAsRead(userID string, threadID string, timestamp int64) error {
 	ret := _m.Called(userID, threadID, timestamp)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MarkAsRead")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string, int64) error); ok {
 		r0 = rf(userID, threadID, timestamp)
@@ -455,6 +535,10 @@ func (_m *ThreadStore) MarkAsRead(userID string, threadID string, timestamp int6
 func (_m *ThreadStore) PermanentDeleteBatchForRetentionPolicies(now int64, globalPolicyEndTime int64, limit int64, cursor model.RetentionPolicyCursor) (int64, model.RetentionPolicyCursor, error) {
 	ret := _m.Called(now, globalPolicyEndTime, limit, cursor)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteBatchForRetentionPolicies")
+	}
+
 	var r0 int64
 	var r1 model.RetentionPolicyCursor
 	var r2 error
@@ -486,6 +570,10 @@ func (_m *ThreadStore) PermanentDeleteBatchForRetentionPolicies(now int64, globa
 func (_m *ThreadStore) PermanentDeleteBatchThreadMembershipsForRetentionPolicies(now int64, globalPolicyEndTime int64, limit int64, cursor model.RetentionPolicyCursor) (int64, model.RetentionPolicyCursor, error) {
 	ret := _m.Called(now, globalPolicyEndTime, limit, cursor)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteBatchThreadMembershipsForRetentionPolicies")
+	}
+
 	var r0 int64
 	var r1 model.RetentionPolicyCursor
 	var r2 error
@@ -517,6 +605,10 @@ func (_m *ThreadStore) PermanentDeleteBatchThreadMembershipsForRetentionPolicies
 func (_m *ThreadStore) UpdateMembership(membership *model.ThreadMembership) (*model.ThreadMembership, error) {
 	ret := _m.Called(membership)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateMembership")
+	}
+
 	var r0 *model.ThreadMembership
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.ThreadMembership) (*model.ThreadMembership, error)); ok {
@@ -539,13 +631,12 @@ func (_m *ThreadStore) UpdateMembership(membership *model.ThreadMembership) (*mo
 	return r0, r1
 }
 
-type mockConstructorTestingTNewThreadStore interface {
+// NewThreadStore creates a new instance of ThreadStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewThreadStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewThreadStore creates a new instance of ThreadStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewThreadStore(t mockConstructorTestingTNewThreadStore) *ThreadStore {
+}) *ThreadStore {
 	mock := &ThreadStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/TokenStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -23,6 +23,10 @@ func (_m *TokenStore) Cleanup(expiryTime int64) {
 func (_m *TokenStore) Delete(token string) error {
 	ret := _m.Called(token)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(token)
@@ -37,6 +41,10 @@ func (_m *TokenStore) Delete(token string) error {
 func (_m *TokenStore) GetAllTokensByType(tokenType string) ([]*model.Token, error) {
 	ret := _m.Called(tokenType)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllTokensByType")
+	}
+
 	var r0 []*model.Token
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.Token, error)); ok {
@@ -63,6 +71,10 @@ func (_m *TokenStore) GetAllTokensByType(tokenType string) ([]*model.Token, erro
 func (_m *TokenStore) GetByToken(token string) (*model.Token, error) {
 	ret := _m.Called(token)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByToken")
+	}
+
 	var r0 *model.Token
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.Token, error)); ok {
@@ -89,6 +101,10 @@ func (_m *TokenStore) GetByToken(token string) (*model.Token, error) {
 func (_m *TokenStore) RemoveAllTokensByType(tokenType string) error {
 	ret := _m.Called(tokenType)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveAllTokensByType")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(tokenType)
@@ -103,6 +119,10 @@ func (_m *TokenStore) RemoveAllTokensByType(tokenType string) error {
 func (_m *TokenStore) Save(recovery *model.Token) error {
 	ret := _m.Called(recovery)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*model.Token) error); ok {
 		r0 = rf(recovery)
@@ -113,13 +133,12 @@ func (_m *TokenStore) Save(recovery *model.Token) error {
 	return r0
 }
 
-type mockConstructorTestingTNewTokenStore interface {
+// NewTokenStore creates a new instance of TokenStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewTokenStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewTokenStore creates a new instance of TokenStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewTokenStore(t mockConstructorTestingTNewTokenStore) *TokenStore {
+}) *TokenStore {
 	mock := &TokenStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/TrueUpReviewStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type TrueUpReviewStore struct {
 func (_m *TrueUpReviewStore) CreateTrueUpReviewStatusRecord(reviewStatus *model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error) {
 	ret := _m.Called(reviewStatus)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateTrueUpReviewStatusRecord")
+	}
+
 	var r0 *model.TrueUpReviewStatus
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error)); ok {
@@ -44,6 +48,10 @@ func (_m *TrueUpReviewStore) CreateTrueUpReviewStatusRecord(reviewStatus *model.
 func (_m *TrueUpReviewStore) GetTrueUpReviewStatus(dueDate int64) (*model.TrueUpReviewStatus, error) {
 	ret := _m.Called(dueDate)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTrueUpReviewStatus")
+	}
+
 	var r0 *model.TrueUpReviewStatus
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (*model.TrueUpReviewStatus, error)); ok {
@@ -70,6 +78,10 @@ func (_m *TrueUpReviewStore) GetTrueUpReviewStatus(dueDate int64) (*model.TrueUp
 func (_m *TrueUpReviewStore) Update(reviewStatus *model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error) {
 	ret := _m.Called(reviewStatus)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
 	var r0 *model.TrueUpReviewStatus
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error)); ok {
@@ -92,13 +104,12 @@ func (_m *TrueUpReviewStore) Update(reviewStatus *model.TrueUpReviewStatus) (*mo
 	return r0, r1
 }
 
-type mockConstructorTestingTNewTrueUpReviewStore interface {
+// NewTrueUpReviewStore creates a new instance of TrueUpReviewStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewTrueUpReviewStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewTrueUpReviewStore creates a new instance of TrueUpReviewStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewTrueUpReviewStore(t mockConstructorTestingTNewTrueUpReviewStore) *TrueUpReviewStore {
+}) *TrueUpReviewStore {
 	mock := &TrueUpReviewStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/UploadSessionStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -19,6 +19,10 @@ type UploadSessionStore struct {
 func (_m *UploadSessionStore) Delete(id string) error {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(id)
@@ -33,6 +37,10 @@ func (_m *UploadSessionStore) Delete(id string) error {
 func (_m *UploadSessionStore) Get(c request.CTX, id string) (*model.UploadSession, error) {
 	ret := _m.Called(c, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.UploadSession
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string) (*model.UploadSession, error)); ok {
@@ -59,6 +67,10 @@ func (_m *UploadSessionStore) Get(c request.CTX, id string) (*model.UploadSessio
 func (_m *UploadSessionStore) GetForUser(userID string) ([]*model.UploadSession, error) {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetForUser")
+	}
+
 	var r0 []*model.UploadSession
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.UploadSession, error)); ok {
@@ -85,6 +97,10 @@ func (_m *UploadSessionStore) GetForUser(userID string) ([]*model.UploadSession,
 func (_m *UploadSessionStore) Save(session *model.UploadSession) (*model.UploadSession, error) {
 	ret := _m.Called(session)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.UploadSession
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.UploadSession) (*model.UploadSession, error)); ok {
@@ -111,6 +127,10 @@ func (_m *UploadSessionStore) Save(session *model.UploadSession) (*model.UploadS
 func (_m *UploadSessionStore) Update(session *model.UploadSession) error {
 	ret := _m.Called(session)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*model.UploadSession) error); ok {
 		r0 = rf(session)
@@ -121,13 +141,12 @@ func (_m *UploadSessionStore) Update(session *model.UploadSession) error {
 	return r0
 }
 
-type mockConstructorTestingTNewUploadSessionStore interface {
+// NewUploadSessionStore creates a new instance of UploadSessionStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewUploadSessionStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewUploadSessionStore creates a new instance of UploadSessionStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewUploadSessionStore(t mockConstructorTestingTNewUploadSessionStore) *UploadSessionStore {
+}) *UploadSessionStore {
 	mock := &UploadSessionStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/UserAccessTokenStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type UserAccessTokenStore struct {
 func (_m *UserAccessTokenStore) Delete(tokenID string) error {
 	ret := _m.Called(tokenID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(tokenID)
@@ -32,6 +36,10 @@ func (_m *UserAccessTokenStore) Delete(tokenID string) error {
 func (_m *UserAccessTokenStore) DeleteAllForUser(userID string) error {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteAllForUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(userID)
@@ -46,6 +54,10 @@ func (_m *UserAccessTokenStore) DeleteAllForUser(userID string) error {
 func (_m *UserAccessTokenStore) Get(tokenID string) (*model.UserAccessToken, error) {
 	ret := _m.Called(tokenID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.UserAccessToken
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.UserAccessToken, error)); ok {
@@ -72,6 +84,10 @@ func (_m *UserAccessTokenStore) Get(tokenID string) (*model.UserAccessToken, err
 func (_m *UserAccessTokenStore) GetAll(offset int, limit int) ([]*model.UserAccessToken, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []*model.UserAccessToken
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int, int) ([]*model.UserAccessToken, error)); ok {
@@ -98,6 +114,10 @@ func (_m *UserAccessTokenStore) GetAll(offset int, limit int) ([]*model.UserAcce
 func (_m *UserAccessTokenStore) GetByToken(tokenString string) (*model.UserAccessToken, error) {
 	ret := _m.Called(tokenString)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByToken")
+	}
+
 	var r0 *model.UserAccessToken
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.UserAccessToken, error)); ok {
@@ -124,6 +144,10 @@ func (_m *UserAccessTokenStore) GetByToken(tokenString string) (*model.UserAcces
 func (_m *UserAccessTokenStore) GetByUser(userID string, page int, perPage int) ([]*model.UserAccessToken, error) {
 	ret := _m.Called(userID, page, perPage)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByUser")
+	}
+
 	var r0 []*model.UserAccessToken
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int) ([]*model.UserAccessToken, error)); ok {
@@ -150,6 +174,10 @@ func (_m *UserAccessTokenStore) GetByUser(userID string, page int, perPage int)
 func (_m *UserAccessTokenStore) Save(token *model.UserAccessToken) (*model.UserAccessToken, error) {
 	ret := _m.Called(token)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.UserAccessToken
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.UserAccessToken) (*model.UserAccessToken, error)); ok {
@@ -176,6 +204,10 @@ func (_m *UserAccessTokenStore) Save(token *model.UserAccessToken) (*model.UserA
 func (_m *UserAccessTokenStore) Search(term string) ([]*model.UserAccessToken, error) {
 	ret := _m.Called(term)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Search")
+	}
+
 	var r0 []*model.UserAccessToken
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.UserAccessToken, error)); ok {
@@ -202,6 +234,10 @@ func (_m *UserAccessTokenStore) Search(term string) ([]*model.UserAccessToken, e
 func (_m *UserAccessTokenStore) UpdateTokenDisable(tokenID string) error {
 	ret := _m.Called(tokenID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTokenDisable")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(tokenID)
@@ -216,6 +252,10 @@ func (_m *UserAccessTokenStore) UpdateTokenDisable(tokenID string) error {
 func (_m *UserAccessTokenStore) UpdateTokenEnable(tokenID string) error {
 	ret := _m.Called(tokenID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTokenEnable")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(tokenID)
@@ -226,13 +266,12 @@ func (_m *UserAccessTokenStore) UpdateTokenEnable(tokenID string) error {
 	return r0
 }
 
-type mockConstructorTestingTNewUserAccessTokenStore interface {
+// NewUserAccessTokenStore creates a new instance of UserAccessTokenStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewUserAccessTokenStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewUserAccessTokenStore creates a new instance of UserAccessTokenStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewUserAccessTokenStore(t mockConstructorTestingTNewUserAccessTokenStore) *UserAccessTokenStore {
+}) *UserAccessTokenStore {
 	mock := &UserAccessTokenStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/UserStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -24,6 +24,10 @@ type UserStore struct {
 func (_m *UserStore) AnalyticsActiveCount(timestamp int64, options model.UserCountOptions) (int64, error) {
 	ret := _m.Called(timestamp, options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AnalyticsActiveCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, model.UserCountOptions) (int64, error)); ok {
@@ -48,6 +52,10 @@ func (_m *UserStore) AnalyticsActiveCount(timestamp int64, options model.UserCou
 func (_m *UserStore) AnalyticsActiveCountForPeriod(startTime int64, endTime int64, options model.UserCountOptions) (int64, error) {
 	ret := _m.Called(startTime, endTime, options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AnalyticsActiveCountForPeriod")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, int64, model.UserCountOptions) (int64, error)); ok {
@@ -72,6 +80,10 @@ func (_m *UserStore) AnalyticsActiveCountForPeriod(startTime int64, endTime int6
 func (_m *UserStore) AnalyticsGetExternalUsers(hostDomain string) (bool, error) {
 	ret := _m.Called(hostDomain)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AnalyticsGetExternalUsers")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (bool, error)); ok {
@@ -96,6 +108,10 @@ func (_m *UserStore) AnalyticsGetExternalUsers(hostDomain string) (bool, error)
 func (_m *UserStore) AnalyticsGetGuestCount() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AnalyticsGetGuestCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -120,6 +136,10 @@ func (_m *UserStore) AnalyticsGetGuestCount() (int64, error) {
 func (_m *UserStore) AnalyticsGetInactiveUsersCount() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AnalyticsGetInactiveUsersCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -144,6 +164,10 @@ func (_m *UserStore) AnalyticsGetInactiveUsersCount() (int64, error) {
 func (_m *UserStore) AnalyticsGetSystemAdminCount() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AnalyticsGetSystemAdminCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -168,6 +192,10 @@ func (_m *UserStore) AnalyticsGetSystemAdminCount() (int64, error) {
 func (_m *UserStore) AutocompleteUsersInChannel(rctx request.CTX, teamID string, channelID string, term string, options *model.UserSearchOptions) (*model.UserAutocompleteInChannel, error) {
 	ret := _m.Called(rctx, teamID, channelID, term, options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AutocompleteUsersInChannel")
+	}
+
 	var r0 *model.UserAutocompleteInChannel
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string, string, string, *model.UserSearchOptions) (*model.UserAutocompleteInChannel, error)); ok {
@@ -194,6 +222,10 @@ func (_m *UserStore) AutocompleteUsersInChannel(rctx request.CTX, teamID string,
 func (_m *UserStore) ClearAllCustomRoleAssignments() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ClearAllCustomRoleAssignments")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -213,6 +245,10 @@ func (_m *UserStore) ClearCaches() {
 func (_m *UserStore) Count(options model.UserCountOptions) (int64, error) {
 	ret := _m.Called(options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Count")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(model.UserCountOptions) (int64, error)); ok {
@@ -237,6 +273,10 @@ func (_m *UserStore) Count(options model.UserCountOptions) (int64, error) {
 func (_m *UserStore) DeactivateGuests() ([]string, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeactivateGuests")
+	}
+
 	var r0 []string
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]string, error)); ok {
@@ -263,6 +303,10 @@ func (_m *UserStore) DeactivateGuests() ([]string, error) {
 func (_m *UserStore) DemoteUserToGuest(userID string) (*model.User, error) {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DemoteUserToGuest")
+	}
+
 	var r0 *model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.User, error)); ok {
@@ -289,6 +333,10 @@ func (_m *UserStore) DemoteUserToGuest(userID string) (*model.User, error) {
 func (_m *UserStore) Get(ctx context.Context, id string) (*model.User, error) {
 	ret := _m.Called(ctx, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string) (*model.User, error)); ok {
@@ -315,6 +363,10 @@ func (_m *UserStore) Get(ctx context.Context, id string) (*model.User, error) {
 func (_m *UserStore) GetAll() ([]*model.User, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]*model.User, error)); ok {
@@ -341,6 +393,10 @@ func (_m *UserStore) GetAll() ([]*model.User, error) {
 func (_m *UserStore) GetAllAfter(limit int, afterID string) ([]*model.User, error) {
 	ret := _m.Called(limit, afterID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllAfter")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int, string) ([]*model.User, error)); ok {
@@ -367,6 +423,10 @@ func (_m *UserStore) GetAllAfter(limit int, afterID string) ([]*model.User, erro
 func (_m *UserStore) GetAllNotInAuthService(authServices []string) ([]*model.User, error) {
 	ret := _m.Called(authServices)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllNotInAuthService")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]string) ([]*model.User, error)); ok {
@@ -393,6 +453,10 @@ func (_m *UserStore) GetAllNotInAuthService(authServices []string) ([]*model.Use
 func (_m *UserStore) GetAllProfiles(options *model.UserGetOptions) ([]*model.User, error) {
 	ret := _m.Called(options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllProfiles")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.UserGetOptions) ([]*model.User, error)); ok {
@@ -419,6 +483,10 @@ func (_m *UserStore) GetAllProfiles(options *model.UserGetOptions) ([]*model.Use
 func (_m *UserStore) GetAllProfilesInChannel(ctx context.Context, channelID string, allowFromCache bool) (map[string]*model.User, error) {
 	ret := _m.Called(ctx, channelID, allowFromCache)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllProfilesInChannel")
+	}
+
 	var r0 map[string]*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, bool) (map[string]*model.User, error)); ok {
@@ -445,6 +513,10 @@ func (_m *UserStore) GetAllProfilesInChannel(ctx context.Context, channelID stri
 func (_m *UserStore) GetAllUsingAuthService(authService string) ([]*model.User, error) {
 	ret := _m.Called(authService)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllUsingAuthService")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.User, error)); ok {
@@ -471,6 +543,10 @@ func (_m *UserStore) GetAllUsingAuthService(authService string) ([]*model.User,
 func (_m *UserStore) GetAnyUnreadPostCountForChannel(userID string, channelID string) (int64, error) {
 	ret := _m.Called(userID, channelID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAnyUnreadPostCountForChannel")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (int64, error)); ok {
@@ -495,6 +571,10 @@ func (_m *UserStore) GetAnyUnreadPostCountForChannel(userID string, channelID st
 func (_m *UserStore) GetByAuth(authData *string, authService string) (*model.User, error) {
 	ret := _m.Called(authData, authService)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByAuth")
+	}
+
 	var r0 *model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*string, string) (*model.User, error)); ok {
@@ -521,6 +601,10 @@ func (_m *UserStore) GetByAuth(authData *string, authService string) (*model.Use
 func (_m *UserStore) GetByEmail(email string) (*model.User, error) {
 	ret := _m.Called(email)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByEmail")
+	}
+
 	var r0 *model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.User, error)); ok {
@@ -547,6 +631,10 @@ func (_m *UserStore) GetByEmail(email string) (*model.User, error) {
 func (_m *UserStore) GetByRemoteID(remoteID string) (*model.User, error) {
 	ret := _m.Called(remoteID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByRemoteID")
+	}
+
 	var r0 *model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.User, error)); ok {
@@ -573,6 +661,10 @@ func (_m *UserStore) GetByRemoteID(remoteID string) (*model.User, error) {
 func (_m *UserStore) GetByUsername(username string) (*model.User, error) {
 	ret := _m.Called(username)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByUsername")
+	}
+
 	var r0 *model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.User, error)); ok {
@@ -599,6 +691,10 @@ func (_m *UserStore) GetByUsername(username string) (*model.User, error) {
 func (_m *UserStore) GetChannelGroupUsers(channelID string) ([]*model.User, error) {
 	ret := _m.Called(channelID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetChannelGroupUsers")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.User, error)); ok {
@@ -625,6 +721,10 @@ func (_m *UserStore) GetChannelGroupUsers(channelID string) ([]*model.User, erro
 func (_m *UserStore) GetEtagForAllProfiles() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetEtagForAllProfiles")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -639,6 +739,10 @@ func (_m *UserStore) GetEtagForAllProfiles() string {
 func (_m *UserStore) GetEtagForProfiles(teamID string) string {
 	ret := _m.Called(teamID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetEtagForProfiles")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func(string) string); ok {
 		r0 = rf(teamID)
@@ -653,6 +757,10 @@ func (_m *UserStore) GetEtagForProfiles(teamID string) string {
 func (_m *UserStore) GetEtagForProfilesNotInTeam(teamID string) string {
 	ret := _m.Called(teamID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetEtagForProfilesNotInTeam")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func(string) string); ok {
 		r0 = rf(teamID)
@@ -667,6 +775,10 @@ func (_m *UserStore) GetEtagForProfilesNotInTeam(teamID string) string {
 func (_m *UserStore) GetForLogin(loginID string, allowSignInWithUsername bool, allowSignInWithEmail bool) (*model.User, error) {
 	ret := _m.Called(loginID, allowSignInWithUsername, allowSignInWithEmail)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetForLogin")
+	}
+
 	var r0 *model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, bool, bool) (*model.User, error)); ok {
@@ -693,6 +805,10 @@ func (_m *UserStore) GetForLogin(loginID string, allowSignInWithUsername bool, a
 func (_m *UserStore) GetKnownUsers(userID string) ([]string, error) {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetKnownUsers")
+	}
+
 	var r0 []string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]string, error)); ok {
@@ -719,6 +835,10 @@ func (_m *UserStore) GetKnownUsers(userID string) ([]string, error) {
 func (_m *UserStore) GetMany(ctx context.Context, ids []string) ([]*model.User, error) {
 	ret := _m.Called(ctx, ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMany")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, []string) ([]*model.User, error)); ok {
@@ -745,6 +865,10 @@ func (_m *UserStore) GetMany(ctx context.Context, ids []string) ([]*model.User,
 func (_m *UserStore) GetNewUsersForTeam(teamID string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) {
 	ret := _m.Called(teamID, offset, limit, viewRestrictions)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetNewUsersForTeam")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int, *model.ViewUsersRestrictions) ([]*model.User, error)); ok {
@@ -771,6 +895,10 @@ func (_m *UserStore) GetNewUsersForTeam(teamID string, offset int, limit int, vi
 func (_m *UserStore) GetProfileByGroupChannelIdsForUser(userID string, channelIds []string) (map[string][]*model.User, error) {
 	ret := _m.Called(userID, channelIds)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetProfileByGroupChannelIdsForUser")
+	}
+
 	var r0 map[string][]*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, []string) (map[string][]*model.User, error)); ok {
@@ -797,6 +925,10 @@ func (_m *UserStore) GetProfileByGroupChannelIdsForUser(userID string, channelId
 func (_m *UserStore) GetProfileByIds(ctx context.Context, userIds []string, options *store.UserGetByIdsOpts, allowFromCache bool) ([]*model.User, error) {
 	ret := _m.Called(ctx, userIds, options, allowFromCache)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetProfileByIds")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, []string, *store.UserGetByIdsOpts, bool) ([]*model.User, error)); ok {
@@ -823,6 +955,10 @@ func (_m *UserStore) GetProfileByIds(ctx context.Context, userIds []string, opti
 func (_m *UserStore) GetProfiles(options *model.UserGetOptions) ([]*model.User, error) {
 	ret := _m.Called(options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetProfiles")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.UserGetOptions) ([]*model.User, error)); ok {
@@ -849,6 +985,10 @@ func (_m *UserStore) GetProfiles(options *model.UserGetOptions) ([]*model.User,
 func (_m *UserStore) GetProfilesByUsernames(usernames []string, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) {
 	ret := _m.Called(usernames, viewRestrictions)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetProfilesByUsernames")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]string, *model.ViewUsersRestrictions) ([]*model.User, error)); ok {
@@ -875,6 +1015,10 @@ func (_m *UserStore) GetProfilesByUsernames(usernames []string, viewRestrictions
 func (_m *UserStore) GetProfilesInChannel(options *model.UserGetOptions) ([]*model.User, error) {
 	ret := _m.Called(options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetProfilesInChannel")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.UserGetOptions) ([]*model.User, error)); ok {
@@ -901,6 +1045,10 @@ func (_m *UserStore) GetProfilesInChannel(options *model.UserGetOptions) ([]*mod
 func (_m *UserStore) GetProfilesInChannelByAdmin(options *model.UserGetOptions) ([]*model.User, error) {
 	ret := _m.Called(options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetProfilesInChannelByAdmin")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.UserGetOptions) ([]*model.User, error)); ok {
@@ -927,6 +1075,10 @@ func (_m *UserStore) GetProfilesInChannelByAdmin(options *model.UserGetOptions)
 func (_m *UserStore) GetProfilesInChannelByStatus(options *model.UserGetOptions) ([]*model.User, error) {
 	ret := _m.Called(options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetProfilesInChannelByStatus")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.UserGetOptions) ([]*model.User, error)); ok {
@@ -953,6 +1105,10 @@ func (_m *UserStore) GetProfilesInChannelByStatus(options *model.UserGetOptions)
 func (_m *UserStore) GetProfilesNotInChannel(teamID string, channelId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) {
 	ret := _m.Called(teamID, channelId, groupConstrained, offset, limit, viewRestrictions)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetProfilesNotInChannel")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, bool, int, int, *model.ViewUsersRestrictions) ([]*model.User, error)); ok {
@@ -979,6 +1135,10 @@ func (_m *UserStore) GetProfilesNotInChannel(teamID string, channelId string, gr
 func (_m *UserStore) GetProfilesNotInTeam(teamID string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) {
 	ret := _m.Called(teamID, groupConstrained, offset, limit, viewRestrictions)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetProfilesNotInTeam")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, bool, int, int, *model.ViewUsersRestrictions) ([]*model.User, error)); ok {
@@ -1005,6 +1165,10 @@ func (_m *UserStore) GetProfilesNotInTeam(teamID string, groupConstrained bool,
 func (_m *UserStore) GetProfilesWithoutTeam(options *model.UserGetOptions) ([]*model.User, error) {
 	ret := _m.Called(options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetProfilesWithoutTeam")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.UserGetOptions) ([]*model.User, error)); ok {
@@ -1031,6 +1195,10 @@ func (_m *UserStore) GetProfilesWithoutTeam(options *model.UserGetOptions) ([]*m
 func (_m *UserStore) GetRecentlyActiveUsersForTeam(teamID string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) {
 	ret := _m.Called(teamID, offset, limit, viewRestrictions)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRecentlyActiveUsersForTeam")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int, *model.ViewUsersRestrictions) ([]*model.User, error)); ok {
@@ -1057,6 +1225,10 @@ func (_m *UserStore) GetRecentlyActiveUsersForTeam(teamID string, offset int, li
 func (_m *UserStore) GetSystemAdminProfiles() (map[string]*model.User, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSystemAdminProfiles")
+	}
+
 	var r0 map[string]*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (map[string]*model.User, error)); ok {
@@ -1083,6 +1255,10 @@ func (_m *UserStore) GetSystemAdminProfiles() (map[string]*model.User, error) {
 func (_m *UserStore) GetTeamGroupUsers(teamID string) ([]*model.User, error) {
 	ret := _m.Called(teamID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTeamGroupUsers")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.User, error)); ok {
@@ -1109,6 +1285,10 @@ func (_m *UserStore) GetTeamGroupUsers(teamID string) ([]*model.User, error) {
 func (_m *UserStore) GetUnreadCount(userID string, isCRTEnabled bool) (int64, error) {
 	ret := _m.Called(userID, isCRTEnabled)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUnreadCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, bool) (int64, error)); ok {
@@ -1133,6 +1313,10 @@ func (_m *UserStore) GetUnreadCount(userID string, isCRTEnabled bool) (int64, er
 func (_m *UserStore) GetUnreadCountForChannel(userID string, channelID string) (int64, error) {
 	ret := _m.Called(userID, channelID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUnreadCountForChannel")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (int64, error)); ok {
@@ -1157,6 +1341,10 @@ func (_m *UserStore) GetUnreadCountForChannel(userID string, channelID string) (
 func (_m *UserStore) GetUserCountForReport(filter *model.UserReportOptions) (int64, error) {
 	ret := _m.Called(filter)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUserCountForReport")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.UserReportOptions) (int64, error)); ok {
@@ -1181,6 +1369,10 @@ func (_m *UserStore) GetUserCountForReport(filter *model.UserReportOptions) (int
 func (_m *UserStore) GetUserReport(filter *model.UserReportOptions) ([]*model.UserReportQuery, error) {
 	ret := _m.Called(filter)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUserReport")
+	}
+
 	var r0 []*model.UserReportQuery
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.UserReportOptions) ([]*model.UserReportQuery, error)); ok {
@@ -1207,6 +1399,10 @@ func (_m *UserStore) GetUserReport(filter *model.UserReportOptions) ([]*model.Us
 func (_m *UserStore) GetUsersBatchForIndexing(startTime int64, startFileID string, limit int) ([]*model.UserForIndexing, error) {
 	ret := _m.Called(startTime, startFileID, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUsersBatchForIndexing")
+	}
+
 	var r0 []*model.UserForIndexing
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, string, int) ([]*model.UserForIndexing, error)); ok {
@@ -1233,6 +1429,10 @@ func (_m *UserStore) GetUsersBatchForIndexing(startTime int64, startFileID strin
 func (_m *UserStore) GetUsersWithInvalidEmails(page int, perPage int, restrictedDomains string) ([]*model.User, error) {
 	ret := _m.Called(page, perPage, restrictedDomains)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUsersWithInvalidEmails")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int, int, string) ([]*model.User, error)); ok {
@@ -1259,6 +1459,10 @@ func (_m *UserStore) GetUsersWithInvalidEmails(page int, perPage int, restricted
 func (_m *UserStore) InferSystemInstallDate() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for InferSystemInstallDate")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -1283,6 +1487,10 @@ func (_m *UserStore) InferSystemInstallDate() (int64, error) {
 func (_m *UserStore) InsertUsers(users []*model.User) error {
 	ret := _m.Called(users)
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsertUsers")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func([]*model.User) error); ok {
 		r0 = rf(users)
@@ -1312,6 +1520,10 @@ func (_m *UserStore) InvalidateProfilesInChannelCacheByUser(userID string) {
 func (_m *UserStore) IsEmpty(excludeBots bool) (bool, error) {
 	ret := _m.Called(excludeBots)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsEmpty")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(bool) (bool, error)); ok {
@@ -1336,6 +1548,10 @@ func (_m *UserStore) IsEmpty(excludeBots bool) (bool, error) {
 func (_m *UserStore) PermanentDelete(userID string) error {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDelete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(userID)
@@ -1350,6 +1566,10 @@ func (_m *UserStore) PermanentDelete(userID string) error {
 func (_m *UserStore) PromoteGuestToUser(userID string) error {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PromoteGuestToUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(userID)
@@ -1364,6 +1584,10 @@ func (_m *UserStore) PromoteGuestToUser(userID string) error {
 func (_m *UserStore) RefreshPostStatsForUsers() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for RefreshPostStatsForUsers")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -1378,6 +1602,10 @@ func (_m *UserStore) RefreshPostStatsForUsers() error {
 func (_m *UserStore) ResetAuthDataToEmailForUsers(service string, userIDs []string, includeDeleted bool, dryRun bool) (int, error) {
 	ret := _m.Called(service, userIDs, includeDeleted, dryRun)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ResetAuthDataToEmailForUsers")
+	}
+
 	var r0 int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, []string, bool, bool) (int, error)); ok {
@@ -1402,6 +1630,10 @@ func (_m *UserStore) ResetAuthDataToEmailForUsers(service string, userIDs []stri
 func (_m *UserStore) ResetLastPictureUpdate(userID string) error {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ResetLastPictureUpdate")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(userID)
@@ -1416,6 +1648,10 @@ func (_m *UserStore) ResetLastPictureUpdate(userID string) error {
 func (_m *UserStore) Save(rctx request.CTX, user *model.User) (*model.User, error) {
 	ret := _m.Called(rctx, user)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, *model.User) (*model.User, error)); ok {
@@ -1442,6 +1678,10 @@ func (_m *UserStore) Save(rctx request.CTX, user *model.User) (*model.User, erro
 func (_m *UserStore) Search(rctx request.CTX, teamID string, term string, options *model.UserSearchOptions) ([]*model.User, error) {
 	ret := _m.Called(rctx, teamID, term, options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Search")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, string, string, *model.UserSearchOptions) ([]*model.User, error)); ok {
@@ -1468,6 +1708,10 @@ func (_m *UserStore) Search(rctx request.CTX, teamID string, term string, option
 func (_m *UserStore) SearchInChannel(channelID string, term string, options *model.UserSearchOptions) ([]*model.User, error) {
 	ret := _m.Called(channelID, term, options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SearchInChannel")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, *model.UserSearchOptions) ([]*model.User, error)); ok {
@@ -1494,6 +1738,10 @@ func (_m *UserStore) SearchInChannel(channelID string, term string, options *mod
 func (_m *UserStore) SearchInGroup(groupID string, term string, options *model.UserSearchOptions) ([]*model.User, error) {
 	ret := _m.Called(groupID, term, options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SearchInGroup")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, *model.UserSearchOptions) ([]*model.User, error)); ok {
@@ -1520,6 +1768,10 @@ func (_m *UserStore) SearchInGroup(groupID string, term string, options *model.U
 func (_m *UserStore) SearchNotInChannel(teamID string, channelID string, term string, options *model.UserSearchOptions) ([]*model.User, error) {
 	ret := _m.Called(teamID, channelID, term, options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SearchNotInChannel")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, string, *model.UserSearchOptions) ([]*model.User, error)); ok {
@@ -1546,6 +1798,10 @@ func (_m *UserStore) SearchNotInChannel(teamID string, channelID string, term st
 func (_m *UserStore) SearchNotInGroup(groupID string, term string, options *model.UserSearchOptions) ([]*model.User, error) {
 	ret := _m.Called(groupID, term, options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SearchNotInGroup")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, *model.UserSearchOptions) ([]*model.User, error)); ok {
@@ -1572,6 +1828,10 @@ func (_m *UserStore) SearchNotInGroup(groupID string, term string, options *mode
 func (_m *UserStore) SearchNotInTeam(notInTeamID string, term string, options *model.UserSearchOptions) ([]*model.User, error) {
 	ret := _m.Called(notInTeamID, term, options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SearchNotInTeam")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, *model.UserSearchOptions) ([]*model.User, error)); ok {
@@ -1598,6 +1858,10 @@ func (_m *UserStore) SearchNotInTeam(notInTeamID string, term string, options *m
 func (_m *UserStore) SearchWithoutTeam(term string, options *model.UserSearchOptions) ([]*model.User, error) {
 	ret := _m.Called(term, options)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SearchWithoutTeam")
+	}
+
 	var r0 []*model.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, *model.UserSearchOptions) ([]*model.User, error)); ok {
@@ -1624,6 +1888,10 @@ func (_m *UserStore) SearchWithoutTeam(term string, options *model.UserSearchOpt
 func (_m *UserStore) Update(rctx request.CTX, user *model.User, allowRoleUpdate bool) (*model.UserUpdate, error) {
 	ret := _m.Called(rctx, user, allowRoleUpdate)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
 	var r0 *model.UserUpdate
 	var r1 error
 	if rf, ok := ret.Get(0).(func(request.CTX, *model.User, bool) (*model.UserUpdate, error)); ok {
@@ -1650,6 +1918,10 @@ func (_m *UserStore) Update(rctx request.CTX, user *model.User, allowRoleUpdate
 func (_m *UserStore) UpdateAuthData(userID string, service string, authData *string, email string, resetMfa bool) (string, error) {
 	ret := _m.Called(userID, service, authData, email, resetMfa)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateAuthData")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, *string, string, bool) (string, error)); ok {
@@ -1674,6 +1946,10 @@ func (_m *UserStore) UpdateAuthData(userID string, service string, authData *str
 func (_m *UserStore) UpdateFailedPasswordAttempts(userID string, attempts int) error {
 	ret := _m.Called(userID, attempts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateFailedPasswordAttempts")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, int) error); ok {
 		r0 = rf(userID, attempts)
@@ -1688,6 +1964,10 @@ func (_m *UserStore) UpdateFailedPasswordAttempts(userID string, attempts int) e
 func (_m *UserStore) UpdateLastLogin(userID string, lastLogin int64) error {
 	ret := _m.Called(userID, lastLogin)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateLastLogin")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, int64) error); ok {
 		r0 = rf(userID, lastLogin)
@@ -1702,6 +1982,10 @@ func (_m *UserStore) UpdateLastLogin(userID string, lastLogin int64) error {
 func (_m *UserStore) UpdateLastPictureUpdate(userID string) error {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateLastPictureUpdate")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(userID)
@@ -1716,6 +2000,10 @@ func (_m *UserStore) UpdateLastPictureUpdate(userID string) error {
 func (_m *UserStore) UpdateMfaActive(userID string, active bool) error {
 	ret := _m.Called(userID, active)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateMfaActive")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, bool) error); ok {
 		r0 = rf(userID, active)
@@ -1730,6 +2018,10 @@ func (_m *UserStore) UpdateMfaActive(userID string, active bool) error {
 func (_m *UserStore) UpdateMfaSecret(userID string, secret string) error {
 	ret := _m.Called(userID, secret)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateMfaSecret")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 		r0 = rf(userID, secret)
@@ -1744,6 +2036,10 @@ func (_m *UserStore) UpdateMfaSecret(userID string, secret string) error {
 func (_m *UserStore) UpdateNotifyProps(userID string, props map[string]string) error {
 	ret := _m.Called(userID, props)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateNotifyProps")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, map[string]string) error); ok {
 		r0 = rf(userID, props)
@@ -1758,6 +2054,10 @@ func (_m *UserStore) UpdateNotifyProps(userID string, props map[string]string) e
 func (_m *UserStore) UpdatePassword(userID string, newPassword string) error {
 	ret := _m.Called(userID, newPassword)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdatePassword")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 		r0 = rf(userID, newPassword)
@@ -1772,6 +2072,10 @@ func (_m *UserStore) UpdatePassword(userID string, newPassword string) error {
 func (_m *UserStore) UpdateUpdateAt(userID string) (int64, error) {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateUpdateAt")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (int64, error)); ok {
@@ -1796,6 +2100,10 @@ func (_m *UserStore) UpdateUpdateAt(userID string) (int64, error) {
 func (_m *UserStore) VerifyEmail(userID string, email string) (string, error) {
 	ret := _m.Called(userID, email)
 
+	if len(ret) == 0 {
+		panic("no return value specified for VerifyEmail")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (string, error)); ok {
@@ -1816,13 +2124,12 @@ func (_m *UserStore) VerifyEmail(userID string, email string) (string, error) {
 	return r0, r1
 }
 
-type mockConstructorTestingTNewUserStore interface {
+// NewUserStore creates a new instance of UserStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewUserStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewUserStore creates a new instance of UserStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewUserStore(t mockConstructorTestingTNewUserStore) *UserStore {
+}) *UserStore {
 	mock := &UserStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/UserTermsOfServiceStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type UserTermsOfServiceStore struct {
 func (_m *UserTermsOfServiceStore) Delete(userID string, termsOfServiceId string) error {
 	ret := _m.Called(userID, termsOfServiceId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 		r0 = rf(userID, termsOfServiceId)
@@ -32,6 +36,10 @@ func (_m *UserTermsOfServiceStore) Delete(userID string, termsOfServiceId string
 func (_m *UserTermsOfServiceStore) GetByUser(userID string) (*model.UserTermsOfService, error) {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetByUser")
+	}
+
 	var r0 *model.UserTermsOfService
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.UserTermsOfService, error)); ok {
@@ -58,6 +66,10 @@ func (_m *UserTermsOfServiceStore) GetByUser(userID string) (*model.UserTermsOfS
 func (_m *UserTermsOfServiceStore) Save(userTermsOfService *model.UserTermsOfService) (*model.UserTermsOfService, error) {
 	ret := _m.Called(userTermsOfService)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Save")
+	}
+
 	var r0 *model.UserTermsOfService
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.UserTermsOfService) (*model.UserTermsOfService, error)); ok {
@@ -80,13 +92,12 @@ func (_m *UserTermsOfServiceStore) Save(userTermsOfService *model.UserTermsOfSer
 	return r0, r1
 }
 
-type mockConstructorTestingTNewUserTermsOfServiceStore interface {
+// NewUserTermsOfServiceStore creates a new instance of UserTermsOfServiceStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewUserTermsOfServiceStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewUserTermsOfServiceStore creates a new instance of UserTermsOfServiceStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewUserTermsOfServiceStore(t mockConstructorTestingTNewUserTermsOfServiceStore) *UserTermsOfServiceStore {
+}) *UserTermsOfServiceStore {
 	mock := &UserTermsOfServiceStore{}
 	mock.Mock.Test(t)
 

server/channels/store/storetest/mocks/WebhookStore.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make store-mocks`.
 
@@ -18,6 +18,10 @@ type WebhookStore struct {
 func (_m *WebhookStore) AnalyticsIncomingCount(teamID string) (int64, error) {
 	ret := _m.Called(teamID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AnalyticsIncomingCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (int64, error)); ok {
@@ -42,6 +46,10 @@ func (_m *WebhookStore) AnalyticsIncomingCount(teamID string) (int64, error) {
 func (_m *WebhookStore) AnalyticsOutgoingCount(teamID string) (int64, error) {
 	ret := _m.Called(teamID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AnalyticsOutgoingCount")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (int64, error)); ok {
@@ -71,6 +79,10 @@ func (_m *WebhookStore) ClearCaches() {
 func (_m *WebhookStore) DeleteIncoming(webhookID string, timestamp int64) error {
 	ret := _m.Called(webhookID, timestamp)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteIncoming")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, int64) error); ok {
 		r0 = rf(webhookID, timestamp)
@@ -85,6 +97,10 @@ func (_m *WebhookStore) DeleteIncoming(webhookID string, timestamp int64) error
 func (_m *WebhookStore) DeleteOutgoing(webhookID string, timestamp int64) error {
 	ret := _m.Called(webhookID, timestamp)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteOutgoing")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, int64) error); ok {
 		r0 = rf(webhookID, timestamp)
@@ -99,6 +115,10 @@ func (_m *WebhookStore) DeleteOutgoing(webhookID string, timestamp int64) error
 func (_m *WebhookStore) GetIncoming(id string, allowFromCache bool) (*model.IncomingWebhook, error) {
 	ret := _m.Called(id, allowFromCache)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetIncoming")
+	}
+
 	var r0 *model.IncomingWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, bool) (*model.IncomingWebhook, error)); ok {
@@ -125,6 +145,10 @@ func (_m *WebhookStore) GetIncoming(id string, allowFromCache bool) (*model.Inco
 func (_m *WebhookStore) GetIncomingByChannel(channelID string) ([]*model.IncomingWebhook, error) {
 	ret := _m.Called(channelID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetIncomingByChannel")
+	}
+
 	var r0 []*model.IncomingWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]*model.IncomingWebhook, error)); ok {
@@ -151,6 +175,10 @@ func (_m *WebhookStore) GetIncomingByChannel(channelID string) ([]*model.Incomin
 func (_m *WebhookStore) GetIncomingByTeam(teamID string, offset int, limit int) ([]*model.IncomingWebhook, error) {
 	ret := _m.Called(teamID, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetIncomingByTeam")
+	}
+
 	var r0 []*model.IncomingWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int) ([]*model.IncomingWebhook, error)); ok {
@@ -177,6 +205,10 @@ func (_m *WebhookStore) GetIncomingByTeam(teamID string, offset int, limit int)
 func (_m *WebhookStore) GetIncomingByTeamByUser(teamID string, userID string, offset int, limit int) ([]*model.IncomingWebhook, error) {
 	ret := _m.Called(teamID, userID, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetIncomingByTeamByUser")
+	}
+
 	var r0 []*model.IncomingWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, int, int) ([]*model.IncomingWebhook, error)); ok {
@@ -203,6 +235,10 @@ func (_m *WebhookStore) GetIncomingByTeamByUser(teamID string, userID string, of
 func (_m *WebhookStore) GetIncomingList(offset int, limit int) ([]*model.IncomingWebhook, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetIncomingList")
+	}
+
 	var r0 []*model.IncomingWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int, int) ([]*model.IncomingWebhook, error)); ok {
@@ -229,6 +265,10 @@ func (_m *WebhookStore) GetIncomingList(offset int, limit int) ([]*model.Incomin
 func (_m *WebhookStore) GetIncomingListByUser(userID string, offset int, limit int) ([]*model.IncomingWebhook, error) {
 	ret := _m.Called(userID, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetIncomingListByUser")
+	}
+
 	var r0 []*model.IncomingWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int) ([]*model.IncomingWebhook, error)); ok {
@@ -255,6 +295,10 @@ func (_m *WebhookStore) GetIncomingListByUser(userID string, offset int, limit i
 func (_m *WebhookStore) GetOutgoing(id string) (*model.OutgoingWebhook, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetOutgoing")
+	}
+
 	var r0 *model.OutgoingWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*model.OutgoingWebhook, error)); ok {
@@ -281,6 +325,10 @@ func (_m *WebhookStore) GetOutgoing(id string) (*model.OutgoingWebhook, error) {
 func (_m *WebhookStore) GetOutgoingByChannel(channelID string, offset int, limit int) ([]*model.OutgoingWebhook, error) {
 	ret := _m.Called(channelID, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetOutgoingByChannel")
+	}
+
 	var r0 []*model.OutgoingWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int) ([]*model.OutgoingWebhook, error)); ok {
@@ -307,6 +355,10 @@ func (_m *WebhookStore) GetOutgoingByChannel(channelID string, offset int, limit
 func (_m *WebhookStore) GetOutgoingByChannelByUser(channelID string, userID string, offset int, limit int) ([]*model.OutgoingWebhook, error) {
 	ret := _m.Called(channelID, userID, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetOutgoingByChannelByUser")
+	}
+
 	var r0 []*model.OutgoingWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, int, int) ([]*model.OutgoingWebhook, error)); ok {
@@ -333,6 +385,10 @@ func (_m *WebhookStore) GetOutgoingByChannelByUser(channelID string, userID stri
 func (_m *WebhookStore) GetOutgoingByTeam(teamID string, offset int, limit int) ([]*model.OutgoingWebhook, error) {
 	ret := _m.Called(teamID, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetOutgoingByTeam")
+	}
+
 	var r0 []*model.OutgoingWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int) ([]*model.OutgoingWebhook, error)); ok {
@@ -359,6 +415,10 @@ func (_m *WebhookStore) GetOutgoingByTeam(teamID string, offset int, limit int)
 func (_m *WebhookStore) GetOutgoingByTeamByUser(teamID string, userID string, offset int, limit int) ([]*model.OutgoingWebhook, error) {
 	ret := _m.Called(teamID, userID, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetOutgoingByTeamByUser")
+	}
+
 	var r0 []*model.OutgoingWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string, int, int) ([]*model.OutgoingWebhook, error)); ok {
@@ -385,6 +445,10 @@ func (_m *WebhookStore) GetOutgoingByTeamByUser(teamID string, userID string, of
 func (_m *WebhookStore) GetOutgoingList(offset int, limit int) ([]*model.OutgoingWebhook, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetOutgoingList")
+	}
+
 	var r0 []*model.OutgoingWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int, int) ([]*model.OutgoingWebhook, error)); ok {
@@ -411,6 +475,10 @@ func (_m *WebhookStore) GetOutgoingList(offset int, limit int) ([]*model.Outgoin
 func (_m *WebhookStore) GetOutgoingListByUser(userID string, offset int, limit int) ([]*model.OutgoingWebhook, error) {
 	ret := _m.Called(userID, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetOutgoingListByUser")
+	}
+
 	var r0 []*model.OutgoingWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int, int) ([]*model.OutgoingWebhook, error)); ok {
@@ -442,6 +510,10 @@ func (_m *WebhookStore) InvalidateWebhookCache(webhook string) {
 func (_m *WebhookStore) PermanentDeleteIncomingByChannel(channelID string) error {
 	ret := _m.Called(channelID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteIncomingByChannel")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(channelID)
@@ -456,6 +528,10 @@ func (_m *WebhookStore) PermanentDeleteIncomingByChannel(channelID string) error
 func (_m *WebhookStore) PermanentDeleteIncomingByUser(userID string) error {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteIncomingByUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(userID)
@@ -470,6 +546,10 @@ func (_m *WebhookStore) PermanentDeleteIncomingByUser(userID string) error {
 func (_m *WebhookStore) PermanentDeleteOutgoingByChannel(channelID string) error {
 	ret := _m.Called(channelID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteOutgoingByChannel")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(channelID)
@@ -484,6 +564,10 @@ func (_m *WebhookStore) PermanentDeleteOutgoingByChannel(channelID string) error
 func (_m *WebhookStore) PermanentDeleteOutgoingByUser(userID string) error {
 	ret := _m.Called(userID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PermanentDeleteOutgoingByUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(userID)
@@ -498,6 +582,10 @@ func (_m *WebhookStore) PermanentDeleteOutgoingByUser(userID string) error {
 func (_m *WebhookStore) SaveIncoming(webhook *model.IncomingWebhook) (*model.IncomingWebhook, error) {
 	ret := _m.Called(webhook)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveIncoming")
+	}
+
 	var r0 *model.IncomingWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.IncomingWebhook) (*model.IncomingWebhook, error)); ok {
@@ -524,6 +612,10 @@ func (_m *WebhookStore) SaveIncoming(webhook *model.IncomingWebhook) (*model.Inc
 func (_m *WebhookStore) SaveOutgoing(webhook *model.OutgoingWebhook) (*model.OutgoingWebhook, error) {
 	ret := _m.Called(webhook)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveOutgoing")
+	}
+
 	var r0 *model.OutgoingWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.OutgoingWebhook) (*model.OutgoingWebhook, error)); ok {
@@ -550,6 +642,10 @@ func (_m *WebhookStore) SaveOutgoing(webhook *model.OutgoingWebhook) (*model.Out
 func (_m *WebhookStore) UpdateIncoming(webhook *model.IncomingWebhook) (*model.IncomingWebhook, error) {
 	ret := _m.Called(webhook)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateIncoming")
+	}
+
 	var r0 *model.IncomingWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.IncomingWebhook) (*model.IncomingWebhook, error)); ok {
@@ -576,6 +672,10 @@ func (_m *WebhookStore) UpdateIncoming(webhook *model.IncomingWebhook) (*model.I
 func (_m *WebhookStore) UpdateOutgoing(hook *model.OutgoingWebhook) (*model.OutgoingWebhook, error) {
 	ret := _m.Called(hook)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateOutgoing")
+	}
+
 	var r0 *model.OutgoingWebhook
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*model.OutgoingWebhook) (*model.OutgoingWebhook, error)); ok {
@@ -598,13 +698,12 @@ func (_m *WebhookStore) UpdateOutgoing(hook *model.OutgoingWebhook) (*model.Outg
 	return r0, r1
 }
 
-type mockConstructorTestingTNewWebhookStore interface {
+// NewWebhookStore creates a new instance of WebhookStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewWebhookStore(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewWebhookStore creates a new instance of WebhookStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewWebhookStore(t mockConstructorTestingTNewWebhookStore) *WebhookStore {
+}) *WebhookStore {
 	mock := &WebhookStore{}
 	mock.Mock.Test(t)
 

server/channels/utils/mocks/LicenseValidatorIface.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.23.2. DO NOT EDIT.
+// Code generated by mockery v2.42.2. DO NOT EDIT.
 
 // Regenerate this file using `make misc-mocks`.
 
@@ -18,6 +18,10 @@ type LicenseValidatorIface struct {
 func (_m *LicenseValidatorIface) LicenseFromBytes(licenseBytes []byte) (*model.License, *model.AppError) {
 	ret := _m.Called(licenseBytes)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LicenseFromBytes")
+	}
+
 	var r0 *model.License
 	var r1 *model.AppError
 	if rf, ok := ret.Get(0).(func([]byte) (*model.License, *model.AppError)); ok {
@@ -46,6 +50,10 @@ func (_m *LicenseValidatorIface) LicenseFromBytes(licenseBytes []byte) (*model.L
 func (_m *LicenseValidatorIface) ValidateLicense(signed []byte) (string, error) {
 	ret := _m.Called(signed)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ValidateLicense")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte) (string, error)); ok {
@@ -66,13 +74,12 @@ func (_m *LicenseValidatorIface) ValidateLicense(signed []byte) (string, error)
 	return r0, r1
 }
 
-type mockConstructorTestingTNewLicenseValidatorIface interface {
+// NewLicenseValidatorIface creates a new instance of LicenseValidatorIface. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewLicenseValidatorIface(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewLicenseValidatorIface creates a new instance of LicenseValidatorIface. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewLicenseValidatorIface(t mockConstructorTestingTNewLicenseValidatorIface) *LicenseValidatorIface {
+}) *LicenseValidatorIface {
 	mock := &LicenseValidatorIface{}
 	mock.Mock.Test(t)