From 6356e906e01ac20d6c77efaea588225d86750823 Mon Sep 17 00:00:00 2001 From: Haardik Dharma Date: Thu, 18 Feb 2021 20:06:56 +0530 Subject: [PATCH] [Partial Fix - #16623]: Fix initialism errors in codebase. (#16877) * Update files in /app * Update files in /plugin * Update files in /store * Update files in /utils * Update files in /web * Update store.go * Update command_response.go * check-mocks and check-store-layer checks * Fix build errors * Revert "Fix build errors" This reverts commit 4ee38c3d0bf7bd7d8386f46f0985a0d03245a1d4. * Update .golangci.yml * make i18n-extract and make i18n-check * Commit suggestions * check-mocks and check-store-layers * Update en.json * Update product_notices.go * Update main.go * Fix translations * Regenerate mocks Co-authored-by: Mattermod Co-authored-by: Claudio Costa --- app/app.go | 2 +- app/bot.go | 16 +- app/channel.go | 10 +- app/email.go | 10 +- app/file.go | 2 +- app/login.go | 4 +- app/oauth.go | 6 +- app/plugin.go | 2 +- app/plugin_requests.go | 2 +- app/post.go | 8 +- app/product_notices.go | 2 +- app/ratelimit.go | 4 +- app/reaction.go | 4 +- app/team.go | 4 +- app/upload.go | 2 +- app/user.go | 2 +- config/store.go | 2 +- go.tools.mod | 3 +- go.tools.sum | 171 +++++ model/command_response.go | 2 +- plugin/client_rpc.go | 18 +- plugin/client_rpc_generated.go | 60 +- plugin/hooks.go | 44 +- plugin/interface_generator/main.go | 4 +- plugin/supervisor.go | 2 +- store/errors.go | 6 +- store/opentracinglayer/opentracinglayer.go | 678 +++++++++--------- store/retrylayer/retrylayer.go | 676 ++++++++--------- store/store.go | 340 ++++----- .../mocks/ChannelMemberHistoryStore.go | 26 +- store/storetest/mocks/ChannelStore.go | 568 +++++++-------- store/storetest/mocks/CommandStore.go | 46 +- store/storetest/mocks/FileInfoStore.go | 60 +- store/storetest/mocks/GroupStore.go | 50 +- store/storetest/mocks/PluginStore.go | 46 +- store/storetest/mocks/PostStore.go | 160 ++--- store/storetest/mocks/ReactionStore.go | 10 +- store/storetest/mocks/RoleStore.go | 20 +- store/storetest/mocks/SchemeStore.go | 20 +- store/storetest/mocks/SessionStore.go | 52 +- store/storetest/mocks/TeamStore.go | 160 ++--- store/storetest/mocks/ThreadStore.go | 52 +- store/storetest/mocks/UserAccessTokenStore.go | 34 +- store/storetest/mocks/UserStore.go | 132 ++-- store/storetest/mocks/WebhookStore.go | 122 ++-- store/timerlayer/timerlayer.go | 676 ++++++++--------- utils/api.go | 6 +- utils/html.go | 12 +- utils/html_test.go | 4 +- utils/jsonutils/json.go | 18 +- utils/jsonutils/json_test.go | 32 +- utils/markdown/autolink.go | 4 +- utils/subpath.go | 20 +- utils/subpath_test.go | 40 +- utils/urlencode.go | 2 +- utils/urlencode_test.go | 6 +- utils/utils.go | 8 +- utils/utils_test.go | 22 +- web/handlers.go | 2 +- web/web.go | 2 +- 60 files changed, 2335 insertions(+), 2163 deletions(-) diff --git a/app/app.go b/app/app.go index ca6c640a2d..2a2b54de7d 100644 --- a/app/app.go +++ b/app/app.go @@ -159,7 +159,7 @@ func (s *Server) HTMLTemplates() *template.Template { } func (a *App) Handle404(w http.ResponseWriter, r *http.Request) { - ipAddress := utils.GetIpAddress(r, a.Config().ServiceSettings.TrustedProxyIPHeader) + ipAddress := utils.GetIPAddress(r, a.Config().ServiceSettings.TrustedProxyIPHeader) mlog.Debug("not found handler triggered", mlog.String("path", r.URL.Path), mlog.Int("code", 404), mlog.String("ip", ipAddress)) if *a.Config().ServiceSettings.WebserverMode == "disabled" { diff --git a/app/bot.go b/app/bot.go index 354d94bb17..0682d09162 100644 --- a/app/bot.go +++ b/app/bot.go @@ -198,7 +198,7 @@ func (a *App) PatchBot(botUserId string, botPatch *model.BotPatch) (*model.Bot, var appErr *model.AppError switch { case errors.As(nErr, &nfErr): - return nil, model.MakeBotNotFoundError(nfErr.Id) + return nil, model.MakeBotNotFoundError(nfErr.ID) case errors.As(nErr, &appErr): // in case we haven't converted to plain error. return nil, appErr default: // last fallback in case it doesn't map to an existing app error. @@ -215,7 +215,7 @@ func (a *App) GetBot(botUserId string, includeDeleted bool) (*model.Bot, *model. var nfErr *store.ErrNotFound switch { case errors.As(err, &nfErr): - return nil, model.MakeBotNotFoundError(nfErr.Id) + return nil, model.MakeBotNotFoundError(nfErr.ID) default: // last fallback in case it doesn't map to an existing app error. return nil, model.NewAppError("GetBot", "app.bot.getbot.internal_error", nil, err.Error(), http.StatusInternalServerError) } @@ -254,7 +254,7 @@ func (a *App) UpdateBotActive(botUserId string, active bool) (*model.Bot, *model var nfErr *store.ErrNotFound switch { case errors.As(nErr, &nfErr): - return nil, model.MakeBotNotFoundError(nfErr.Id) + return nil, model.MakeBotNotFoundError(nfErr.ID) default: // last fallback in case it doesn't map to an existing app error. return nil, model.NewAppError("UpdateBotActive", "app.bot.getbot.internal_error", nil, nErr.Error(), http.StatusInternalServerError) } @@ -276,7 +276,7 @@ func (a *App) UpdateBotActive(botUserId string, active bool) (*model.Bot, *model var appErr *model.AppError switch { case errors.As(nErr, &nfErr): - return nil, model.MakeBotNotFoundError(nfErr.Id) + return nil, model.MakeBotNotFoundError(nfErr.ID) case errors.As(nErr, &appErr): // in case we haven't converted to plain error. return nil, appErr default: // last fallback in case it doesn't map to an existing app error. @@ -314,7 +314,7 @@ func (a *App) UpdateBotOwner(botUserId, newOwnerId string) (*model.Bot, *model.A var nfErr *store.ErrNotFound switch { case errors.As(err, &nfErr): - return nil, model.MakeBotNotFoundError(nfErr.Id) + return nil, model.MakeBotNotFoundError(nfErr.ID) default: // last fallback in case it doesn't map to an existing app error. return nil, model.NewAppError("UpdateBotOwner", "app.bot.getbot.internal_error", nil, err.Error(), http.StatusInternalServerError) } @@ -328,7 +328,7 @@ func (a *App) UpdateBotOwner(botUserId, newOwnerId string) (*model.Bot, *model.A var appErr *model.AppError switch { case errors.As(err, &nfErr): - return nil, model.MakeBotNotFoundError(nfErr.Id) + return nil, model.MakeBotNotFoundError(nfErr.ID) case errors.As(err, &appErr): // in case we haven't converted to plain error. return nil, appErr default: // last fallback in case it doesn't map to an existing app error. @@ -534,7 +534,7 @@ func (a *App) SetBotIconImage(botUserId string, file io.ReadSeeker) *model.AppEr var appErr *model.AppError switch { case errors.As(err, &nfErr): - return model.MakeBotNotFoundError(nfErr.Id) + return model.MakeBotNotFoundError(nfErr.ID) case errors.As(err, &appErr): // in case we haven't converted to plain error. return appErr default: // last fallback in case it doesn't map to an existing app error. @@ -568,7 +568,7 @@ func (a *App) DeleteBotIconImage(botUserId string) *model.AppError { var appErr *model.AppError switch { case errors.As(err, &nfErr): - return model.MakeBotNotFoundError(nfErr.Id) + return model.MakeBotNotFoundError(nfErr.ID) case errors.As(err, &appErr): // in case we haven't converted to plain error. return appErr default: // last fallback in case it doesn't map to an existing app error. diff --git a/app/channel.go b/app/channel.go index a9745b1c3d..2c82ee02b7 100644 --- a/app/channel.go +++ b/app/channel.go @@ -314,7 +314,7 @@ func (a *App) CreateChannel(channel *model.Channel, addMember bool) (*model.Chan pluginsEnvironment.RunMultiPluginHook(func(hooks plugin.Hooks) bool { hooks.ChannelHasBeenCreated(pluginContext, sc) return true - }, plugin.ChannelHasBeenCreatedId) + }, plugin.ChannelHasBeenCreatedID) }) } @@ -377,7 +377,7 @@ func (a *App) handleCreationEvent(userID, otherUserID string, channel *model.Cha pluginsEnvironment.RunMultiPluginHook(func(hooks plugin.Hooks) bool { hooks.ChannelHasBeenCreated(pluginContext, channel) return true - }, plugin.ChannelHasBeenCreatedId) + }, plugin.ChannelHasBeenCreatedID) }) } @@ -1441,7 +1441,7 @@ func (a *App) AddChannelMember(userID string, channel *model.Channel, userReques pluginsEnvironment.RunMultiPluginHook(func(hooks plugin.Hooks) bool { hooks.UserHasJoinedChannel(pluginContext, cm, userRequestor) return true - }, plugin.UserHasJoinedChannelId) + }, plugin.UserHasJoinedChannelID) }) } @@ -1950,7 +1950,7 @@ func (a *App) JoinChannel(channel *model.Channel, userID string) *model.AppError pluginsEnvironment.RunMultiPluginHook(func(hooks plugin.Hooks) bool { hooks.UserHasJoinedChannel(pluginContext, cm, nil) return true - }, plugin.UserHasJoinedChannelId) + }, plugin.UserHasJoinedChannelID) }) } @@ -2248,7 +2248,7 @@ func (a *App) removeUserFromChannel(userIDToRemove string, removerUserId string, pluginsEnvironment.RunMultiPluginHook(func(hooks plugin.Hooks) bool { hooks.UserHasLeftChannel(pluginContext, cm, actorUser) return true - }, plugin.UserHasLeftChannelId) + }, plugin.UserHasLeftChannelID) }) } diff --git a/app/email.go b/app/email.go index 52f8aa6e6a..b5d420da7c 100644 --- a/app/email.go +++ b/app/email.go @@ -298,7 +298,7 @@ func (es *EmailService) SendPasswordResetEmail(email string, token *model.Token, bodyPage := es.newEmailTemplate("reset_body", locale) bodyPage.Props["SiteURL"] = siteURL bodyPage.Props["Title"] = T("api.templates.reset_body.title") - bodyPage.Props["Info1"] = utils.TranslateAsHtml(T, "api.templates.reset_body.info1", nil) + bodyPage.Props["Info1"] = utils.TranslateAsHTML(T, "api.templates.reset_body.info1", nil) bodyPage.Props["Info2"] = T("api.templates.reset_body.info2") bodyPage.Props["ResetUrl"] = link bodyPage.Props["Button"] = T("api.templates.reset_body.button") @@ -362,10 +362,10 @@ func (es *EmailService) SendInviteEmails(team *model.Team, senderName string, se bodyPage := es.newEmailTemplate("invite_body", "") bodyPage.Props["SiteURL"] = siteURL bodyPage.Props["Title"] = utils.T("api.templates.invite_body.title") - bodyPage.Html["Info"] = utils.TranslateAsHtml(utils.T, "api.templates.invite_body.info", + bodyPage.HTML["Info"] = utils.TranslateAsHTML(utils.T, "api.templates.invite_body.info", map[string]interface{}{"SenderName": senderName, "TeamDisplayName": team.DisplayName}) bodyPage.Props["Button"] = utils.T("api.templates.invite_body.button") - bodyPage.Html["ExtraInfo"] = utils.TranslateAsHtml(utils.T, "api.templates.invite_body.extra_info", + bodyPage.HTML["ExtraInfo"] = utils.TranslateAsHTML(utils.T, "api.templates.invite_body.extra_info", map[string]interface{}{"TeamDisplayName": team.DisplayName}) bodyPage.Props["TeamURL"] = siteURL + "/" + team.Name @@ -421,7 +421,7 @@ func (es *EmailService) sendGuestInviteEmails(team *model.Team, channels []*mode bodyPage := es.newEmailTemplate("invite_body", "") bodyPage.Props["SiteURL"] = siteURL bodyPage.Props["Title"] = utils.T("api.templates.invite_body.title") - bodyPage.Html["Info"] = utils.TranslateAsHtml(utils.T, "api.templates.invite_body_guest.info", + bodyPage.HTML["Info"] = utils.TranslateAsHTML(utils.T, "api.templates.invite_body_guest.info", map[string]interface{}{"SenderName": senderName, "TeamDisplayName": team.DisplayName}) bodyPage.Props["Button"] = utils.T("api.templates.invite_body.button") bodyPage.Props["SenderName"] = senderName @@ -430,7 +430,7 @@ func (es *EmailService) sendGuestInviteEmails(team *model.Team, channels []*mode if message != "" { bodyPage.Props["Message"] = message } - bodyPage.Html["ExtraInfo"] = utils.TranslateAsHtml(utils.T, "api.templates.invite_body.extra_info", + bodyPage.HTML["ExtraInfo"] = utils.TranslateAsHTML(utils.T, "api.templates.invite_body.extra_info", map[string]interface{}{"TeamDisplayName": team.DisplayName}) bodyPage.Props["TeamURL"] = siteURL + "/" + team.Name diff --git a/app/file.go b/app/file.go index 6e69c8cbf6..e2c3d8d813 100644 --- a/app/file.go +++ b/app/file.go @@ -1000,7 +1000,7 @@ func (a *App) DoUploadFileExpectModification(now time.Time, rawTeamId string, ra } return true - }, plugin.FileWillBeUploadedId) + }, plugin.FileWillBeUploadedID) if rejectionError != nil { return nil, data, rejectionError } diff --git a/app/login.go b/app/login.go index 9484f62c73..2832f94e06 100644 --- a/app/login.go +++ b/app/login.go @@ -161,7 +161,7 @@ func (a *App) DoLogin(w http.ResponseWriter, r *http.Request, user *model.User, pluginsEnvironment.RunMultiPluginHook(func(hooks plugin.Hooks) bool { rejectionReason = hooks.UserWillLogIn(pluginContext, user) return rejectionReason == "" - }, plugin.UserWillLogInId) + }, plugin.UserWillLogInID) if rejectionReason != "" { return model.NewAppError("DoLogin", "Login rejected by plugin: "+rejectionReason, nil, "", http.StatusBadRequest) @@ -231,7 +231,7 @@ func (a *App) DoLogin(w http.ResponseWriter, r *http.Request, user *model.User, pluginsEnvironment.RunMultiPluginHook(func(hooks plugin.Hooks) bool { hooks.UserHasLoggedIn(pluginContext, user) return true - }, plugin.UserHasLoggedInId) + }, plugin.UserHasLoggedInID) }) } diff --git a/app/oauth.go b/app/oauth.go index 08ceda7937..d37d490953 100644 --- a/app/oauth.go +++ b/app/oauth.go @@ -767,11 +767,11 @@ func (a *App) GetAuthorizationCode(w http.ResponseWriter, r *http.Request, servi authUrl := endpoint + "?response_type=code&client_id=" + clientId + "&redirect_uri=" + url.QueryEscape(redirectUri) + "&state=" + url.QueryEscape(state) if scope != "" { - authUrl += "&scope=" + utils.UrlEncode(scope) + authUrl += "&scope=" + utils.URLEncode(scope) } if loginHint != "" { - authUrl += "&login_hint=" + utils.UrlEncode(loginHint) + authUrl += "&login_hint=" + utils.URLEncode(loginHint) } return authUrl, nil @@ -935,7 +935,7 @@ func (a *App) SwitchEmailToOAuth(w http.ResponseWriter, r *http.Request, email, stateProps["email"] = email if service == model.USER_AUTH_SERVICE_SAML { - return a.GetSiteURL() + "/login/sso/saml?action=" + model.OAUTH_ACTION_EMAIL_TO_SSO + "&email=" + utils.UrlEncode(email), nil + return a.GetSiteURL() + "/login/sso/saml?action=" + model.OAUTH_ACTION_EMAIL_TO_SSO + "&email=" + utils.URLEncode(email), nil } authUrl, err := a.GetAuthorizationCode(w, r, service, stateProps, "") diff --git a/app/plugin.go b/app/plugin.go index 92899f60e4..f86c3526e2 100644 --- a/app/plugin.go +++ b/app/plugin.go @@ -212,7 +212,7 @@ func (a *App) InitPlugins(pluginDir, webappPluginDir string) { a.Log().Error("Plugin OnConfigurationChange hook failed", mlog.Err(err)) } return true - }, plugin.OnConfigurationChangeId) + }, plugin.OnConfigurationChangeID) } }) a.Srv().PluginsLock.Unlock() diff --git a/app/plugin_requests.go b/app/plugin_requests.go index 21aafe9c1d..c8b335bad7 100644 --- a/app/plugin_requests.go +++ b/app/plugin_requests.go @@ -117,7 +117,7 @@ func (a *App) servePluginRequest(w http.ResponseWriter, r *http.Request, handler token := "" context := &plugin.Context{ RequestId: model.NewId(), - IpAddress: utils.GetIpAddress(r, a.Config().ServiceSettings.TrustedProxyIPHeader), + IpAddress: utils.GetIPAddress(r, a.Config().ServiceSettings.TrustedProxyIPHeader), AcceptLanguage: r.Header.Get("Accept-Language"), UserAgent: r.UserAgent(), } diff --git a/app/post.go b/app/post.go index fc0d6b4e40..65be0aeac8 100644 --- a/app/post.go +++ b/app/post.go @@ -296,7 +296,7 @@ func (a *App) CreatePost(post *model.Post, channel *model.Channel, triggerWebhoo } return true - }, plugin.MessageWillBePostedId) + }, plugin.MessageWillBePostedID) if rejectionError != nil { return nil, rejectionError @@ -329,7 +329,7 @@ func (a *App) CreatePost(post *model.Post, channel *model.Channel, triggerWebhoo pluginsEnvironment.RunMultiPluginHook(func(hooks plugin.Hooks) bool { hooks.MessageHasBeenPosted(pluginContext, rPostCopy) return true - }, plugin.MessageHasBeenPostedId) + }, plugin.MessageHasBeenPostedID) }) } @@ -621,7 +621,7 @@ func (a *App) UpdatePost(post *model.Post, safeUpdate bool) (*model.Post, *model pluginsEnvironment.RunMultiPluginHook(func(hooks plugin.Hooks) bool { newPost, rejectionReason = hooks.MessageWillBeUpdated(pluginContext, newPost, oldPost) return post != nil - }, plugin.MessageWillBeUpdatedId) + }, plugin.MessageWillBeUpdatedID) if newPost == nil { return nil, model.NewAppError("UpdatePost", "Post rejected by plugin. "+rejectionReason, nil, "", http.StatusBadRequest) } @@ -644,7 +644,7 @@ func (a *App) UpdatePost(post *model.Post, safeUpdate bool) (*model.Post, *model pluginsEnvironment.RunMultiPluginHook(func(hooks plugin.Hooks) bool { hooks.MessageHasBeenUpdated(pluginContext, newPost, oldPost) return true - }, plugin.MessageHasBeenUpdatedId) + }, plugin.MessageHasBeenUpdatedID) }) } diff --git a/app/product_notices.go b/app/product_notices.go index 10dbaa8022..97c22d8597 100644 --- a/app/product_notices.go +++ b/app/product_notices.go @@ -350,7 +350,7 @@ func (a *App) UpdateProductNotices() *model.AppError { cachedDBMSVersion = strings.Split(cachedDBMSVersion, " ")[0] // get rid of trailing strings attached to the version - data, err := utils.GetUrlWithCache(url, ¬icesCache, skip) + data, err := utils.GetURLWithCache(url, ¬icesCache, skip) if err != nil { return model.NewAppError("UpdateProductNotices", "api.system.update_notices.fetch_failed", nil, err.Error(), http.StatusBadRequest) } diff --git a/app/ratelimit.go b/app/ratelimit.go index 9f0266c8ca..189422e775 100644 --- a/app/ratelimit.go +++ b/app/ratelimit.go @@ -59,10 +59,10 @@ func (rl *RateLimiter) GenerateKey(r *http.Request) string { if tokenLocation != TokenLocationNotFound { key += token } else if rl.useIP { // If we don't find an authentication token and IP based is enabled, fall back to IP - key += utils.GetIpAddress(r, rl.trustedProxyIPHeader) + key += utils.GetIPAddress(r, rl.trustedProxyIPHeader) } } else if rl.useIP { // Only if Auth based is not enabed do we use a plain IP based - key += utils.GetIpAddress(r, rl.trustedProxyIPHeader) + key += utils.GetIPAddress(r, rl.trustedProxyIPHeader) } // Note that most of the time the user won't have to set this because the utils.GetIpAddress above tries the diff --git a/app/reaction.go b/app/reaction.go index b91538f66f..e5909b04f5 100644 --- a/app/reaction.go +++ b/app/reaction.go @@ -58,7 +58,7 @@ func (a *App) SaveReactionForPost(reaction *model.Reaction) (*model.Reaction, *m pluginsEnvironment.RunMultiPluginHook(func(hooks plugin.Hooks) bool { hooks.ReactionHasBeenAdded(pluginContext, reaction) return true - }, plugin.ReactionHasBeenAddedId) + }, plugin.ReactionHasBeenAddedID) }) } @@ -144,7 +144,7 @@ func (a *App) DeleteReactionForPost(reaction *model.Reaction) *model.AppError { pluginsEnvironment.RunMultiPluginHook(func(hooks plugin.Hooks) bool { hooks.ReactionHasBeenRemoved(pluginContext, reaction) return true - }, plugin.ReactionHasBeenRemovedId) + }, plugin.ReactionHasBeenRemovedID) }) } diff --git a/app/team.go b/app/team.go index 3b87126e49..8f745b3945 100644 --- a/app/team.go +++ b/app/team.go @@ -775,7 +775,7 @@ func (a *App) JoinUserToTeam(team *model.Team, user *model.User, userRequestorId pluginsEnvironment.RunMultiPluginHook(func(hooks plugin.Hooks) bool { hooks.UserHasJoinedTeam(pluginContext, tm, actor) return true - }, plugin.UserHasJoinedTeamId) + }, plugin.UserHasJoinedTeamID) }) } @@ -1241,7 +1241,7 @@ func (a *App) RemoveTeamMemberFromTeam(teamMember *model.TeamMember, requestorId pluginsEnvironment.RunMultiPluginHook(func(hooks plugin.Hooks) bool { hooks.UserHasLeftTeam(pluginContext, teamMember, actor) return true - }, plugin.UserHasLeftTeamId) + }, plugin.UserHasLeftTeamID) }) } diff --git a/app/upload.go b/app/upload.go index d5ac169494..90e60d9347 100644 --- a/app/upload.go +++ b/app/upload.go @@ -54,7 +54,7 @@ func (a *App) runPluginsHook(info *model.FileInfo, file io.Reader) *model.AppErr info = newInfo } return true - }, plugin.FileWillBeUploadedId) + }, plugin.FileWillBeUploadedID) if rejErr != nil { errChan <- rejErr } diff --git a/app/user.go b/app/user.go index 6fd8b7c663..baae1f60d4 100644 --- a/app/user.go +++ b/app/user.go @@ -285,7 +285,7 @@ func (a *App) createUserOrGuest(user *model.User, guest bool) (*model.User, *mod pluginsEnvironment.RunMultiPluginHook(func(hooks plugin.Hooks) bool { hooks.UserHasBeenCreated(pluginContext, user) return true - }, plugin.UserHasBeenCreatedId) + }, plugin.UserHasBeenCreatedID) }) } diff --git a/config/store.go b/config/store.go index 91b0278054..539103a0eb 100644 --- a/config/store.go +++ b/config/store.go @@ -210,7 +210,7 @@ func (s *Store) loadLockedWithOld(oldCfg *model.Config, unlockOnce *sync.Once) e loadedConfig := &model.Config{} if len(configBytes) != 0 { if err = json.Unmarshal(configBytes, &loadedConfig); err != nil { - return jsonutils.HumanizeJsonError(err, configBytes) + return jsonutils.HumanizeJSONError(err, configBytes) } } diff --git a/go.tools.mod b/go.tools.mod index f6e5871a0d..9f668f2c45 100644 --- a/go.tools.mod +++ b/go.tools.mod @@ -4,9 +4,10 @@ go 1.14 require ( github.com/jstemmer/go-junit-report v0.9.1 // indirect - github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210205183519-d9e542a75ab2 // indirect + github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210218104610-40d7640e8538 // indirect github.com/philhofer/fwd v1.0.0 // indirect github.com/reflog/struct2interface v0.6.1 // indirect + github.com/spf13/cobra v1.1.3 // indirect github.com/tinylib/msgp v1.1.2 // indirect github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31 // indirect github.com/vektra/mockery v1.1.2 // indirect diff --git a/go.tools.sum b/go.tools.sum index 33730329d1..6b699df7ef 100644 --- a/go.tools.sum +++ b/go.tools.sum @@ -1,27 +1,50 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= @@ -31,20 +54,55 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= @@ -54,6 +112,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20200721093743-053c38dcd293 h1:N9FaqZD58xkAIJGFGY5qdKXGlY2aNMaYQ9KkVEXv8xE= github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20200721093743-053c38dcd293/go.mod h1:3gKozJI8n2Y/vW37GfnFWAdehGXe5yZlt+HykK6Y3DM= github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20200730135456-e2334fe87160 h1:+JXFDXEkbMieBt54Rihj3ppnZ/Pm1kZxkLOD0hrWFzs= @@ -81,17 +140,33 @@ github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210122154757-d807da github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210122154757-d807da7d142a/go.mod h1:3gKozJI8n2Y/vW37GfnFWAdehGXe5yZlt+HykK6Y3DM= github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210205183519-d9e542a75ab2 h1:HMz7yZQBfrnek35I5OOxdNdIt0rYoTnhFVn+Uq3TGi8= github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210205183519-d9e542a75ab2/go.mod h1:3gKozJI8n2Y/vW37GfnFWAdehGXe5yZlt+HykK6Y3DM= +github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210218104610-40d7640e8538 h1:7G1fAVBGjrQaKqXnxRjVYMJfuiE6iVMdt9YhBwe2enM= +github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210218104610-40d7640e8538/go.mod h1:3gKozJI8n2Y/vW37GfnFWAdehGXe5yZlt+HykK6Y3DM= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -104,10 +179,15 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T github.com/reflog/struct2interface v0.6.1 h1:ZnCx+rf/kE+qVB80b5+AdTyJFgTVh3s2liGwcgWT14U= github.com/reflog/struct2interface v0.6.1/go.mod h1:Hj4XSqbzQyLswqmKfmGqzOlh4xCRPSl27779XT9TPN4= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= @@ -116,15 +196,24 @@ github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/cobra v1.1.3 h1:xghbfqPkxzxP3C/f3n5DdpAbdKLj4ZE4BWQI362l53M= +github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tinylib/msgp v1.1.2 h1:gWmO7n0Ys2RBEb7GPYB9Ujq8Mk5p2U08lRnmMcGy6BQ= github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -138,44 +227,100 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200206050830-dd0d5d485177 h1:E2vxBajJgSA3TcJhDGTh/kP3VnsvXKl9jSijv+h7svQ= golang.org/x/tools v0.0.0-20200206050830-dd0d5d485177/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -185,15 +330,41 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/model/command_response.go b/model/command_response.go index 26b6cceba4..80cca5ab4a 100644 --- a/model/command_response.go +++ b/model/command_response.go @@ -62,7 +62,7 @@ func CommandResponseFromJson(data io.Reader) (*CommandResponse, error) { var o CommandResponse err = json.Unmarshal(b, &o) if err != nil { - return nil, jsonutils.HumanizeJsonError(err, b) + return nil, jsonutils.HumanizeJSONError(err, b) } o.Attachments = StringifySlackFieldValue(o.Attachments) diff --git a/plugin/client_rpc.go b/plugin/client_rpc.go index 7d1f5cc599..afa8412dad 100644 --- a/plugin/client_rpc.go +++ b/plugin/client_rpc.go @@ -32,7 +32,7 @@ type hooksRPCClient struct { log *mlog.Logger muxBroker *plugin.MuxBroker apiImpl API - implemented [TotalHooksId]bool + implemented [TotalHooksID]bool } type hooksRPCServer struct { @@ -268,7 +268,7 @@ func (s *apiRPCServer) LoadPluginConfiguration(args *Z_LoadPluginConfigurationAr } func init() { - hookNameToId["ServeHTTP"] = ServeHTTPId + hookNameToId["ServeHTTP"] = ServeHTTPID } type Z_ServeHTTPArgs struct { @@ -279,7 +279,7 @@ type Z_ServeHTTPArgs struct { } func (g *hooksRPCClient) ServeHTTP(c *Context, w http.ResponseWriter, r *http.Request) { - if !g.implemented[ServeHTTPId] { + if !g.implemented[ServeHTTPID] { http.NotFound(w, r) return } @@ -442,7 +442,7 @@ func (s *apiRPCServer) PluginHTTP(args *Z_PluginHTTPArgs, returns *Z_PluginHTTPR } func init() { - hookNameToId["FileWillBeUploaded"] = FileWillBeUploadedId + hookNameToId["FileWillBeUploaded"] = FileWillBeUploadedID } type Z_FileWillBeUploadedArgs struct { @@ -458,7 +458,7 @@ type Z_FileWillBeUploadedReturns struct { } func (g *hooksRPCClient) FileWillBeUploaded(c *Context, info *model.FileInfo, file io.Reader, output io.Writer) (*model.FileInfo, string) { - if !g.implemented[FileWillBeUploadedId] { + if !g.implemented[FileWillBeUploadedID] { return info, "" } @@ -533,7 +533,7 @@ func (s *hooksRPCServer) FileWillBeUploaded(args *Z_FileWillBeUploadedArgs, retu // The special behaviour needed is decoding the returned post into the original one to avoid the unintentional removal // of fields by older plugins. func init() { - hookNameToId["MessageWillBePosted"] = MessageWillBePostedId + hookNameToId["MessageWillBePosted"] = MessageWillBePostedID } type Z_MessageWillBePostedArgs struct { @@ -549,7 +549,7 @@ type Z_MessageWillBePostedReturns struct { func (g *hooksRPCClient) MessageWillBePosted(c *Context, post *model.Post) (*model.Post, string) { _args := &Z_MessageWillBePostedArgs{c, post} _returns := &Z_MessageWillBePostedReturns{A: _args.B} - if g.implemented[MessageWillBePostedId] { + if g.implemented[MessageWillBePostedID] { if err := g.client.Call("Plugin.MessageWillBePosted", _args, _returns); err != nil { g.log.Error("RPC call MessageWillBePosted to plugin failed.", mlog.Err(err)) } @@ -573,7 +573,7 @@ func (s *hooksRPCServer) MessageWillBePosted(args *Z_MessageWillBePostedArgs, re // The special behaviour needed is decoding the returned post into the original one to avoid the unintentional removal // of fields by older plugins. func init() { - hookNameToId["MessageWillBeUpdated"] = MessageWillBeUpdatedId + hookNameToId["MessageWillBeUpdated"] = MessageWillBeUpdatedID } type Z_MessageWillBeUpdatedArgs struct { @@ -590,7 +590,7 @@ type Z_MessageWillBeUpdatedReturns struct { func (g *hooksRPCClient) MessageWillBeUpdated(c *Context, newPost, oldPost *model.Post) (*model.Post, string) { _args := &Z_MessageWillBeUpdatedArgs{c, newPost, oldPost} _returns := &Z_MessageWillBeUpdatedReturns{A: _args.B} - if g.implemented[MessageWillBeUpdatedId] { + if g.implemented[MessageWillBeUpdatedID] { if err := g.client.Call("Plugin.MessageWillBeUpdated", _args, _returns); err != nil { g.log.Error("RPC call MessageWillBeUpdated to plugin failed.", mlog.Err(err)) } diff --git a/plugin/client_rpc_generated.go b/plugin/client_rpc_generated.go index a57d4a3c7b..9de25cd0c5 100644 --- a/plugin/client_rpc_generated.go +++ b/plugin/client_rpc_generated.go @@ -15,7 +15,7 @@ import ( ) func init() { - hookNameToId["OnDeactivate"] = OnDeactivateId + hookNameToId["OnDeactivate"] = OnDeactivateID } type Z_OnDeactivateArgs struct { @@ -28,7 +28,7 @@ type Z_OnDeactivateReturns struct { func (g *hooksRPCClient) OnDeactivate() error { _args := &Z_OnDeactivateArgs{} _returns := &Z_OnDeactivateReturns{} - if g.implemented[OnDeactivateId] { + if g.implemented[OnDeactivateID] { if err := g.client.Call("Plugin.OnDeactivate", _args, _returns); err != nil { g.log.Error("RPC call OnDeactivate to plugin failed.", mlog.Err(err)) } @@ -49,7 +49,7 @@ func (s *hooksRPCServer) OnDeactivate(args *Z_OnDeactivateArgs, returns *Z_OnDea } func init() { - hookNameToId["OnConfigurationChange"] = OnConfigurationChangeId + hookNameToId["OnConfigurationChange"] = OnConfigurationChangeID } type Z_OnConfigurationChangeArgs struct { @@ -62,7 +62,7 @@ type Z_OnConfigurationChangeReturns struct { func (g *hooksRPCClient) OnConfigurationChange() error { _args := &Z_OnConfigurationChangeArgs{} _returns := &Z_OnConfigurationChangeReturns{} - if g.implemented[OnConfigurationChangeId] { + if g.implemented[OnConfigurationChangeID] { if err := g.client.Call("Plugin.OnConfigurationChange", _args, _returns); err != nil { g.log.Error("RPC call OnConfigurationChange to plugin failed.", mlog.Err(err)) } @@ -83,7 +83,7 @@ func (s *hooksRPCServer) OnConfigurationChange(args *Z_OnConfigurationChangeArgs } func init() { - hookNameToId["ExecuteCommand"] = ExecuteCommandId + hookNameToId["ExecuteCommand"] = ExecuteCommandID } type Z_ExecuteCommandArgs struct { @@ -99,7 +99,7 @@ type Z_ExecuteCommandReturns struct { func (g *hooksRPCClient) ExecuteCommand(c *Context, args *model.CommandArgs) (*model.CommandResponse, *model.AppError) { _args := &Z_ExecuteCommandArgs{c, args} _returns := &Z_ExecuteCommandReturns{} - if g.implemented[ExecuteCommandId] { + if g.implemented[ExecuteCommandID] { if err := g.client.Call("Plugin.ExecuteCommand", _args, _returns); err != nil { g.log.Error("RPC call ExecuteCommand to plugin failed.", mlog.Err(err)) } @@ -119,7 +119,7 @@ func (s *hooksRPCServer) ExecuteCommand(args *Z_ExecuteCommandArgs, returns *Z_E } func init() { - hookNameToId["UserHasBeenCreated"] = UserHasBeenCreatedId + hookNameToId["UserHasBeenCreated"] = UserHasBeenCreatedID } type Z_UserHasBeenCreatedArgs struct { @@ -133,7 +133,7 @@ type Z_UserHasBeenCreatedReturns struct { func (g *hooksRPCClient) UserHasBeenCreated(c *Context, user *model.User) { _args := &Z_UserHasBeenCreatedArgs{c, user} _returns := &Z_UserHasBeenCreatedReturns{} - if g.implemented[UserHasBeenCreatedId] { + if g.implemented[UserHasBeenCreatedID] { if err := g.client.Call("Plugin.UserHasBeenCreated", _args, _returns); err != nil { g.log.Error("RPC call UserHasBeenCreated to plugin failed.", mlog.Err(err)) } @@ -153,7 +153,7 @@ func (s *hooksRPCServer) UserHasBeenCreated(args *Z_UserHasBeenCreatedArgs, retu } func init() { - hookNameToId["UserWillLogIn"] = UserWillLogInId + hookNameToId["UserWillLogIn"] = UserWillLogInID } type Z_UserWillLogInArgs struct { @@ -168,7 +168,7 @@ type Z_UserWillLogInReturns struct { func (g *hooksRPCClient) UserWillLogIn(c *Context, user *model.User) string { _args := &Z_UserWillLogInArgs{c, user} _returns := &Z_UserWillLogInReturns{} - if g.implemented[UserWillLogInId] { + if g.implemented[UserWillLogInID] { if err := g.client.Call("Plugin.UserWillLogIn", _args, _returns); err != nil { g.log.Error("RPC call UserWillLogIn to plugin failed.", mlog.Err(err)) } @@ -188,7 +188,7 @@ func (s *hooksRPCServer) UserWillLogIn(args *Z_UserWillLogInArgs, returns *Z_Use } func init() { - hookNameToId["UserHasLoggedIn"] = UserHasLoggedInId + hookNameToId["UserHasLoggedIn"] = UserHasLoggedInID } type Z_UserHasLoggedInArgs struct { @@ -202,7 +202,7 @@ type Z_UserHasLoggedInReturns struct { func (g *hooksRPCClient) UserHasLoggedIn(c *Context, user *model.User) { _args := &Z_UserHasLoggedInArgs{c, user} _returns := &Z_UserHasLoggedInReturns{} - if g.implemented[UserHasLoggedInId] { + if g.implemented[UserHasLoggedInID] { if err := g.client.Call("Plugin.UserHasLoggedIn", _args, _returns); err != nil { g.log.Error("RPC call UserHasLoggedIn to plugin failed.", mlog.Err(err)) } @@ -222,7 +222,7 @@ func (s *hooksRPCServer) UserHasLoggedIn(args *Z_UserHasLoggedInArgs, returns *Z } func init() { - hookNameToId["MessageHasBeenPosted"] = MessageHasBeenPostedId + hookNameToId["MessageHasBeenPosted"] = MessageHasBeenPostedID } type Z_MessageHasBeenPostedArgs struct { @@ -236,7 +236,7 @@ type Z_MessageHasBeenPostedReturns struct { func (g *hooksRPCClient) MessageHasBeenPosted(c *Context, post *model.Post) { _args := &Z_MessageHasBeenPostedArgs{c, post} _returns := &Z_MessageHasBeenPostedReturns{} - if g.implemented[MessageHasBeenPostedId] { + if g.implemented[MessageHasBeenPostedID] { if err := g.client.Call("Plugin.MessageHasBeenPosted", _args, _returns); err != nil { g.log.Error("RPC call MessageHasBeenPosted to plugin failed.", mlog.Err(err)) } @@ -256,7 +256,7 @@ func (s *hooksRPCServer) MessageHasBeenPosted(args *Z_MessageHasBeenPostedArgs, } func init() { - hookNameToId["MessageHasBeenUpdated"] = MessageHasBeenUpdatedId + hookNameToId["MessageHasBeenUpdated"] = MessageHasBeenUpdatedID } type Z_MessageHasBeenUpdatedArgs struct { @@ -271,7 +271,7 @@ type Z_MessageHasBeenUpdatedReturns struct { func (g *hooksRPCClient) MessageHasBeenUpdated(c *Context, newPost, oldPost *model.Post) { _args := &Z_MessageHasBeenUpdatedArgs{c, newPost, oldPost} _returns := &Z_MessageHasBeenUpdatedReturns{} - if g.implemented[MessageHasBeenUpdatedId] { + if g.implemented[MessageHasBeenUpdatedID] { if err := g.client.Call("Plugin.MessageHasBeenUpdated", _args, _returns); err != nil { g.log.Error("RPC call MessageHasBeenUpdated to plugin failed.", mlog.Err(err)) } @@ -291,7 +291,7 @@ func (s *hooksRPCServer) MessageHasBeenUpdated(args *Z_MessageHasBeenUpdatedArgs } func init() { - hookNameToId["ChannelHasBeenCreated"] = ChannelHasBeenCreatedId + hookNameToId["ChannelHasBeenCreated"] = ChannelHasBeenCreatedID } type Z_ChannelHasBeenCreatedArgs struct { @@ -305,7 +305,7 @@ type Z_ChannelHasBeenCreatedReturns struct { func (g *hooksRPCClient) ChannelHasBeenCreated(c *Context, channel *model.Channel) { _args := &Z_ChannelHasBeenCreatedArgs{c, channel} _returns := &Z_ChannelHasBeenCreatedReturns{} - if g.implemented[ChannelHasBeenCreatedId] { + if g.implemented[ChannelHasBeenCreatedID] { if err := g.client.Call("Plugin.ChannelHasBeenCreated", _args, _returns); err != nil { g.log.Error("RPC call ChannelHasBeenCreated to plugin failed.", mlog.Err(err)) } @@ -325,7 +325,7 @@ func (s *hooksRPCServer) ChannelHasBeenCreated(args *Z_ChannelHasBeenCreatedArgs } func init() { - hookNameToId["UserHasJoinedChannel"] = UserHasJoinedChannelId + hookNameToId["UserHasJoinedChannel"] = UserHasJoinedChannelID } type Z_UserHasJoinedChannelArgs struct { @@ -340,7 +340,7 @@ type Z_UserHasJoinedChannelReturns struct { func (g *hooksRPCClient) UserHasJoinedChannel(c *Context, channelMember *model.ChannelMember, actor *model.User) { _args := &Z_UserHasJoinedChannelArgs{c, channelMember, actor} _returns := &Z_UserHasJoinedChannelReturns{} - if g.implemented[UserHasJoinedChannelId] { + if g.implemented[UserHasJoinedChannelID] { if err := g.client.Call("Plugin.UserHasJoinedChannel", _args, _returns); err != nil { g.log.Error("RPC call UserHasJoinedChannel to plugin failed.", mlog.Err(err)) } @@ -360,7 +360,7 @@ func (s *hooksRPCServer) UserHasJoinedChannel(args *Z_UserHasJoinedChannelArgs, } func init() { - hookNameToId["UserHasLeftChannel"] = UserHasLeftChannelId + hookNameToId["UserHasLeftChannel"] = UserHasLeftChannelID } type Z_UserHasLeftChannelArgs struct { @@ -375,7 +375,7 @@ type Z_UserHasLeftChannelReturns struct { func (g *hooksRPCClient) UserHasLeftChannel(c *Context, channelMember *model.ChannelMember, actor *model.User) { _args := &Z_UserHasLeftChannelArgs{c, channelMember, actor} _returns := &Z_UserHasLeftChannelReturns{} - if g.implemented[UserHasLeftChannelId] { + if g.implemented[UserHasLeftChannelID] { if err := g.client.Call("Plugin.UserHasLeftChannel", _args, _returns); err != nil { g.log.Error("RPC call UserHasLeftChannel to plugin failed.", mlog.Err(err)) } @@ -395,7 +395,7 @@ func (s *hooksRPCServer) UserHasLeftChannel(args *Z_UserHasLeftChannelArgs, retu } func init() { - hookNameToId["UserHasJoinedTeam"] = UserHasJoinedTeamId + hookNameToId["UserHasJoinedTeam"] = UserHasJoinedTeamID } type Z_UserHasJoinedTeamArgs struct { @@ -410,7 +410,7 @@ type Z_UserHasJoinedTeamReturns struct { func (g *hooksRPCClient) UserHasJoinedTeam(c *Context, teamMember *model.TeamMember, actor *model.User) { _args := &Z_UserHasJoinedTeamArgs{c, teamMember, actor} _returns := &Z_UserHasJoinedTeamReturns{} - if g.implemented[UserHasJoinedTeamId] { + if g.implemented[UserHasJoinedTeamID] { if err := g.client.Call("Plugin.UserHasJoinedTeam", _args, _returns); err != nil { g.log.Error("RPC call UserHasJoinedTeam to plugin failed.", mlog.Err(err)) } @@ -430,7 +430,7 @@ func (s *hooksRPCServer) UserHasJoinedTeam(args *Z_UserHasJoinedTeamArgs, return } func init() { - hookNameToId["UserHasLeftTeam"] = UserHasLeftTeamId + hookNameToId["UserHasLeftTeam"] = UserHasLeftTeamID } type Z_UserHasLeftTeamArgs struct { @@ -445,7 +445,7 @@ type Z_UserHasLeftTeamReturns struct { func (g *hooksRPCClient) UserHasLeftTeam(c *Context, teamMember *model.TeamMember, actor *model.User) { _args := &Z_UserHasLeftTeamArgs{c, teamMember, actor} _returns := &Z_UserHasLeftTeamReturns{} - if g.implemented[UserHasLeftTeamId] { + if g.implemented[UserHasLeftTeamID] { if err := g.client.Call("Plugin.UserHasLeftTeam", _args, _returns); err != nil { g.log.Error("RPC call UserHasLeftTeam to plugin failed.", mlog.Err(err)) } @@ -465,7 +465,7 @@ func (s *hooksRPCServer) UserHasLeftTeam(args *Z_UserHasLeftTeamArgs, returns *Z } func init() { - hookNameToId["ReactionHasBeenAdded"] = ReactionHasBeenAddedId + hookNameToId["ReactionHasBeenAdded"] = ReactionHasBeenAddedID } type Z_ReactionHasBeenAddedArgs struct { @@ -479,7 +479,7 @@ type Z_ReactionHasBeenAddedReturns struct { func (g *hooksRPCClient) ReactionHasBeenAdded(c *Context, reaction *model.Reaction) { _args := &Z_ReactionHasBeenAddedArgs{c, reaction} _returns := &Z_ReactionHasBeenAddedReturns{} - if g.implemented[ReactionHasBeenAddedId] { + if g.implemented[ReactionHasBeenAddedID] { if err := g.client.Call("Plugin.ReactionHasBeenAdded", _args, _returns); err != nil { g.log.Error("RPC call ReactionHasBeenAdded to plugin failed.", mlog.Err(err)) } @@ -499,7 +499,7 @@ func (s *hooksRPCServer) ReactionHasBeenAdded(args *Z_ReactionHasBeenAddedArgs, } func init() { - hookNameToId["ReactionHasBeenRemoved"] = ReactionHasBeenRemovedId + hookNameToId["ReactionHasBeenRemoved"] = ReactionHasBeenRemovedID } type Z_ReactionHasBeenRemovedArgs struct { @@ -513,7 +513,7 @@ type Z_ReactionHasBeenRemovedReturns struct { func (g *hooksRPCClient) ReactionHasBeenRemoved(c *Context, reaction *model.Reaction) { _args := &Z_ReactionHasBeenRemovedArgs{c, reaction} _returns := &Z_ReactionHasBeenRemovedReturns{} - if g.implemented[ReactionHasBeenRemovedId] { + if g.implemented[ReactionHasBeenRemovedID] { if err := g.client.Call("Plugin.ReactionHasBeenRemoved", _args, _returns); err != nil { g.log.Error("RPC call ReactionHasBeenRemoved to plugin failed.", mlog.Err(err)) } diff --git a/plugin/hooks.go b/plugin/hooks.go index 1e85a66ff2..fe3ed36f7d 100644 --- a/plugin/hooks.go +++ b/plugin/hooks.go @@ -13,29 +13,29 @@ import ( // These assignments are part of the wire protocol used to trigger hook events in plugins. // // Feel free to add more, but do not change existing assignments. Follow the naming convention of -// Id as the autogenerated glue code depends on that. +// ID as the autogenerated glue code depends on that. const ( - OnActivateId = 0 - OnDeactivateId = 1 - ServeHTTPId = 2 - OnConfigurationChangeId = 3 - ExecuteCommandId = 4 - MessageWillBePostedId = 5 - MessageWillBeUpdatedId = 6 - MessageHasBeenPostedId = 7 - MessageHasBeenUpdatedId = 8 - UserHasJoinedChannelId = 9 - UserHasLeftChannelId = 10 - UserHasJoinedTeamId = 11 - UserHasLeftTeamId = 12 - ChannelHasBeenCreatedId = 13 - FileWillBeUploadedId = 14 - UserWillLogInId = 15 - UserHasLoggedInId = 16 - UserHasBeenCreatedId = 17 - ReactionHasBeenAddedId = 18 - ReactionHasBeenRemovedId = 19 - TotalHooksId = iota + OnActivateID = 0 + OnDeactivateID = 1 + ServeHTTPID = 2 + OnConfigurationChangeID = 3 + ExecuteCommandID = 4 + MessageWillBePostedID = 5 + MessageWillBeUpdatedID = 6 + MessageHasBeenPostedID = 7 + MessageHasBeenUpdatedID = 8 + UserHasJoinedChannelID = 9 + UserHasLeftChannelID = 10 + UserHasJoinedTeamID = 11 + UserHasLeftTeamID = 12 + ChannelHasBeenCreatedID = 13 + FileWillBeUploadedID = 14 + UserWillLogInID = 15 + UserHasLoggedInID = 16 + UserHasBeenCreatedID = 17 + ReactionHasBeenAddedID = 18 + ReactionHasBeenRemovedID = 19 + TotalHooksID = iota ) const ( diff --git a/plugin/interface_generator/main.go b/plugin/interface_generator/main.go index 67734a826f..c0c70059c7 100644 --- a/plugin/interface_generator/main.go +++ b/plugin/interface_generator/main.go @@ -292,7 +292,7 @@ package plugin {{range .HooksMethods}} func init() { - hookNameToId["{{.Name}}"] = {{.Name}}Id + hookNameToId["{{.Name}}"] = {{.Name}}ID } type {{.Name | obscure}}Args struct { @@ -306,7 +306,7 @@ type {{.Name | obscure}}Returns struct { func (g *hooksRPCClient) {{.Name}}{{funcStyle .Params}} {{funcStyle .Return}} { _args := &{{.Name | obscure}}Args{ {{valuesOnly .Params}} } _returns := &{{.Name | obscure}}Returns{} - if g.implemented[{{.Name}}Id] { + if g.implemented[{{.Name}}ID] { if err := g.client.Call("Plugin.{{.Name}}", _args, _returns); err != nil { g.log.Error("RPC call {{.Name}} to plugin failed.", mlog.Err(err)) } diff --git a/plugin/supervisor.go b/plugin/supervisor.go index 2ee4141f95..1ddac1db62 100644 --- a/plugin/supervisor.go +++ b/plugin/supervisor.go @@ -23,7 +23,7 @@ type supervisor struct { lock sync.RWMutex client *plugin.Client hooks Hooks - implemented [TotalHooksId]bool + implemented [TotalHooksID]bool pid int } diff --git a/store/errors.go b/store/errors.go index 6e44d741aa..fac07ee0e0 100644 --- a/store/errors.go +++ b/store/errors.go @@ -75,18 +75,18 @@ func (e *ErrConflict) Unwrap() error { // ErrNotFound indicates that a resource was not found type ErrNotFound struct { resource string - Id string + ID string } func NewErrNotFound(resource, id string) *ErrNotFound { return &ErrNotFound{ resource: resource, - Id: id, + ID: id, } } func (e *ErrNotFound) Error() string { - return "resource: " + e.resource + " id: " + e.Id + return "resource: " + e.resource + " id: " + e.ID } // ErrOutOfBounds indicates that the requested total numbers of rows diff --git a/store/opentracinglayer/opentracinglayer.go b/store/opentracinglayer/opentracinglayer.go index 517014c3e1..0210622aeb 100644 --- a/store/opentracinglayer/opentracinglayer.go +++ b/store/opentracinglayer/opentracinglayer.go @@ -504,7 +504,7 @@ func (s *OpenTracingLayerBotStore) Update(bot *model.Bot) (*model.Bot, error) { return result, err } -func (s *OpenTracingLayerChannelStore) AnalyticsDeletedTypeCount(teamId string, channelType string) (int64, error) { +func (s *OpenTracingLayerChannelStore) AnalyticsDeletedTypeCount(teamID string, channelType string) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.AnalyticsDeletedTypeCount") s.Root.Store.SetContext(newCtx) @@ -513,7 +513,7 @@ func (s *OpenTracingLayerChannelStore) AnalyticsDeletedTypeCount(teamId string, }() defer span.Finish() - result, err := s.ChannelStore.AnalyticsDeletedTypeCount(teamId, channelType) + result, err := s.ChannelStore.AnalyticsDeletedTypeCount(teamID, channelType) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -522,7 +522,7 @@ func (s *OpenTracingLayerChannelStore) AnalyticsDeletedTypeCount(teamId string, return result, err } -func (s *OpenTracingLayerChannelStore) AnalyticsTypeCount(teamId string, channelType string) (int64, error) { +func (s *OpenTracingLayerChannelStore) AnalyticsTypeCount(teamID string, channelType string) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.AnalyticsTypeCount") s.Root.Store.SetContext(newCtx) @@ -531,7 +531,7 @@ func (s *OpenTracingLayerChannelStore) AnalyticsTypeCount(teamId string, channel }() defer span.Finish() - result, err := s.ChannelStore.AnalyticsTypeCount(teamId, channelType) + result, err := s.ChannelStore.AnalyticsTypeCount(teamID, channelType) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -540,7 +540,7 @@ func (s *OpenTracingLayerChannelStore) AnalyticsTypeCount(teamId string, channel return result, err } -func (s *OpenTracingLayerChannelStore) AutocompleteInTeam(teamId string, term string, includeDeleted bool) (*model.ChannelList, error) { +func (s *OpenTracingLayerChannelStore) AutocompleteInTeam(teamID string, term string, includeDeleted bool) (*model.ChannelList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.AutocompleteInTeam") s.Root.Store.SetContext(newCtx) @@ -549,7 +549,7 @@ func (s *OpenTracingLayerChannelStore) AutocompleteInTeam(teamId string, term st }() defer span.Finish() - result, err := s.ChannelStore.AutocompleteInTeam(teamId, term, includeDeleted) + result, err := s.ChannelStore.AutocompleteInTeam(teamID, term, includeDeleted) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -558,7 +558,7 @@ func (s *OpenTracingLayerChannelStore) AutocompleteInTeam(teamId string, term st return result, err } -func (s *OpenTracingLayerChannelStore) AutocompleteInTeamForSearch(teamId string, userId string, term string, includeDeleted bool) (*model.ChannelList, error) { +func (s *OpenTracingLayerChannelStore) AutocompleteInTeamForSearch(teamID string, userId string, term string, includeDeleted bool) (*model.ChannelList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.AutocompleteInTeamForSearch") s.Root.Store.SetContext(newCtx) @@ -567,7 +567,7 @@ func (s *OpenTracingLayerChannelStore) AutocompleteInTeamForSearch(teamId string }() defer span.Finish() - result, err := s.ChannelStore.AutocompleteInTeamForSearch(teamId, userId, term, includeDeleted) + result, err := s.ChannelStore.AutocompleteInTeamForSearch(teamID, userId, term, includeDeleted) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -607,7 +607,7 @@ func (s *OpenTracingLayerChannelStore) ClearCaches() { } -func (s *OpenTracingLayerChannelStore) ClearSidebarOnTeamLeave(userId string, teamId string) error { +func (s *OpenTracingLayerChannelStore) ClearSidebarOnTeamLeave(userId string, teamID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.ClearSidebarOnTeamLeave") s.Root.Store.SetContext(newCtx) @@ -616,7 +616,7 @@ func (s *OpenTracingLayerChannelStore) ClearSidebarOnTeamLeave(userId string, te }() defer span.Finish() - err := s.ChannelStore.ClearSidebarOnTeamLeave(userId, teamId) + err := s.ChannelStore.ClearSidebarOnTeamLeave(userId, teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -625,7 +625,7 @@ func (s *OpenTracingLayerChannelStore) ClearSidebarOnTeamLeave(userId string, te return err } -func (s *OpenTracingLayerChannelStore) CountPostsAfter(channelId string, timestamp int64, userId string) (int, error) { +func (s *OpenTracingLayerChannelStore) CountPostsAfter(channelID string, timestamp int64, userId string) (int, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.CountPostsAfter") s.Root.Store.SetContext(newCtx) @@ -634,7 +634,7 @@ func (s *OpenTracingLayerChannelStore) CountPostsAfter(channelId string, timesta }() defer span.Finish() - result, err := s.ChannelStore.CountPostsAfter(channelId, timestamp, userId) + result, err := s.ChannelStore.CountPostsAfter(channelID, timestamp, userId) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -661,7 +661,7 @@ func (s *OpenTracingLayerChannelStore) CreateDirectChannel(userId *model.User, o return result, err } -func (s *OpenTracingLayerChannelStore) CreateInitialSidebarCategories(userId string, teamId string) error { +func (s *OpenTracingLayerChannelStore) CreateInitialSidebarCategories(userId string, teamID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.CreateInitialSidebarCategories") s.Root.Store.SetContext(newCtx) @@ -670,7 +670,7 @@ func (s *OpenTracingLayerChannelStore) CreateInitialSidebarCategories(userId str }() defer span.Finish() - err := s.ChannelStore.CreateInitialSidebarCategories(userId, teamId) + err := s.ChannelStore.CreateInitialSidebarCategories(userId, teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -679,7 +679,7 @@ func (s *OpenTracingLayerChannelStore) CreateInitialSidebarCategories(userId str return err } -func (s *OpenTracingLayerChannelStore) CreateSidebarCategory(userId string, teamId string, newCategory *model.SidebarCategoryWithChannels) (*model.SidebarCategoryWithChannels, error) { +func (s *OpenTracingLayerChannelStore) CreateSidebarCategory(userId string, teamID string, newCategory *model.SidebarCategoryWithChannels) (*model.SidebarCategoryWithChannels, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.CreateSidebarCategory") s.Root.Store.SetContext(newCtx) @@ -688,7 +688,7 @@ func (s *OpenTracingLayerChannelStore) CreateSidebarCategory(userId string, team }() defer span.Finish() - result, err := s.ChannelStore.CreateSidebarCategory(userId, teamId, newCategory) + result, err := s.ChannelStore.CreateSidebarCategory(userId, teamID, newCategory) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -697,7 +697,7 @@ func (s *OpenTracingLayerChannelStore) CreateSidebarCategory(userId string, team return result, err } -func (s *OpenTracingLayerChannelStore) Delete(channelId string, time int64) error { +func (s *OpenTracingLayerChannelStore) Delete(channelID string, time int64) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.Delete") s.Root.Store.SetContext(newCtx) @@ -706,7 +706,7 @@ func (s *OpenTracingLayerChannelStore) Delete(channelId string, time int64) erro }() defer span.Finish() - err := s.ChannelStore.Delete(channelId, time) + err := s.ChannelStore.Delete(channelID, time) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -715,7 +715,7 @@ func (s *OpenTracingLayerChannelStore) Delete(channelId string, time int64) erro return err } -func (s *OpenTracingLayerChannelStore) DeleteSidebarCategory(categoryId string) error { +func (s *OpenTracingLayerChannelStore) DeleteSidebarCategory(categoryID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.DeleteSidebarCategory") s.Root.Store.SetContext(newCtx) @@ -724,7 +724,7 @@ func (s *OpenTracingLayerChannelStore) DeleteSidebarCategory(categoryId string) }() defer span.Finish() - err := s.ChannelStore.DeleteSidebarCategory(categoryId) + err := s.ChannelStore.DeleteSidebarCategory(categoryID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -769,7 +769,7 @@ func (s *OpenTracingLayerChannelStore) Get(id string, allowFromCache bool) (*mod return result, err } -func (s *OpenTracingLayerChannelStore) GetAll(teamId string) ([]*model.Channel, error) { +func (s *OpenTracingLayerChannelStore) GetAll(teamID string) ([]*model.Channel, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetAll") s.Root.Store.SetContext(newCtx) @@ -778,7 +778,7 @@ func (s *OpenTracingLayerChannelStore) GetAll(teamId string) ([]*model.Channel, }() defer span.Finish() - result, err := s.ChannelStore.GetAll(teamId) + result, err := s.ChannelStore.GetAll(teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -805,7 +805,7 @@ func (s *OpenTracingLayerChannelStore) GetAllChannelMembersForUser(userId string return result, err } -func (s *OpenTracingLayerChannelStore) GetAllChannelMembersNotifyPropsForChannel(channelId string, allowFromCache bool) (map[string]model.StringMap, error) { +func (s *OpenTracingLayerChannelStore) GetAllChannelMembersNotifyPropsForChannel(channelID string, allowFromCache bool) (map[string]model.StringMap, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetAllChannelMembersNotifyPropsForChannel") s.Root.Store.SetContext(newCtx) @@ -814,7 +814,7 @@ func (s *OpenTracingLayerChannelStore) GetAllChannelMembersNotifyPropsForChannel }() defer span.Finish() - result, err := s.ChannelStore.GetAllChannelMembersNotifyPropsForChannel(channelId, allowFromCache) + result, err := s.ChannelStore.GetAllChannelMembersNotifyPropsForChannel(channelID, allowFromCache) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -859,7 +859,7 @@ func (s *OpenTracingLayerChannelStore) GetAllChannelsCount(opts store.ChannelSea return result, err } -func (s *OpenTracingLayerChannelStore) GetAllChannelsForExportAfter(limit int, afterId string) ([]*model.ChannelForExport, error) { +func (s *OpenTracingLayerChannelStore) GetAllChannelsForExportAfter(limit int, afterID string) ([]*model.ChannelForExport, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetAllChannelsForExportAfter") s.Root.Store.SetContext(newCtx) @@ -868,7 +868,7 @@ func (s *OpenTracingLayerChannelStore) GetAllChannelsForExportAfter(limit int, a }() defer span.Finish() - result, err := s.ChannelStore.GetAllChannelsForExportAfter(limit, afterId) + result, err := s.ChannelStore.GetAllChannelsForExportAfter(limit, afterID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -877,7 +877,7 @@ func (s *OpenTracingLayerChannelStore) GetAllChannelsForExportAfter(limit int, a return result, err } -func (s *OpenTracingLayerChannelStore) GetAllDirectChannelsForExportAfter(limit int, afterId string) ([]*model.DirectChannelForExport, error) { +func (s *OpenTracingLayerChannelStore) GetAllDirectChannelsForExportAfter(limit int, afterID string) ([]*model.DirectChannelForExport, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetAllDirectChannelsForExportAfter") s.Root.Store.SetContext(newCtx) @@ -886,7 +886,7 @@ func (s *OpenTracingLayerChannelStore) GetAllDirectChannelsForExportAfter(limit }() defer span.Finish() - result, err := s.ChannelStore.GetAllDirectChannelsForExportAfter(limit, afterId) + result, err := s.ChannelStore.GetAllDirectChannelsForExportAfter(limit, afterID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -949,7 +949,7 @@ func (s *OpenTracingLayerChannelStore) GetByNames(team_id string, names []string return result, err } -func (s *OpenTracingLayerChannelStore) GetChannelCounts(teamId string, userId string) (*model.ChannelCounts, error) { +func (s *OpenTracingLayerChannelStore) GetChannelCounts(teamID string, userId string) (*model.ChannelCounts, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetChannelCounts") s.Root.Store.SetContext(newCtx) @@ -958,7 +958,7 @@ func (s *OpenTracingLayerChannelStore) GetChannelCounts(teamId string, userId st }() defer span.Finish() - result, err := s.ChannelStore.GetChannelCounts(teamId, userId) + result, err := s.ChannelStore.GetChannelCounts(teamID, userId) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -967,7 +967,7 @@ func (s *OpenTracingLayerChannelStore) GetChannelCounts(teamId string, userId st return result, err } -func (s *OpenTracingLayerChannelStore) GetChannelMembersForExport(userId string, teamId string) ([]*model.ChannelMemberForExport, error) { +func (s *OpenTracingLayerChannelStore) GetChannelMembersForExport(userId string, teamID string) ([]*model.ChannelMemberForExport, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetChannelMembersForExport") s.Root.Store.SetContext(newCtx) @@ -976,7 +976,7 @@ func (s *OpenTracingLayerChannelStore) GetChannelMembersForExport(userId string, }() defer span.Finish() - result, err := s.ChannelStore.GetChannelMembersForExport(userId, teamId) + result, err := s.ChannelStore.GetChannelMembersForExport(userId, teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -985,7 +985,7 @@ func (s *OpenTracingLayerChannelStore) GetChannelMembersForExport(userId string, return result, err } -func (s *OpenTracingLayerChannelStore) GetChannelMembersTimezones(channelId string) ([]model.StringMap, error) { +func (s *OpenTracingLayerChannelStore) GetChannelMembersTimezones(channelID string) ([]model.StringMap, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetChannelMembersTimezones") s.Root.Store.SetContext(newCtx) @@ -994,7 +994,7 @@ func (s *OpenTracingLayerChannelStore) GetChannelMembersTimezones(channelId stri }() defer span.Finish() - result, err := s.ChannelStore.GetChannelMembersTimezones(channelId) + result, err := s.ChannelStore.GetChannelMembersTimezones(channelID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1003,7 +1003,7 @@ func (s *OpenTracingLayerChannelStore) GetChannelMembersTimezones(channelId stri return result, err } -func (s *OpenTracingLayerChannelStore) GetChannelUnread(channelId string, userId string) (*model.ChannelUnread, error) { +func (s *OpenTracingLayerChannelStore) GetChannelUnread(channelID string, userId string) (*model.ChannelUnread, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetChannelUnread") s.Root.Store.SetContext(newCtx) @@ -1012,7 +1012,7 @@ func (s *OpenTracingLayerChannelStore) GetChannelUnread(channelId string, userId }() defer span.Finish() - result, err := s.ChannelStore.GetChannelUnread(channelId, userId) + result, err := s.ChannelStore.GetChannelUnread(channelID, userId) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1021,7 +1021,7 @@ func (s *OpenTracingLayerChannelStore) GetChannelUnread(channelId string, userId return result, err } -func (s *OpenTracingLayerChannelStore) GetChannels(teamId string, userId string, includeDeleted bool, lastDeleteAt int) (*model.ChannelList, error) { +func (s *OpenTracingLayerChannelStore) GetChannels(teamID string, userId string, includeDeleted bool, lastDeleteAt int) (*model.ChannelList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetChannels") s.Root.Store.SetContext(newCtx) @@ -1030,7 +1030,7 @@ func (s *OpenTracingLayerChannelStore) GetChannels(teamId string, userId string, }() defer span.Finish() - result, err := s.ChannelStore.GetChannels(teamId, userId, includeDeleted, lastDeleteAt) + result, err := s.ChannelStore.GetChannels(teamID, userId, includeDeleted, lastDeleteAt) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1075,7 +1075,7 @@ func (s *OpenTracingLayerChannelStore) GetChannelsByIds(channelIds []string, inc return result, err } -func (s *OpenTracingLayerChannelStore) GetChannelsByScheme(schemeId string, offset int, limit int) (model.ChannelList, error) { +func (s *OpenTracingLayerChannelStore) GetChannelsByScheme(schemeID string, offset int, limit int) (model.ChannelList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetChannelsByScheme") s.Root.Store.SetContext(newCtx) @@ -1084,7 +1084,7 @@ func (s *OpenTracingLayerChannelStore) GetChannelsByScheme(schemeId string, offs }() defer span.Finish() - result, err := s.ChannelStore.GetChannelsByScheme(schemeId, offset, limit) + result, err := s.ChannelStore.GetChannelsByScheme(schemeID, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1129,7 +1129,7 @@ func (s *OpenTracingLayerChannelStore) GetDeletedByName(team_id string, name str return result, err } -func (s *OpenTracingLayerChannelStore) GetForPost(postId string) (*model.Channel, error) { +func (s *OpenTracingLayerChannelStore) GetForPost(postID string) (*model.Channel, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetForPost") s.Root.Store.SetContext(newCtx) @@ -1138,7 +1138,7 @@ func (s *OpenTracingLayerChannelStore) GetForPost(postId string) (*model.Channel }() defer span.Finish() - result, err := s.ChannelStore.GetForPost(postId) + result, err := s.ChannelStore.GetForPost(postID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1165,7 +1165,7 @@ func (s *OpenTracingLayerChannelStore) GetFromMaster(id string) (*model.Channel, return result, err } -func (s *OpenTracingLayerChannelStore) GetGuestCount(channelId string, allowFromCache bool) (int64, error) { +func (s *OpenTracingLayerChannelStore) GetGuestCount(channelID string, allowFromCache bool) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetGuestCount") s.Root.Store.SetContext(newCtx) @@ -1174,7 +1174,7 @@ func (s *OpenTracingLayerChannelStore) GetGuestCount(channelId string, allowFrom }() defer span.Finish() - result, err := s.ChannelStore.GetGuestCount(channelId, allowFromCache) + result, err := s.ChannelStore.GetGuestCount(channelID, allowFromCache) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1183,7 +1183,7 @@ func (s *OpenTracingLayerChannelStore) GetGuestCount(channelId string, allowFrom return result, err } -func (s *OpenTracingLayerChannelStore) GetMember(channelId string, userId string) (*model.ChannelMember, error) { +func (s *OpenTracingLayerChannelStore) GetMember(channelID string, userId string) (*model.ChannelMember, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetMember") s.Root.Store.SetContext(newCtx) @@ -1192,7 +1192,7 @@ func (s *OpenTracingLayerChannelStore) GetMember(channelId string, userId string }() defer span.Finish() - result, err := s.ChannelStore.GetMember(channelId, userId) + result, err := s.ChannelStore.GetMember(channelID, userId) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1201,7 +1201,7 @@ func (s *OpenTracingLayerChannelStore) GetMember(channelId string, userId string return result, err } -func (s *OpenTracingLayerChannelStore) GetMemberCount(channelId string, allowFromCache bool) (int64, error) { +func (s *OpenTracingLayerChannelStore) GetMemberCount(channelID string, allowFromCache bool) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetMemberCount") s.Root.Store.SetContext(newCtx) @@ -1210,7 +1210,7 @@ func (s *OpenTracingLayerChannelStore) GetMemberCount(channelId string, allowFro }() defer span.Finish() - result, err := s.ChannelStore.GetMemberCount(channelId, allowFromCache) + result, err := s.ChannelStore.GetMemberCount(channelID, allowFromCache) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1219,7 +1219,7 @@ func (s *OpenTracingLayerChannelStore) GetMemberCount(channelId string, allowFro return result, err } -func (s *OpenTracingLayerChannelStore) GetMemberCountFromCache(channelId string) int64 { +func (s *OpenTracingLayerChannelStore) GetMemberCountFromCache(channelID string) int64 { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetMemberCountFromCache") s.Root.Store.SetContext(newCtx) @@ -1228,7 +1228,7 @@ func (s *OpenTracingLayerChannelStore) GetMemberCountFromCache(channelId string) }() defer span.Finish() - result := s.ChannelStore.GetMemberCountFromCache(channelId) + result := s.ChannelStore.GetMemberCountFromCache(channelID) return result } @@ -1250,7 +1250,7 @@ func (s *OpenTracingLayerChannelStore) GetMemberCountsByGroup(channelID string, return result, err } -func (s *OpenTracingLayerChannelStore) GetMemberForPost(postId string, userId string) (*model.ChannelMember, error) { +func (s *OpenTracingLayerChannelStore) GetMemberForPost(postID string, userId string) (*model.ChannelMember, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetMemberForPost") s.Root.Store.SetContext(newCtx) @@ -1259,7 +1259,7 @@ func (s *OpenTracingLayerChannelStore) GetMemberForPost(postId string, userId st }() defer span.Finish() - result, err := s.ChannelStore.GetMemberForPost(postId, userId) + result, err := s.ChannelStore.GetMemberForPost(postID, userId) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1268,7 +1268,7 @@ func (s *OpenTracingLayerChannelStore) GetMemberForPost(postId string, userId st return result, err } -func (s *OpenTracingLayerChannelStore) GetMembers(channelId string, offset int, limit int) (*model.ChannelMembers, error) { +func (s *OpenTracingLayerChannelStore) GetMembers(channelID string, offset int, limit int) (*model.ChannelMembers, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetMembers") s.Root.Store.SetContext(newCtx) @@ -1277,7 +1277,7 @@ func (s *OpenTracingLayerChannelStore) GetMembers(channelId string, offset int, }() defer span.Finish() - result, err := s.ChannelStore.GetMembers(channelId, offset, limit) + result, err := s.ChannelStore.GetMembers(channelID, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1304,7 +1304,7 @@ func (s *OpenTracingLayerChannelStore) GetMembersByChannelIds(channelIds []strin return result, err } -func (s *OpenTracingLayerChannelStore) GetMembersByIds(channelId string, userIds []string) (*model.ChannelMembers, error) { +func (s *OpenTracingLayerChannelStore) GetMembersByIds(channelID string, userIds []string) (*model.ChannelMembers, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetMembersByIds") s.Root.Store.SetContext(newCtx) @@ -1313,7 +1313,7 @@ func (s *OpenTracingLayerChannelStore) GetMembersByIds(channelId string, userIds }() defer span.Finish() - result, err := s.ChannelStore.GetMembersByIds(channelId, userIds) + result, err := s.ChannelStore.GetMembersByIds(channelID, userIds) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1322,7 +1322,7 @@ func (s *OpenTracingLayerChannelStore) GetMembersByIds(channelId string, userIds return result, err } -func (s *OpenTracingLayerChannelStore) GetMembersForUser(teamId string, userId string) (*model.ChannelMembers, error) { +func (s *OpenTracingLayerChannelStore) GetMembersForUser(teamID string, userId string) (*model.ChannelMembers, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetMembersForUser") s.Root.Store.SetContext(newCtx) @@ -1331,7 +1331,7 @@ func (s *OpenTracingLayerChannelStore) GetMembersForUser(teamId string, userId s }() defer span.Finish() - result, err := s.ChannelStore.GetMembersForUser(teamId, userId) + result, err := s.ChannelStore.GetMembersForUser(teamID, userId) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1340,7 +1340,7 @@ func (s *OpenTracingLayerChannelStore) GetMembersForUser(teamId string, userId s return result, err } -func (s *OpenTracingLayerChannelStore) GetMembersForUserWithPagination(teamId string, userId string, page int, perPage int) (*model.ChannelMembers, error) { +func (s *OpenTracingLayerChannelStore) GetMembersForUserWithPagination(teamID string, userId string, page int, perPage int) (*model.ChannelMembers, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetMembersForUserWithPagination") s.Root.Store.SetContext(newCtx) @@ -1349,7 +1349,7 @@ func (s *OpenTracingLayerChannelStore) GetMembersForUserWithPagination(teamId st }() defer span.Finish() - result, err := s.ChannelStore.GetMembersForUserWithPagination(teamId, userId, page, perPage) + result, err := s.ChannelStore.GetMembersForUserWithPagination(teamID, userId, page, perPage) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1358,7 +1358,7 @@ func (s *OpenTracingLayerChannelStore) GetMembersForUserWithPagination(teamId st return result, err } -func (s *OpenTracingLayerChannelStore) GetMoreChannels(teamId string, userId string, offset int, limit int) (*model.ChannelList, error) { +func (s *OpenTracingLayerChannelStore) GetMoreChannels(teamID string, userId string, offset int, limit int) (*model.ChannelList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetMoreChannels") s.Root.Store.SetContext(newCtx) @@ -1367,7 +1367,7 @@ func (s *OpenTracingLayerChannelStore) GetMoreChannels(teamId string, userId str }() defer span.Finish() - result, err := s.ChannelStore.GetMoreChannels(teamId, userId, offset, limit) + result, err := s.ChannelStore.GetMoreChannels(teamID, userId, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1376,7 +1376,7 @@ func (s *OpenTracingLayerChannelStore) GetMoreChannels(teamId string, userId str return result, err } -func (s *OpenTracingLayerChannelStore) GetPinnedPostCount(channelId string, allowFromCache bool) (int64, error) { +func (s *OpenTracingLayerChannelStore) GetPinnedPostCount(channelID string, allowFromCache bool) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetPinnedPostCount") s.Root.Store.SetContext(newCtx) @@ -1385,7 +1385,7 @@ func (s *OpenTracingLayerChannelStore) GetPinnedPostCount(channelId string, allo }() defer span.Finish() - result, err := s.ChannelStore.GetPinnedPostCount(channelId, allowFromCache) + result, err := s.ChannelStore.GetPinnedPostCount(channelID, allowFromCache) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1394,7 +1394,7 @@ func (s *OpenTracingLayerChannelStore) GetPinnedPostCount(channelId string, allo return result, err } -func (s *OpenTracingLayerChannelStore) GetPinnedPosts(channelId string) (*model.PostList, error) { +func (s *OpenTracingLayerChannelStore) GetPinnedPosts(channelID string) (*model.PostList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetPinnedPosts") s.Root.Store.SetContext(newCtx) @@ -1403,7 +1403,7 @@ func (s *OpenTracingLayerChannelStore) GetPinnedPosts(channelId string) (*model. }() defer span.Finish() - result, err := s.ChannelStore.GetPinnedPosts(channelId) + result, err := s.ChannelStore.GetPinnedPosts(channelID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1412,7 +1412,7 @@ func (s *OpenTracingLayerChannelStore) GetPinnedPosts(channelId string) (*model. return result, err } -func (s *OpenTracingLayerChannelStore) GetPrivateChannelsForTeam(teamId string, offset int, limit int) (*model.ChannelList, error) { +func (s *OpenTracingLayerChannelStore) GetPrivateChannelsForTeam(teamID string, offset int, limit int) (*model.ChannelList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetPrivateChannelsForTeam") s.Root.Store.SetContext(newCtx) @@ -1421,7 +1421,7 @@ func (s *OpenTracingLayerChannelStore) GetPrivateChannelsForTeam(teamId string, }() defer span.Finish() - result, err := s.ChannelStore.GetPrivateChannelsForTeam(teamId, offset, limit) + result, err := s.ChannelStore.GetPrivateChannelsForTeam(teamID, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1430,7 +1430,7 @@ func (s *OpenTracingLayerChannelStore) GetPrivateChannelsForTeam(teamId string, return result, err } -func (s *OpenTracingLayerChannelStore) GetPublicChannelsByIdsForTeam(teamId string, channelIds []string) (*model.ChannelList, error) { +func (s *OpenTracingLayerChannelStore) GetPublicChannelsByIdsForTeam(teamID string, channelIds []string) (*model.ChannelList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetPublicChannelsByIdsForTeam") s.Root.Store.SetContext(newCtx) @@ -1439,7 +1439,7 @@ func (s *OpenTracingLayerChannelStore) GetPublicChannelsByIdsForTeam(teamId stri }() defer span.Finish() - result, err := s.ChannelStore.GetPublicChannelsByIdsForTeam(teamId, channelIds) + result, err := s.ChannelStore.GetPublicChannelsByIdsForTeam(teamID, channelIds) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1448,7 +1448,7 @@ func (s *OpenTracingLayerChannelStore) GetPublicChannelsByIdsForTeam(teamId stri return result, err } -func (s *OpenTracingLayerChannelStore) GetPublicChannelsForTeam(teamId string, offset int, limit int) (*model.ChannelList, error) { +func (s *OpenTracingLayerChannelStore) GetPublicChannelsForTeam(teamID string, offset int, limit int) (*model.ChannelList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetPublicChannelsForTeam") s.Root.Store.SetContext(newCtx) @@ -1457,7 +1457,7 @@ func (s *OpenTracingLayerChannelStore) GetPublicChannelsForTeam(teamId string, o }() defer span.Finish() - result, err := s.ChannelStore.GetPublicChannelsForTeam(teamId, offset, limit) + result, err := s.ChannelStore.GetPublicChannelsForTeam(teamID, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1466,7 +1466,7 @@ func (s *OpenTracingLayerChannelStore) GetPublicChannelsForTeam(teamId string, o return result, err } -func (s *OpenTracingLayerChannelStore) GetSidebarCategories(userId string, teamId string) (*model.OrderedSidebarCategories, error) { +func (s *OpenTracingLayerChannelStore) GetSidebarCategories(userId string, teamID string) (*model.OrderedSidebarCategories, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetSidebarCategories") s.Root.Store.SetContext(newCtx) @@ -1475,7 +1475,7 @@ func (s *OpenTracingLayerChannelStore) GetSidebarCategories(userId string, teamI }() defer span.Finish() - result, err := s.ChannelStore.GetSidebarCategories(userId, teamId) + result, err := s.ChannelStore.GetSidebarCategories(userId, teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1484,7 +1484,7 @@ func (s *OpenTracingLayerChannelStore) GetSidebarCategories(userId string, teamI return result, err } -func (s *OpenTracingLayerChannelStore) GetSidebarCategory(categoryId string) (*model.SidebarCategoryWithChannels, error) { +func (s *OpenTracingLayerChannelStore) GetSidebarCategory(categoryID string) (*model.SidebarCategoryWithChannels, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetSidebarCategory") s.Root.Store.SetContext(newCtx) @@ -1493,7 +1493,7 @@ func (s *OpenTracingLayerChannelStore) GetSidebarCategory(categoryId string) (*m }() defer span.Finish() - result, err := s.ChannelStore.GetSidebarCategory(categoryId) + result, err := s.ChannelStore.GetSidebarCategory(categoryID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1502,7 +1502,7 @@ func (s *OpenTracingLayerChannelStore) GetSidebarCategory(categoryId string) (*m return result, err } -func (s *OpenTracingLayerChannelStore) GetSidebarCategoryOrder(userId string, teamId string) ([]string, error) { +func (s *OpenTracingLayerChannelStore) GetSidebarCategoryOrder(userId string, teamID string) ([]string, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetSidebarCategoryOrder") s.Root.Store.SetContext(newCtx) @@ -1511,7 +1511,7 @@ func (s *OpenTracingLayerChannelStore) GetSidebarCategoryOrder(userId string, te }() defer span.Finish() - result, err := s.ChannelStore.GetSidebarCategoryOrder(userId, teamId) + result, err := s.ChannelStore.GetSidebarCategoryOrder(userId, teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1520,7 +1520,7 @@ func (s *OpenTracingLayerChannelStore) GetSidebarCategoryOrder(userId string, te return result, err } -func (s *OpenTracingLayerChannelStore) GetTeamChannels(teamId string) (*model.ChannelList, error) { +func (s *OpenTracingLayerChannelStore) GetTeamChannels(teamID string) (*model.ChannelList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetTeamChannels") s.Root.Store.SetContext(newCtx) @@ -1529,7 +1529,7 @@ func (s *OpenTracingLayerChannelStore) GetTeamChannels(teamId string) (*model.Ch }() defer span.Finish() - result, err := s.ChannelStore.GetTeamChannels(teamId) + result, err := s.ChannelStore.GetTeamChannels(teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1556,7 +1556,7 @@ func (s *OpenTracingLayerChannelStore) GroupSyncedChannelCount() (int64, error) return result, err } -func (s *OpenTracingLayerChannelStore) IncrementMentionCount(channelId string, userId string, updateThreads bool) error { +func (s *OpenTracingLayerChannelStore) IncrementMentionCount(channelID string, userId string, updateThreads bool) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.IncrementMentionCount") s.Root.Store.SetContext(newCtx) @@ -1565,7 +1565,7 @@ func (s *OpenTracingLayerChannelStore) IncrementMentionCount(channelId string, u }() defer span.Finish() - err := s.ChannelStore.IncrementMentionCount(channelId, userId, updateThreads) + err := s.ChannelStore.IncrementMentionCount(channelID, userId, updateThreads) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1587,7 +1587,7 @@ func (s *OpenTracingLayerChannelStore) InvalidateAllChannelMembersForUser(userId } -func (s *OpenTracingLayerChannelStore) InvalidateCacheForChannelMembersNotifyProps(channelId string) { +func (s *OpenTracingLayerChannelStore) InvalidateCacheForChannelMembersNotifyProps(channelID string) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.InvalidateCacheForChannelMembersNotifyProps") s.Root.Store.SetContext(newCtx) @@ -1596,7 +1596,7 @@ func (s *OpenTracingLayerChannelStore) InvalidateCacheForChannelMembersNotifyPro }() defer span.Finish() - s.ChannelStore.InvalidateCacheForChannelMembersNotifyProps(channelId) + s.ChannelStore.InvalidateCacheForChannelMembersNotifyProps(channelID) } @@ -1613,7 +1613,7 @@ func (s *OpenTracingLayerChannelStore) InvalidateChannel(id string) { } -func (s *OpenTracingLayerChannelStore) InvalidateChannelByName(teamId string, name string) { +func (s *OpenTracingLayerChannelStore) InvalidateChannelByName(teamID string, name string) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.InvalidateChannelByName") s.Root.Store.SetContext(newCtx) @@ -1622,11 +1622,11 @@ func (s *OpenTracingLayerChannelStore) InvalidateChannelByName(teamId string, na }() defer span.Finish() - s.ChannelStore.InvalidateChannelByName(teamId, name) + s.ChannelStore.InvalidateChannelByName(teamID, name) } -func (s *OpenTracingLayerChannelStore) InvalidateGuestCount(channelId string) { +func (s *OpenTracingLayerChannelStore) InvalidateGuestCount(channelID string) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.InvalidateGuestCount") s.Root.Store.SetContext(newCtx) @@ -1635,11 +1635,11 @@ func (s *OpenTracingLayerChannelStore) InvalidateGuestCount(channelId string) { }() defer span.Finish() - s.ChannelStore.InvalidateGuestCount(channelId) + s.ChannelStore.InvalidateGuestCount(channelID) } -func (s *OpenTracingLayerChannelStore) InvalidateMemberCount(channelId string) { +func (s *OpenTracingLayerChannelStore) InvalidateMemberCount(channelID string) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.InvalidateMemberCount") s.Root.Store.SetContext(newCtx) @@ -1648,11 +1648,11 @@ func (s *OpenTracingLayerChannelStore) InvalidateMemberCount(channelId string) { }() defer span.Finish() - s.ChannelStore.InvalidateMemberCount(channelId) + s.ChannelStore.InvalidateMemberCount(channelID) } -func (s *OpenTracingLayerChannelStore) InvalidatePinnedPostCount(channelId string) { +func (s *OpenTracingLayerChannelStore) InvalidatePinnedPostCount(channelID string) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.InvalidatePinnedPostCount") s.Root.Store.SetContext(newCtx) @@ -1661,11 +1661,11 @@ func (s *OpenTracingLayerChannelStore) InvalidatePinnedPostCount(channelId strin }() defer span.Finish() - s.ChannelStore.InvalidatePinnedPostCount(channelId) + s.ChannelStore.InvalidatePinnedPostCount(channelID) } -func (s *OpenTracingLayerChannelStore) IsUserInChannelUseCache(userId string, channelId string) bool { +func (s *OpenTracingLayerChannelStore) IsUserInChannelUseCache(userId string, channelID string) bool { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.IsUserInChannelUseCache") s.Root.Store.SetContext(newCtx) @@ -1674,7 +1674,7 @@ func (s *OpenTracingLayerChannelStore) IsUserInChannelUseCache(userId string, ch }() defer span.Finish() - result := s.ChannelStore.IsUserInChannelUseCache(userId, channelId) + result := s.ChannelStore.IsUserInChannelUseCache(userId, channelID) return result } @@ -1714,7 +1714,7 @@ func (s *OpenTracingLayerChannelStore) MigratePublicChannels() error { return err } -func (s *OpenTracingLayerChannelStore) PermanentDelete(channelId string) error { +func (s *OpenTracingLayerChannelStore) PermanentDelete(channelID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.PermanentDelete") s.Root.Store.SetContext(newCtx) @@ -1723,7 +1723,7 @@ func (s *OpenTracingLayerChannelStore) PermanentDelete(channelId string) error { }() defer span.Finish() - err := s.ChannelStore.PermanentDelete(channelId) + err := s.ChannelStore.PermanentDelete(channelID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1732,7 +1732,7 @@ func (s *OpenTracingLayerChannelStore) PermanentDelete(channelId string) error { return err } -func (s *OpenTracingLayerChannelStore) PermanentDeleteByTeam(teamId string) error { +func (s *OpenTracingLayerChannelStore) PermanentDeleteByTeam(teamID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.PermanentDeleteByTeam") s.Root.Store.SetContext(newCtx) @@ -1741,7 +1741,7 @@ func (s *OpenTracingLayerChannelStore) PermanentDeleteByTeam(teamId string) erro }() defer span.Finish() - err := s.ChannelStore.PermanentDeleteByTeam(teamId) + err := s.ChannelStore.PermanentDeleteByTeam(teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1750,7 +1750,7 @@ func (s *OpenTracingLayerChannelStore) PermanentDeleteByTeam(teamId string) erro return err } -func (s *OpenTracingLayerChannelStore) PermanentDeleteMembersByChannel(channelId string) error { +func (s *OpenTracingLayerChannelStore) PermanentDeleteMembersByChannel(channelID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.PermanentDeleteMembersByChannel") s.Root.Store.SetContext(newCtx) @@ -1759,7 +1759,7 @@ func (s *OpenTracingLayerChannelStore) PermanentDeleteMembersByChannel(channelId }() defer span.Finish() - err := s.ChannelStore.PermanentDeleteMembersByChannel(channelId) + err := s.ChannelStore.PermanentDeleteMembersByChannel(channelID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1786,7 +1786,7 @@ func (s *OpenTracingLayerChannelStore) PermanentDeleteMembersByUser(userId strin return err } -func (s *OpenTracingLayerChannelStore) RemoveAllDeactivatedMembers(channelId string) error { +func (s *OpenTracingLayerChannelStore) RemoveAllDeactivatedMembers(channelID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.RemoveAllDeactivatedMembers") s.Root.Store.SetContext(newCtx) @@ -1795,7 +1795,7 @@ func (s *OpenTracingLayerChannelStore) RemoveAllDeactivatedMembers(channelId str }() defer span.Finish() - err := s.ChannelStore.RemoveAllDeactivatedMembers(channelId) + err := s.ChannelStore.RemoveAllDeactivatedMembers(channelID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1804,7 +1804,7 @@ func (s *OpenTracingLayerChannelStore) RemoveAllDeactivatedMembers(channelId str return err } -func (s *OpenTracingLayerChannelStore) RemoveMember(channelId string, userId string) error { +func (s *OpenTracingLayerChannelStore) RemoveMember(channelID string, userId string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.RemoveMember") s.Root.Store.SetContext(newCtx) @@ -1813,7 +1813,7 @@ func (s *OpenTracingLayerChannelStore) RemoveMember(channelId string, userId str }() defer span.Finish() - err := s.ChannelStore.RemoveMember(channelId, userId) + err := s.ChannelStore.RemoveMember(channelID, userId) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1822,7 +1822,7 @@ func (s *OpenTracingLayerChannelStore) RemoveMember(channelId string, userId str return err } -func (s *OpenTracingLayerChannelStore) RemoveMembers(channelId string, userIds []string) error { +func (s *OpenTracingLayerChannelStore) RemoveMembers(channelID string, userIds []string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.RemoveMembers") s.Root.Store.SetContext(newCtx) @@ -1831,7 +1831,7 @@ func (s *OpenTracingLayerChannelStore) RemoveMembers(channelId string, userIds [ }() defer span.Finish() - err := s.ChannelStore.RemoveMembers(channelId, userIds) + err := s.ChannelStore.RemoveMembers(channelID, userIds) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1858,7 +1858,7 @@ func (s *OpenTracingLayerChannelStore) ResetAllChannelSchemes() error { return err } -func (s *OpenTracingLayerChannelStore) Restore(channelId string, time int64) error { +func (s *OpenTracingLayerChannelStore) Restore(channelID string, time int64) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.Restore") s.Root.Store.SetContext(newCtx) @@ -1867,7 +1867,7 @@ func (s *OpenTracingLayerChannelStore) Restore(channelId string, time int64) err }() defer span.Finish() - err := s.ChannelStore.Restore(channelId, time) + err := s.ChannelStore.Restore(channelID, time) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1966,7 +1966,7 @@ func (s *OpenTracingLayerChannelStore) SearchAllChannels(term string, opts store return result, resultVar1, err } -func (s *OpenTracingLayerChannelStore) SearchArchivedInTeam(teamId string, term string, userId string) (*model.ChannelList, error) { +func (s *OpenTracingLayerChannelStore) SearchArchivedInTeam(teamID string, term string, userId string) (*model.ChannelList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.SearchArchivedInTeam") s.Root.Store.SetContext(newCtx) @@ -1975,7 +1975,7 @@ func (s *OpenTracingLayerChannelStore) SearchArchivedInTeam(teamId string, term }() defer span.Finish() - result, err := s.ChannelStore.SearchArchivedInTeam(teamId, term, userId) + result, err := s.ChannelStore.SearchArchivedInTeam(teamID, term, userId) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1984,7 +1984,7 @@ func (s *OpenTracingLayerChannelStore) SearchArchivedInTeam(teamId string, term return result, err } -func (s *OpenTracingLayerChannelStore) SearchForUserInTeam(userId string, teamId string, term string, includeDeleted bool) (*model.ChannelList, error) { +func (s *OpenTracingLayerChannelStore) SearchForUserInTeam(userId string, teamID string, term string, includeDeleted bool) (*model.ChannelList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.SearchForUserInTeam") s.Root.Store.SetContext(newCtx) @@ -1993,7 +1993,7 @@ func (s *OpenTracingLayerChannelStore) SearchForUserInTeam(userId string, teamId }() defer span.Finish() - result, err := s.ChannelStore.SearchForUserInTeam(userId, teamId, term, includeDeleted) + result, err := s.ChannelStore.SearchForUserInTeam(userId, teamID, term, includeDeleted) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2020,7 +2020,7 @@ func (s *OpenTracingLayerChannelStore) SearchGroupChannels(userId string, term s return result, err } -func (s *OpenTracingLayerChannelStore) SearchInTeam(teamId string, term string, includeDeleted bool) (*model.ChannelList, error) { +func (s *OpenTracingLayerChannelStore) SearchInTeam(teamID string, term string, includeDeleted bool) (*model.ChannelList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.SearchInTeam") s.Root.Store.SetContext(newCtx) @@ -2029,7 +2029,7 @@ func (s *OpenTracingLayerChannelStore) SearchInTeam(teamId string, term string, }() defer span.Finish() - result, err := s.ChannelStore.SearchInTeam(teamId, term, includeDeleted) + result, err := s.ChannelStore.SearchInTeam(teamID, term, includeDeleted) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2038,7 +2038,7 @@ func (s *OpenTracingLayerChannelStore) SearchInTeam(teamId string, term string, return result, err } -func (s *OpenTracingLayerChannelStore) SearchMore(userId string, teamId string, term string) (*model.ChannelList, error) { +func (s *OpenTracingLayerChannelStore) SearchMore(userId string, teamID string, term string) (*model.ChannelList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.SearchMore") s.Root.Store.SetContext(newCtx) @@ -2047,7 +2047,7 @@ func (s *OpenTracingLayerChannelStore) SearchMore(userId string, teamId string, }() defer span.Finish() - result, err := s.ChannelStore.SearchMore(userId, teamId, term) + result, err := s.ChannelStore.SearchMore(userId, teamID, term) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2056,7 +2056,7 @@ func (s *OpenTracingLayerChannelStore) SearchMore(userId string, teamId string, return result, err } -func (s *OpenTracingLayerChannelStore) SetDeleteAt(channelId string, deleteAt int64, updateAt int64) error { +func (s *OpenTracingLayerChannelStore) SetDeleteAt(channelID string, deleteAt int64, updateAt int64) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.SetDeleteAt") s.Root.Store.SetContext(newCtx) @@ -2065,7 +2065,7 @@ func (s *OpenTracingLayerChannelStore) SetDeleteAt(channelId string, deleteAt in }() defer span.Finish() - err := s.ChannelStore.SetDeleteAt(channelId, deleteAt, updateAt) + err := s.ChannelStore.SetDeleteAt(channelID, deleteAt, updateAt) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2182,7 +2182,7 @@ func (s *OpenTracingLayerChannelStore) UpdateMultipleMembers(members []*model.Ch return result, err } -func (s *OpenTracingLayerChannelStore) UpdateSidebarCategories(userId string, teamId string, categories []*model.SidebarCategoryWithChannels) ([]*model.SidebarCategoryWithChannels, []*model.SidebarCategoryWithChannels, error) { +func (s *OpenTracingLayerChannelStore) UpdateSidebarCategories(userId string, teamID string, categories []*model.SidebarCategoryWithChannels) ([]*model.SidebarCategoryWithChannels, []*model.SidebarCategoryWithChannels, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.UpdateSidebarCategories") s.Root.Store.SetContext(newCtx) @@ -2191,7 +2191,7 @@ func (s *OpenTracingLayerChannelStore) UpdateSidebarCategories(userId string, te }() defer span.Finish() - result, resultVar1, err := s.ChannelStore.UpdateSidebarCategories(userId, teamId, categories) + result, resultVar1, err := s.ChannelStore.UpdateSidebarCategories(userId, teamID, categories) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2200,7 +2200,7 @@ func (s *OpenTracingLayerChannelStore) UpdateSidebarCategories(userId string, te return result, resultVar1, err } -func (s *OpenTracingLayerChannelStore) UpdateSidebarCategoryOrder(userId string, teamId string, categoryOrder []string) error { +func (s *OpenTracingLayerChannelStore) UpdateSidebarCategoryOrder(userId string, teamID string, categoryOrder []string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.UpdateSidebarCategoryOrder") s.Root.Store.SetContext(newCtx) @@ -2209,7 +2209,7 @@ func (s *OpenTracingLayerChannelStore) UpdateSidebarCategoryOrder(userId string, }() defer span.Finish() - err := s.ChannelStore.UpdateSidebarCategoryOrder(userId, teamId, categoryOrder) + err := s.ChannelStore.UpdateSidebarCategoryOrder(userId, teamID, categoryOrder) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2218,7 +2218,7 @@ func (s *OpenTracingLayerChannelStore) UpdateSidebarCategoryOrder(userId string, return err } -func (s *OpenTracingLayerChannelStore) UpdateSidebarChannelCategoryOnMove(channel *model.Channel, newTeamId string) error { +func (s *OpenTracingLayerChannelStore) UpdateSidebarChannelCategoryOnMove(channel *model.Channel, newTeamID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.UpdateSidebarChannelCategoryOnMove") s.Root.Store.SetContext(newCtx) @@ -2227,7 +2227,7 @@ func (s *OpenTracingLayerChannelStore) UpdateSidebarChannelCategoryOnMove(channe }() defer span.Finish() - err := s.ChannelStore.UpdateSidebarChannelCategoryOnMove(channel, newTeamId) + err := s.ChannelStore.UpdateSidebarChannelCategoryOnMove(channel, newTeamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2272,7 +2272,7 @@ func (s *OpenTracingLayerChannelStore) UserBelongsToChannels(userId string, chan return result, err } -func (s *OpenTracingLayerChannelMemberHistoryStore) GetUsersInChannelDuring(startTime int64, endTime int64, channelId string) ([]*model.ChannelMemberHistoryResult, error) { +func (s *OpenTracingLayerChannelMemberHistoryStore) GetUsersInChannelDuring(startTime int64, endTime int64, channelID string) ([]*model.ChannelMemberHistoryResult, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelMemberHistoryStore.GetUsersInChannelDuring") s.Root.Store.SetContext(newCtx) @@ -2281,7 +2281,7 @@ func (s *OpenTracingLayerChannelMemberHistoryStore) GetUsersInChannelDuring(star }() defer span.Finish() - result, err := s.ChannelMemberHistoryStore.GetUsersInChannelDuring(startTime, endTime, channelId) + result, err := s.ChannelMemberHistoryStore.GetUsersInChannelDuring(startTime, endTime, channelID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2290,7 +2290,7 @@ func (s *OpenTracingLayerChannelMemberHistoryStore) GetUsersInChannelDuring(star return result, err } -func (s *OpenTracingLayerChannelMemberHistoryStore) LogJoinEvent(userId string, channelId string, joinTime int64) error { +func (s *OpenTracingLayerChannelMemberHistoryStore) LogJoinEvent(userId string, channelID string, joinTime int64) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelMemberHistoryStore.LogJoinEvent") s.Root.Store.SetContext(newCtx) @@ -2299,7 +2299,7 @@ func (s *OpenTracingLayerChannelMemberHistoryStore) LogJoinEvent(userId string, }() defer span.Finish() - err := s.ChannelMemberHistoryStore.LogJoinEvent(userId, channelId, joinTime) + err := s.ChannelMemberHistoryStore.LogJoinEvent(userId, channelID, joinTime) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2308,7 +2308,7 @@ func (s *OpenTracingLayerChannelMemberHistoryStore) LogJoinEvent(userId string, return err } -func (s *OpenTracingLayerChannelMemberHistoryStore) LogLeaveEvent(userId string, channelId string, leaveTime int64) error { +func (s *OpenTracingLayerChannelMemberHistoryStore) LogLeaveEvent(userId string, channelID string, leaveTime int64) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelMemberHistoryStore.LogLeaveEvent") s.Root.Store.SetContext(newCtx) @@ -2317,7 +2317,7 @@ func (s *OpenTracingLayerChannelMemberHistoryStore) LogLeaveEvent(userId string, }() defer span.Finish() - err := s.ChannelMemberHistoryStore.LogLeaveEvent(userId, channelId, leaveTime) + err := s.ChannelMemberHistoryStore.LogLeaveEvent(userId, channelID, leaveTime) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2452,7 +2452,7 @@ func (s *OpenTracingLayerClusterDiscoveryStore) SetLastPingAt(discovery *model.C return err } -func (s *OpenTracingLayerCommandStore) AnalyticsCommandCount(teamId string) (int64, error) { +func (s *OpenTracingLayerCommandStore) AnalyticsCommandCount(teamID string) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "CommandStore.AnalyticsCommandCount") s.Root.Store.SetContext(newCtx) @@ -2461,7 +2461,7 @@ func (s *OpenTracingLayerCommandStore) AnalyticsCommandCount(teamId string) (int }() defer span.Finish() - result, err := s.CommandStore.AnalyticsCommandCount(teamId) + result, err := s.CommandStore.AnalyticsCommandCount(teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2470,7 +2470,7 @@ func (s *OpenTracingLayerCommandStore) AnalyticsCommandCount(teamId string) (int return result, err } -func (s *OpenTracingLayerCommandStore) Delete(commandId string, time int64) error { +func (s *OpenTracingLayerCommandStore) Delete(commandID string, time int64) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "CommandStore.Delete") s.Root.Store.SetContext(newCtx) @@ -2479,7 +2479,7 @@ func (s *OpenTracingLayerCommandStore) Delete(commandId string, time int64) erro }() defer span.Finish() - err := s.CommandStore.Delete(commandId, time) + err := s.CommandStore.Delete(commandID, time) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2506,7 +2506,7 @@ func (s *OpenTracingLayerCommandStore) Get(id string) (*model.Command, error) { return result, err } -func (s *OpenTracingLayerCommandStore) GetByTeam(teamId string) ([]*model.Command, error) { +func (s *OpenTracingLayerCommandStore) GetByTeam(teamID string) ([]*model.Command, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "CommandStore.GetByTeam") s.Root.Store.SetContext(newCtx) @@ -2515,7 +2515,7 @@ func (s *OpenTracingLayerCommandStore) GetByTeam(teamId string) ([]*model.Comman }() defer span.Finish() - result, err := s.CommandStore.GetByTeam(teamId) + result, err := s.CommandStore.GetByTeam(teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2524,7 +2524,7 @@ func (s *OpenTracingLayerCommandStore) GetByTeam(teamId string) ([]*model.Comman return result, err } -func (s *OpenTracingLayerCommandStore) GetByTrigger(teamId string, trigger string) (*model.Command, error) { +func (s *OpenTracingLayerCommandStore) GetByTrigger(teamID string, trigger string) (*model.Command, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "CommandStore.GetByTrigger") s.Root.Store.SetContext(newCtx) @@ -2533,7 +2533,7 @@ func (s *OpenTracingLayerCommandStore) GetByTrigger(teamId string, trigger strin }() defer span.Finish() - result, err := s.CommandStore.GetByTrigger(teamId, trigger) + result, err := s.CommandStore.GetByTrigger(teamID, trigger) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2542,7 +2542,7 @@ func (s *OpenTracingLayerCommandStore) GetByTrigger(teamId string, trigger strin return result, err } -func (s *OpenTracingLayerCommandStore) PermanentDeleteByTeam(teamId string) error { +func (s *OpenTracingLayerCommandStore) PermanentDeleteByTeam(teamID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "CommandStore.PermanentDeleteByTeam") s.Root.Store.SetContext(newCtx) @@ -2551,7 +2551,7 @@ func (s *OpenTracingLayerCommandStore) PermanentDeleteByTeam(teamId string) erro }() defer span.Finish() - err := s.CommandStore.PermanentDeleteByTeam(teamId) + err := s.CommandStore.PermanentDeleteByTeam(teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2915,7 +2915,7 @@ func (s *OpenTracingLayerEmojiStore) Search(name string, prefixOnly bool, limit return result, err } -func (s *OpenTracingLayerFileInfoStore) AttachToPost(fileId string, postId string, creatorId string) error { +func (s *OpenTracingLayerFileInfoStore) AttachToPost(fileID string, postID string, creatorId string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "FileInfoStore.AttachToPost") s.Root.Store.SetContext(newCtx) @@ -2924,7 +2924,7 @@ func (s *OpenTracingLayerFileInfoStore) AttachToPost(fileId string, postId strin }() defer span.Finish() - err := s.FileInfoStore.AttachToPost(fileId, postId, creatorId) + err := s.FileInfoStore.AttachToPost(fileID, postID, creatorId) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2946,7 +2946,7 @@ func (s *OpenTracingLayerFileInfoStore) ClearCaches() { } -func (s *OpenTracingLayerFileInfoStore) DeleteForPost(postId string) (string, error) { +func (s *OpenTracingLayerFileInfoStore) DeleteForPost(postID string) (string, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "FileInfoStore.DeleteForPost") s.Root.Store.SetContext(newCtx) @@ -2955,7 +2955,7 @@ func (s *OpenTracingLayerFileInfoStore) DeleteForPost(postId string) (string, er }() defer span.Finish() - result, err := s.FileInfoStore.DeleteForPost(postId) + result, err := s.FileInfoStore.DeleteForPost(postID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -3018,7 +3018,7 @@ func (s *OpenTracingLayerFileInfoStore) GetByPath(path string) (*model.FileInfo, return result, err } -func (s *OpenTracingLayerFileInfoStore) GetForPost(postId string, readFromMaster bool, includeDeleted bool, allowFromCache bool) ([]*model.FileInfo, error) { +func (s *OpenTracingLayerFileInfoStore) GetForPost(postID string, readFromMaster bool, includeDeleted bool, allowFromCache bool) ([]*model.FileInfo, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "FileInfoStore.GetForPost") s.Root.Store.SetContext(newCtx) @@ -3027,7 +3027,7 @@ func (s *OpenTracingLayerFileInfoStore) GetForPost(postId string, readFromMaster }() defer span.Finish() - result, err := s.FileInfoStore.GetForPost(postId, readFromMaster, includeDeleted, allowFromCache) + result, err := s.FileInfoStore.GetForPost(postID, readFromMaster, includeDeleted, allowFromCache) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -3072,7 +3072,7 @@ func (s *OpenTracingLayerFileInfoStore) GetWithOptions(page int, perPage int, op return result, err } -func (s *OpenTracingLayerFileInfoStore) InvalidateFileInfosForPostCache(postId string, deleted bool) { +func (s *OpenTracingLayerFileInfoStore) InvalidateFileInfosForPostCache(postID string, deleted bool) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "FileInfoStore.InvalidateFileInfosForPostCache") s.Root.Store.SetContext(newCtx) @@ -3081,11 +3081,11 @@ func (s *OpenTracingLayerFileInfoStore) InvalidateFileInfosForPostCache(postId s }() defer span.Finish() - s.FileInfoStore.InvalidateFileInfosForPostCache(postId, deleted) + s.FileInfoStore.InvalidateFileInfosForPostCache(postID, deleted) } -func (s *OpenTracingLayerFileInfoStore) PermanentDelete(fileId string) error { +func (s *OpenTracingLayerFileInfoStore) PermanentDelete(fileID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "FileInfoStore.PermanentDelete") s.Root.Store.SetContext(newCtx) @@ -3094,7 +3094,7 @@ func (s *OpenTracingLayerFileInfoStore) PermanentDelete(fileId string) error { }() defer span.Finish() - err := s.FileInfoStore.PermanentDelete(fileId) + err := s.FileInfoStore.PermanentDelete(fileID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -3157,7 +3157,7 @@ func (s *OpenTracingLayerFileInfoStore) Save(info *model.FileInfo) (*model.FileI return result, err } -func (s *OpenTracingLayerFileInfoStore) Search(paramsList []*model.SearchParams, userId string, teamId string, page int, perPage int) (*model.FileInfoList, error) { +func (s *OpenTracingLayerFileInfoStore) Search(paramsList []*model.SearchParams, userId string, teamID string, page int, perPage int) (*model.FileInfoList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "FileInfoStore.Search") s.Root.Store.SetContext(newCtx) @@ -3166,7 +3166,7 @@ func (s *OpenTracingLayerFileInfoStore) Search(paramsList []*model.SearchParams, }() defer span.Finish() - result, err := s.FileInfoStore.Search(paramsList, userId, teamId, page, perPage) + result, err := s.FileInfoStore.Search(paramsList, userId, teamID, page, perPage) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -3175,7 +3175,7 @@ func (s *OpenTracingLayerFileInfoStore) Search(paramsList []*model.SearchParams, return result, err } -func (s *OpenTracingLayerFileInfoStore) SetContent(fileId string, content string) error { +func (s *OpenTracingLayerFileInfoStore) SetContent(fileID string, content string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "FileInfoStore.SetContent") s.Root.Store.SetContext(newCtx) @@ -3184,7 +3184,7 @@ func (s *OpenTracingLayerFileInfoStore) SetContent(fileId string, content string }() defer span.Finish() - err := s.FileInfoStore.SetContent(fileId, content) + err := s.FileInfoStore.SetContent(fileID, content) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -3301,7 +3301,7 @@ func (s *OpenTracingLayerGroupStore) CountChannelMembersMinusGroupMembers(channe return result, err } -func (s *OpenTracingLayerGroupStore) CountGroupsByChannel(channelId string, opts model.GroupSearchOpts) (int64, error) { +func (s *OpenTracingLayerGroupStore) CountGroupsByChannel(channelID string, opts model.GroupSearchOpts) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "GroupStore.CountGroupsByChannel") s.Root.Store.SetContext(newCtx) @@ -3310,7 +3310,7 @@ func (s *OpenTracingLayerGroupStore) CountGroupsByChannel(channelId string, opts }() defer span.Finish() - result, err := s.GroupStore.CountGroupsByChannel(channelId, opts) + result, err := s.GroupStore.CountGroupsByChannel(channelID, opts) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -3319,7 +3319,7 @@ func (s *OpenTracingLayerGroupStore) CountGroupsByChannel(channelId string, opts return result, err } -func (s *OpenTracingLayerGroupStore) CountGroupsByTeam(teamId string, opts model.GroupSearchOpts) (int64, error) { +func (s *OpenTracingLayerGroupStore) CountGroupsByTeam(teamID string, opts model.GroupSearchOpts) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "GroupStore.CountGroupsByTeam") s.Root.Store.SetContext(newCtx) @@ -3328,7 +3328,7 @@ func (s *OpenTracingLayerGroupStore) CountGroupsByTeam(teamId string, opts model }() defer span.Finish() - result, err := s.GroupStore.CountGroupsByTeam(teamId, opts) + result, err := s.GroupStore.CountGroupsByTeam(teamID, opts) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -3625,7 +3625,7 @@ func (s *OpenTracingLayerGroupStore) GetGroups(page int, perPage int, opts model return result, err } -func (s *OpenTracingLayerGroupStore) GetGroupsAssociatedToChannelsByTeam(teamId string, opts model.GroupSearchOpts) (map[string][]*model.GroupWithSchemeAdmin, error) { +func (s *OpenTracingLayerGroupStore) GetGroupsAssociatedToChannelsByTeam(teamID string, opts model.GroupSearchOpts) (map[string][]*model.GroupWithSchemeAdmin, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "GroupStore.GetGroupsAssociatedToChannelsByTeam") s.Root.Store.SetContext(newCtx) @@ -3634,7 +3634,7 @@ func (s *OpenTracingLayerGroupStore) GetGroupsAssociatedToChannelsByTeam(teamId }() defer span.Finish() - result, err := s.GroupStore.GetGroupsAssociatedToChannelsByTeam(teamId, opts) + result, err := s.GroupStore.GetGroupsAssociatedToChannelsByTeam(teamID, opts) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -3643,7 +3643,7 @@ func (s *OpenTracingLayerGroupStore) GetGroupsAssociatedToChannelsByTeam(teamId return result, err } -func (s *OpenTracingLayerGroupStore) GetGroupsByChannel(channelId string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) { +func (s *OpenTracingLayerGroupStore) GetGroupsByChannel(channelID string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "GroupStore.GetGroupsByChannel") s.Root.Store.SetContext(newCtx) @@ -3652,7 +3652,7 @@ func (s *OpenTracingLayerGroupStore) GetGroupsByChannel(channelId string, opts m }() defer span.Finish() - result, err := s.GroupStore.GetGroupsByChannel(channelId, opts) + result, err := s.GroupStore.GetGroupsByChannel(channelID, opts) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -3661,7 +3661,7 @@ func (s *OpenTracingLayerGroupStore) GetGroupsByChannel(channelId string, opts m return result, err } -func (s *OpenTracingLayerGroupStore) GetGroupsByTeam(teamId string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) { +func (s *OpenTracingLayerGroupStore) GetGroupsByTeam(teamID string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "GroupStore.GetGroupsByTeam") s.Root.Store.SetContext(newCtx) @@ -3670,7 +3670,7 @@ func (s *OpenTracingLayerGroupStore) GetGroupsByTeam(teamId string, opts model.G }() defer span.Finish() - result, err := s.GroupStore.GetGroupsByTeam(teamId, opts) + result, err := s.GroupStore.GetGroupsByTeam(teamID, opts) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -4687,7 +4687,7 @@ func (s *OpenTracingLayerPluginStore) CompareAndSet(keyVal *model.PluginKeyValue return result, err } -func (s *OpenTracingLayerPluginStore) Delete(pluginId string, key string) error { +func (s *OpenTracingLayerPluginStore) Delete(pluginID string, key string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PluginStore.Delete") s.Root.Store.SetContext(newCtx) @@ -4696,7 +4696,7 @@ func (s *OpenTracingLayerPluginStore) Delete(pluginId string, key string) error }() defer span.Finish() - err := s.PluginStore.Delete(pluginId, key) + err := s.PluginStore.Delete(pluginID, key) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -4723,7 +4723,7 @@ func (s *OpenTracingLayerPluginStore) DeleteAllExpired() error { return err } -func (s *OpenTracingLayerPluginStore) DeleteAllForPlugin(PluginId string) error { +func (s *OpenTracingLayerPluginStore) DeleteAllForPlugin(PluginID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PluginStore.DeleteAllForPlugin") s.Root.Store.SetContext(newCtx) @@ -4732,7 +4732,7 @@ func (s *OpenTracingLayerPluginStore) DeleteAllForPlugin(PluginId string) error }() defer span.Finish() - err := s.PluginStore.DeleteAllForPlugin(PluginId) + err := s.PluginStore.DeleteAllForPlugin(PluginID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -4741,7 +4741,7 @@ func (s *OpenTracingLayerPluginStore) DeleteAllForPlugin(PluginId string) error return err } -func (s *OpenTracingLayerPluginStore) Get(pluginId string, key string) (*model.PluginKeyValue, error) { +func (s *OpenTracingLayerPluginStore) Get(pluginID string, key string) (*model.PluginKeyValue, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PluginStore.Get") s.Root.Store.SetContext(newCtx) @@ -4750,7 +4750,7 @@ func (s *OpenTracingLayerPluginStore) Get(pluginId string, key string) (*model.P }() defer span.Finish() - result, err := s.PluginStore.Get(pluginId, key) + result, err := s.PluginStore.Get(pluginID, key) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -4759,7 +4759,7 @@ func (s *OpenTracingLayerPluginStore) Get(pluginId string, key string) (*model.P return result, err } -func (s *OpenTracingLayerPluginStore) List(pluginId string, page int, perPage int) ([]string, error) { +func (s *OpenTracingLayerPluginStore) List(pluginID string, page int, perPage int) ([]string, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PluginStore.List") s.Root.Store.SetContext(newCtx) @@ -4768,7 +4768,7 @@ func (s *OpenTracingLayerPluginStore) List(pluginId string, page int, perPage in }() defer span.Finish() - result, err := s.PluginStore.List(pluginId, page, perPage) + result, err := s.PluginStore.List(pluginID, page, perPage) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -4795,7 +4795,7 @@ func (s *OpenTracingLayerPluginStore) SaveOrUpdate(keyVal *model.PluginKeyValue) return result, err } -func (s *OpenTracingLayerPluginStore) SetWithOptions(pluginId string, key string, value []byte, options model.PluginKVSetOptions) (bool, error) { +func (s *OpenTracingLayerPluginStore) SetWithOptions(pluginID string, key string, value []byte, options model.PluginKVSetOptions) (bool, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PluginStore.SetWithOptions") s.Root.Store.SetContext(newCtx) @@ -4804,7 +4804,7 @@ func (s *OpenTracingLayerPluginStore) SetWithOptions(pluginId string, key string }() defer span.Finish() - result, err := s.PluginStore.SetWithOptions(pluginId, key, value, options) + result, err := s.PluginStore.SetWithOptions(pluginID, key, value, options) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -4813,7 +4813,7 @@ func (s *OpenTracingLayerPluginStore) SetWithOptions(pluginId string, key string return result, err } -func (s *OpenTracingLayerPostStore) AnalyticsPostCount(teamId string, mustHaveFile bool, mustHaveHashtag bool) (int64, error) { +func (s *OpenTracingLayerPostStore) AnalyticsPostCount(teamID string, mustHaveFile bool, mustHaveHashtag bool) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.AnalyticsPostCount") s.Root.Store.SetContext(newCtx) @@ -4822,7 +4822,7 @@ func (s *OpenTracingLayerPostStore) AnalyticsPostCount(teamId string, mustHaveFi }() defer span.Finish() - result, err := s.PostStore.AnalyticsPostCount(teamId, mustHaveFile, mustHaveHashtag) + result, err := s.PostStore.AnalyticsPostCount(teamID, mustHaveFile, mustHaveHashtag) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -4849,7 +4849,7 @@ func (s *OpenTracingLayerPostStore) AnalyticsPostCountsByDay(options *model.Anal return result, err } -func (s *OpenTracingLayerPostStore) AnalyticsUserCountsWithPostsByDay(teamId string) (model.AnalyticsRows, error) { +func (s *OpenTracingLayerPostStore) AnalyticsUserCountsWithPostsByDay(teamID string) (model.AnalyticsRows, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.AnalyticsUserCountsWithPostsByDay") s.Root.Store.SetContext(newCtx) @@ -4858,7 +4858,7 @@ func (s *OpenTracingLayerPostStore) AnalyticsUserCountsWithPostsByDay(teamId str }() defer span.Finish() - result, err := s.PostStore.AnalyticsUserCountsWithPostsByDay(teamId) + result, err := s.PostStore.AnalyticsUserCountsWithPostsByDay(teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -4880,7 +4880,7 @@ func (s *OpenTracingLayerPostStore) ClearCaches() { } -func (s *OpenTracingLayerPostStore) Delete(postId string, time int64, deleteByID string) error { +func (s *OpenTracingLayerPostStore) Delete(postID string, time int64, deleteByID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.Delete") s.Root.Store.SetContext(newCtx) @@ -4889,7 +4889,7 @@ func (s *OpenTracingLayerPostStore) Delete(postId string, time int64, deleteByID }() defer span.Finish() - err := s.PostStore.Delete(postId, time, deleteByID) + err := s.PostStore.Delete(postID, time, deleteByID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -4916,7 +4916,7 @@ func (s *OpenTracingLayerPostStore) Get(id string, skipFetchThreads bool, collap return result, err } -func (s *OpenTracingLayerPostStore) GetDirectPostParentsForExportAfter(limit int, afterId string) ([]*model.DirectPostForExport, error) { +func (s *OpenTracingLayerPostStore) GetDirectPostParentsForExportAfter(limit int, afterID string) ([]*model.DirectPostForExport, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.GetDirectPostParentsForExportAfter") s.Root.Store.SetContext(newCtx) @@ -4925,7 +4925,7 @@ func (s *OpenTracingLayerPostStore) GetDirectPostParentsForExportAfter(limit int }() defer span.Finish() - result, err := s.PostStore.GetDirectPostParentsForExportAfter(limit, afterId) + result, err := s.PostStore.GetDirectPostParentsForExportAfter(limit, afterID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -4934,7 +4934,7 @@ func (s *OpenTracingLayerPostStore) GetDirectPostParentsForExportAfter(limit int return result, err } -func (s *OpenTracingLayerPostStore) GetEtag(channelId string, allowFromCache bool, collapsedThreads bool) string { +func (s *OpenTracingLayerPostStore) GetEtag(channelID string, allowFromCache bool, collapsedThreads bool) string { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.GetEtag") s.Root.Store.SetContext(newCtx) @@ -4943,7 +4943,7 @@ func (s *OpenTracingLayerPostStore) GetEtag(channelId string, allowFromCache boo }() defer span.Finish() - result := s.PostStore.GetEtag(channelId, allowFromCache, collapsedThreads) + result := s.PostStore.GetEtag(channelID, allowFromCache, collapsedThreads) return result } @@ -4965,7 +4965,7 @@ func (s *OpenTracingLayerPostStore) GetFlaggedPosts(userId string, offset int, l return result, err } -func (s *OpenTracingLayerPostStore) GetFlaggedPostsForChannel(userId string, channelId string, offset int, limit int) (*model.PostList, error) { +func (s *OpenTracingLayerPostStore) GetFlaggedPostsForChannel(userId string, channelID string, offset int, limit int) (*model.PostList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.GetFlaggedPostsForChannel") s.Root.Store.SetContext(newCtx) @@ -4974,7 +4974,7 @@ func (s *OpenTracingLayerPostStore) GetFlaggedPostsForChannel(userId string, cha }() defer span.Finish() - result, err := s.PostStore.GetFlaggedPostsForChannel(userId, channelId, offset, limit) + result, err := s.PostStore.GetFlaggedPostsForChannel(userId, channelID, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -4983,7 +4983,7 @@ func (s *OpenTracingLayerPostStore) GetFlaggedPostsForChannel(userId string, cha return result, err } -func (s *OpenTracingLayerPostStore) GetFlaggedPostsForTeam(userId string, teamId string, offset int, limit int) (*model.PostList, error) { +func (s *OpenTracingLayerPostStore) GetFlaggedPostsForTeam(userId string, teamID string, offset int, limit int) (*model.PostList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.GetFlaggedPostsForTeam") s.Root.Store.SetContext(newCtx) @@ -4993,14 +4993,14 @@ func (s *OpenTracingLayerPostStore) GetFlaggedPostsForTeam(userId string, teamId span.SetTag("userId", userId) - span.SetTag("teamId", teamId) + span.SetTag("teamID", teamID) span.SetTag("offset", offset) span.SetTag("limit", limit) defer span.Finish() - result, err := s.PostStore.GetFlaggedPostsForTeam(userId, teamId, offset, limit) + result, err := s.PostStore.GetFlaggedPostsForTeam(userId, teamID, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5058,7 +5058,7 @@ func (s *OpenTracingLayerPostStore) GetOldestEntityCreationTime() (int64, error) return result, err } -func (s *OpenTracingLayerPostStore) GetParentsForExportAfter(limit int, afterId string) ([]*model.PostForExport, error) { +func (s *OpenTracingLayerPostStore) GetParentsForExportAfter(limit int, afterID string) ([]*model.PostForExport, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.GetParentsForExportAfter") s.Root.Store.SetContext(newCtx) @@ -5067,7 +5067,7 @@ func (s *OpenTracingLayerPostStore) GetParentsForExportAfter(limit int, afterId }() defer span.Finish() - result, err := s.PostStore.GetParentsForExportAfter(limit, afterId) + result, err := s.PostStore.GetParentsForExportAfter(limit, afterID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5076,7 +5076,7 @@ func (s *OpenTracingLayerPostStore) GetParentsForExportAfter(limit int, afterId return result, err } -func (s *OpenTracingLayerPostStore) GetPostAfterTime(channelId string, time int64) (*model.Post, error) { +func (s *OpenTracingLayerPostStore) GetPostAfterTime(channelID string, time int64) (*model.Post, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.GetPostAfterTime") s.Root.Store.SetContext(newCtx) @@ -5085,7 +5085,7 @@ func (s *OpenTracingLayerPostStore) GetPostAfterTime(channelId string, time int6 }() defer span.Finish() - result, err := s.PostStore.GetPostAfterTime(channelId, time) + result, err := s.PostStore.GetPostAfterTime(channelID, time) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5094,7 +5094,7 @@ func (s *OpenTracingLayerPostStore) GetPostAfterTime(channelId string, time int6 return result, err } -func (s *OpenTracingLayerPostStore) GetPostIdAfterTime(channelId string, time int64) (string, error) { +func (s *OpenTracingLayerPostStore) GetPostIdAfterTime(channelID string, time int64) (string, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.GetPostIdAfterTime") s.Root.Store.SetContext(newCtx) @@ -5103,7 +5103,7 @@ func (s *OpenTracingLayerPostStore) GetPostIdAfterTime(channelId string, time in }() defer span.Finish() - result, err := s.PostStore.GetPostIdAfterTime(channelId, time) + result, err := s.PostStore.GetPostIdAfterTime(channelID, time) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5112,7 +5112,7 @@ func (s *OpenTracingLayerPostStore) GetPostIdAfterTime(channelId string, time in return result, err } -func (s *OpenTracingLayerPostStore) GetPostIdBeforeTime(channelId string, time int64) (string, error) { +func (s *OpenTracingLayerPostStore) GetPostIdBeforeTime(channelID string, time int64) (string, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.GetPostIdBeforeTime") s.Root.Store.SetContext(newCtx) @@ -5121,7 +5121,7 @@ func (s *OpenTracingLayerPostStore) GetPostIdBeforeTime(channelId string, time i }() defer span.Finish() - result, err := s.PostStore.GetPostIdBeforeTime(channelId, time) + result, err := s.PostStore.GetPostIdBeforeTime(channelID, time) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5220,7 +5220,7 @@ func (s *OpenTracingLayerPostStore) GetPostsByIds(postIds []string) ([]*model.Po return result, err } -func (s *OpenTracingLayerPostStore) GetPostsCreatedAt(channelId string, time int64) ([]*model.Post, error) { +func (s *OpenTracingLayerPostStore) GetPostsCreatedAt(channelID string, time int64) ([]*model.Post, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.GetPostsCreatedAt") s.Root.Store.SetContext(newCtx) @@ -5229,7 +5229,7 @@ func (s *OpenTracingLayerPostStore) GetPostsCreatedAt(channelId string, time int }() defer span.Finish() - result, err := s.PostStore.GetPostsCreatedAt(channelId, time) + result, err := s.PostStore.GetPostsCreatedAt(channelID, time) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5256,7 +5256,7 @@ func (s *OpenTracingLayerPostStore) GetPostsSince(options model.GetPostsSinceOpt return result, err } -func (s *OpenTracingLayerPostStore) GetRepliesForExport(parentId string) ([]*model.ReplyForExport, error) { +func (s *OpenTracingLayerPostStore) GetRepliesForExport(parentID string) ([]*model.ReplyForExport, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.GetRepliesForExport") s.Root.Store.SetContext(newCtx) @@ -5265,7 +5265,7 @@ func (s *OpenTracingLayerPostStore) GetRepliesForExport(parentId string) ([]*mod }() defer span.Finish() - result, err := s.PostStore.GetRepliesForExport(parentId) + result, err := s.PostStore.GetRepliesForExport(parentID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5292,7 +5292,7 @@ func (s *OpenTracingLayerPostStore) GetSingle(id string) (*model.Post, error) { return result, err } -func (s *OpenTracingLayerPostStore) InvalidateLastPostTimeCache(channelId string) { +func (s *OpenTracingLayerPostStore) InvalidateLastPostTimeCache(channelID string) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.InvalidateLastPostTimeCache") s.Root.Store.SetContext(newCtx) @@ -5301,7 +5301,7 @@ func (s *OpenTracingLayerPostStore) InvalidateLastPostTimeCache(channelId string }() defer span.Finish() - s.PostStore.InvalidateLastPostTimeCache(channelId) + s.PostStore.InvalidateLastPostTimeCache(channelID) } @@ -5359,7 +5359,7 @@ func (s *OpenTracingLayerPostStore) PermanentDeleteBatch(endTime int64, limit in return result, err } -func (s *OpenTracingLayerPostStore) PermanentDeleteByChannel(channelId string) error { +func (s *OpenTracingLayerPostStore) PermanentDeleteByChannel(channelID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.PermanentDeleteByChannel") s.Root.Store.SetContext(newCtx) @@ -5368,7 +5368,7 @@ func (s *OpenTracingLayerPostStore) PermanentDeleteByChannel(channelId string) e }() defer span.Finish() - err := s.PostStore.PermanentDeleteByChannel(channelId) + err := s.PostStore.PermanentDeleteByChannel(channelID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5431,7 +5431,7 @@ func (s *OpenTracingLayerPostStore) SaveMultiple(posts []*model.Post) ([]*model. return result, resultVar1, err } -func (s *OpenTracingLayerPostStore) Search(teamId string, userId string, params *model.SearchParams) (*model.PostList, error) { +func (s *OpenTracingLayerPostStore) Search(teamID string, userId string, params *model.SearchParams) (*model.PostList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.Search") s.Root.Store.SetContext(newCtx) @@ -5440,7 +5440,7 @@ func (s *OpenTracingLayerPostStore) Search(teamId string, userId string, params }() defer span.Finish() - result, err := s.PostStore.Search(teamId, userId, params) + result, err := s.PostStore.Search(teamID, userId, params) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5449,7 +5449,7 @@ func (s *OpenTracingLayerPostStore) Search(teamId string, userId string, params return result, err } -func (s *OpenTracingLayerPostStore) SearchPostsInTeamForUser(paramsList []*model.SearchParams, userId string, teamId string, page int, perPage int) (*model.PostSearchResults, error) { +func (s *OpenTracingLayerPostStore) SearchPostsInTeamForUser(paramsList []*model.SearchParams, userId string, teamID string, page int, perPage int) (*model.PostSearchResults, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.SearchPostsInTeamForUser") s.Root.Store.SetContext(newCtx) @@ -5458,7 +5458,7 @@ func (s *OpenTracingLayerPostStore) SearchPostsInTeamForUser(paramsList []*model }() defer span.Finish() - result, err := s.PostStore.SearchPostsInTeamForUser(paramsList, userId, teamId, page, perPage) + result, err := s.PostStore.SearchPostsInTeamForUser(paramsList, userId, teamID, page, perPage) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5773,7 +5773,7 @@ func (s *OpenTracingLayerReactionStore) DeleteAllWithEmojiName(emojiName string) return err } -func (s *OpenTracingLayerReactionStore) GetForPost(postId string, allowFromCache bool) ([]*model.Reaction, error) { +func (s *OpenTracingLayerReactionStore) GetForPost(postID string, allowFromCache bool) ([]*model.Reaction, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ReactionStore.GetForPost") s.Root.Store.SetContext(newCtx) @@ -5782,7 +5782,7 @@ func (s *OpenTracingLayerReactionStore) GetForPost(postId string, allowFromCache }() defer span.Finish() - result, err := s.ReactionStore.GetForPost(postId, allowFromCache) + result, err := s.ReactionStore.GetForPost(postID, allowFromCache) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5881,7 +5881,7 @@ func (s *OpenTracingLayerRoleStore) ChannelRolesUnderTeamRole(roleName string) ( return result, err } -func (s *OpenTracingLayerRoleStore) Delete(roleId string) (*model.Role, error) { +func (s *OpenTracingLayerRoleStore) Delete(roleID string) (*model.Role, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "RoleStore.Delete") s.Root.Store.SetContext(newCtx) @@ -5890,7 +5890,7 @@ func (s *OpenTracingLayerRoleStore) Delete(roleId string) (*model.Role, error) { }() defer span.Finish() - result, err := s.RoleStore.Delete(roleId) + result, err := s.RoleStore.Delete(roleID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5899,7 +5899,7 @@ func (s *OpenTracingLayerRoleStore) Delete(roleId string) (*model.Role, error) { return result, err } -func (s *OpenTracingLayerRoleStore) Get(roleId string) (*model.Role, error) { +func (s *OpenTracingLayerRoleStore) Get(roleID string) (*model.Role, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "RoleStore.Get") s.Root.Store.SetContext(newCtx) @@ -5908,7 +5908,7 @@ func (s *OpenTracingLayerRoleStore) Get(roleId string) (*model.Role, error) { }() defer span.Finish() - result, err := s.RoleStore.Get(roleId) + result, err := s.RoleStore.Get(roleID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -6043,7 +6043,7 @@ func (s *OpenTracingLayerSchemeStore) CountWithoutPermission(scope string, permi return result, err } -func (s *OpenTracingLayerSchemeStore) Delete(schemeId string) (*model.Scheme, error) { +func (s *OpenTracingLayerSchemeStore) Delete(schemeID string) (*model.Scheme, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "SchemeStore.Delete") s.Root.Store.SetContext(newCtx) @@ -6052,7 +6052,7 @@ func (s *OpenTracingLayerSchemeStore) Delete(schemeId string) (*model.Scheme, er }() defer span.Finish() - result, err := s.SchemeStore.Delete(schemeId) + result, err := s.SchemeStore.Delete(schemeID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -6061,7 +6061,7 @@ func (s *OpenTracingLayerSchemeStore) Delete(schemeId string) (*model.Scheme, er return result, err } -func (s *OpenTracingLayerSchemeStore) Get(schemeId string) (*model.Scheme, error) { +func (s *OpenTracingLayerSchemeStore) Get(schemeID string) (*model.Scheme, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "SchemeStore.Get") s.Root.Store.SetContext(newCtx) @@ -6070,7 +6070,7 @@ func (s *OpenTracingLayerSchemeStore) Get(schemeId string) (*model.Scheme, error }() defer span.Finish() - result, err := s.SchemeStore.Get(schemeId) + result, err := s.SchemeStore.Get(schemeID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -6182,7 +6182,7 @@ func (s *OpenTracingLayerSessionStore) Cleanup(expiryTime int64, batchSize int64 } -func (s *OpenTracingLayerSessionStore) Get(sessionIdOrToken string) (*model.Session, error) { +func (s *OpenTracingLayerSessionStore) Get(sessionIDOrToken string) (*model.Session, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "SessionStore.Get") s.Root.Store.SetContext(newCtx) @@ -6191,7 +6191,7 @@ func (s *OpenTracingLayerSessionStore) Get(sessionIdOrToken string) (*model.Sess }() defer span.Finish() - result, err := s.SessionStore.Get(sessionIdOrToken) + result, err := s.SessionStore.Get(sessionIDOrToken) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -6254,7 +6254,7 @@ func (s *OpenTracingLayerSessionStore) GetSessionsWithActiveDeviceIds(userId str return result, err } -func (s *OpenTracingLayerSessionStore) PermanentDeleteSessionsByUser(teamId string) error { +func (s *OpenTracingLayerSessionStore) PermanentDeleteSessionsByUser(teamID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "SessionStore.PermanentDeleteSessionsByUser") s.Root.Store.SetContext(newCtx) @@ -6263,7 +6263,7 @@ func (s *OpenTracingLayerSessionStore) PermanentDeleteSessionsByUser(teamId stri }() defer span.Finish() - err := s.SessionStore.PermanentDeleteSessionsByUser(teamId) + err := s.SessionStore.PermanentDeleteSessionsByUser(teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -6272,7 +6272,7 @@ func (s *OpenTracingLayerSessionStore) PermanentDeleteSessionsByUser(teamId stri return err } -func (s *OpenTracingLayerSessionStore) Remove(sessionIdOrToken string) error { +func (s *OpenTracingLayerSessionStore) Remove(sessionIDOrToken string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "SessionStore.Remove") s.Root.Store.SetContext(newCtx) @@ -6281,7 +6281,7 @@ func (s *OpenTracingLayerSessionStore) Remove(sessionIdOrToken string) error { }() defer span.Finish() - err := s.SessionStore.Remove(sessionIdOrToken) + err := s.SessionStore.Remove(sessionIDOrToken) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -6326,7 +6326,7 @@ func (s *OpenTracingLayerSessionStore) Save(session *model.Session) (*model.Sess return result, err } -func (s *OpenTracingLayerSessionStore) UpdateDeviceId(id string, deviceId string, expiresAt int64) (string, error) { +func (s *OpenTracingLayerSessionStore) UpdateDeviceId(id string, deviceID string, expiresAt int64) (string, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "SessionStore.UpdateDeviceId") s.Root.Store.SetContext(newCtx) @@ -6335,7 +6335,7 @@ func (s *OpenTracingLayerSessionStore) UpdateDeviceId(id string, deviceId string }() defer span.Finish() - result, err := s.SessionStore.UpdateDeviceId(id, deviceId, expiresAt) + result, err := s.SessionStore.UpdateDeviceId(id, deviceID, expiresAt) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -6362,7 +6362,7 @@ func (s *OpenTracingLayerSessionStore) UpdateExpiredNotify(sessionid string, not return err } -func (s *OpenTracingLayerSessionStore) UpdateExpiresAt(sessionId string, time int64) error { +func (s *OpenTracingLayerSessionStore) UpdateExpiresAt(sessionID string, time int64) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "SessionStore.UpdateExpiresAt") s.Root.Store.SetContext(newCtx) @@ -6371,7 +6371,7 @@ func (s *OpenTracingLayerSessionStore) UpdateExpiresAt(sessionId string, time in }() defer span.Finish() - err := s.SessionStore.UpdateExpiresAt(sessionId, time) + err := s.SessionStore.UpdateExpiresAt(sessionID, time) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -6380,7 +6380,7 @@ func (s *OpenTracingLayerSessionStore) UpdateExpiresAt(sessionId string, time in return err } -func (s *OpenTracingLayerSessionStore) UpdateLastActivityAt(sessionId string, time int64) error { +func (s *OpenTracingLayerSessionStore) UpdateLastActivityAt(sessionID string, time int64) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "SessionStore.UpdateLastActivityAt") s.Root.Store.SetContext(newCtx) @@ -6389,7 +6389,7 @@ func (s *OpenTracingLayerSessionStore) UpdateLastActivityAt(sessionId string, ti }() defer span.Finish() - err := s.SessionStore.UpdateLastActivityAt(sessionId, time) + err := s.SessionStore.UpdateLastActivityAt(sessionID, time) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -6686,7 +6686,7 @@ func (s *OpenTracingLayerSystemStore) Update(system *model.System) error { return err } -func (s *OpenTracingLayerTeamStore) AnalyticsGetTeamCountForScheme(schemeId string) (int64, error) { +func (s *OpenTracingLayerTeamStore) AnalyticsGetTeamCountForScheme(schemeID string) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.AnalyticsGetTeamCountForScheme") s.Root.Store.SetContext(newCtx) @@ -6695,7 +6695,7 @@ func (s *OpenTracingLayerTeamStore) AnalyticsGetTeamCountForScheme(schemeId stri }() defer span.Finish() - result, err := s.TeamStore.AnalyticsGetTeamCountForScheme(schemeId) + result, err := s.TeamStore.AnalyticsGetTeamCountForScheme(schemeID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -6807,7 +6807,7 @@ func (s *OpenTracingLayerTeamStore) Get(id string) (*model.Team, error) { return result, err } -func (s *OpenTracingLayerTeamStore) GetActiveMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, error) { +func (s *OpenTracingLayerTeamStore) GetActiveMemberCount(teamID string, restrictions *model.ViewUsersRestrictions) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.GetActiveMemberCount") s.Root.Store.SetContext(newCtx) @@ -6816,7 +6816,7 @@ func (s *OpenTracingLayerTeamStore) GetActiveMemberCount(teamId string, restrict }() defer span.Finish() - result, err := s.TeamStore.GetActiveMemberCount(teamId, restrictions) + result, err := s.TeamStore.GetActiveMemberCount(teamID, restrictions) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -6843,7 +6843,7 @@ func (s *OpenTracingLayerTeamStore) GetAll() ([]*model.Team, error) { return result, err } -func (s *OpenTracingLayerTeamStore) GetAllForExportAfter(limit int, afterId string) ([]*model.TeamForExport, error) { +func (s *OpenTracingLayerTeamStore) GetAllForExportAfter(limit int, afterID string) ([]*model.TeamForExport, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.GetAllForExportAfter") s.Root.Store.SetContext(newCtx) @@ -6852,7 +6852,7 @@ func (s *OpenTracingLayerTeamStore) GetAllForExportAfter(limit int, afterId stri }() defer span.Finish() - result, err := s.TeamStore.GetAllForExportAfter(limit, afterId) + result, err := s.TeamStore.GetAllForExportAfter(limit, afterID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -6969,7 +6969,7 @@ func (s *OpenTracingLayerTeamStore) GetAllTeamPageListing(offset int, limit int) return result, err } -func (s *OpenTracingLayerTeamStore) GetByInviteId(inviteId string) (*model.Team, error) { +func (s *OpenTracingLayerTeamStore) GetByInviteId(inviteID string) (*model.Team, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.GetByInviteId") s.Root.Store.SetContext(newCtx) @@ -6978,7 +6978,7 @@ func (s *OpenTracingLayerTeamStore) GetByInviteId(inviteId string) (*model.Team, }() defer span.Finish() - result, err := s.TeamStore.GetByInviteId(inviteId) + result, err := s.TeamStore.GetByInviteId(inviteID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7023,7 +7023,7 @@ func (s *OpenTracingLayerTeamStore) GetByNames(name []string) ([]*model.Team, er return result, err } -func (s *OpenTracingLayerTeamStore) GetChannelUnreadsForAllTeams(excludeTeamId string, userId string) ([]*model.ChannelUnread, error) { +func (s *OpenTracingLayerTeamStore) GetChannelUnreadsForAllTeams(excludeTeamID string, userId string) ([]*model.ChannelUnread, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.GetChannelUnreadsForAllTeams") s.Root.Store.SetContext(newCtx) @@ -7032,7 +7032,7 @@ func (s *OpenTracingLayerTeamStore) GetChannelUnreadsForAllTeams(excludeTeamId s }() defer span.Finish() - result, err := s.TeamStore.GetChannelUnreadsForAllTeams(excludeTeamId, userId) + result, err := s.TeamStore.GetChannelUnreadsForAllTeams(excludeTeamID, userId) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7041,7 +7041,7 @@ func (s *OpenTracingLayerTeamStore) GetChannelUnreadsForAllTeams(excludeTeamId s return result, err } -func (s *OpenTracingLayerTeamStore) GetChannelUnreadsForTeam(teamId string, userId string) ([]*model.ChannelUnread, error) { +func (s *OpenTracingLayerTeamStore) GetChannelUnreadsForTeam(teamID string, userId string) ([]*model.ChannelUnread, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.GetChannelUnreadsForTeam") s.Root.Store.SetContext(newCtx) @@ -7050,7 +7050,7 @@ func (s *OpenTracingLayerTeamStore) GetChannelUnreadsForTeam(teamId string, user }() defer span.Finish() - result, err := s.TeamStore.GetChannelUnreadsForTeam(teamId, userId) + result, err := s.TeamStore.GetChannelUnreadsForTeam(teamID, userId) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7059,7 +7059,7 @@ func (s *OpenTracingLayerTeamStore) GetChannelUnreadsForTeam(teamId string, user return result, err } -func (s *OpenTracingLayerTeamStore) GetMember(teamId string, userId string) (*model.TeamMember, error) { +func (s *OpenTracingLayerTeamStore) GetMember(teamID string, userId string) (*model.TeamMember, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.GetMember") s.Root.Store.SetContext(newCtx) @@ -7068,7 +7068,7 @@ func (s *OpenTracingLayerTeamStore) GetMember(teamId string, userId string) (*mo }() defer span.Finish() - result, err := s.TeamStore.GetMember(teamId, userId) + result, err := s.TeamStore.GetMember(teamID, userId) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7077,7 +7077,7 @@ func (s *OpenTracingLayerTeamStore) GetMember(teamId string, userId string) (*mo return result, err } -func (s *OpenTracingLayerTeamStore) GetMembers(teamId string, offset int, limit int, teamMembersGetOptions *model.TeamMembersGetOptions) ([]*model.TeamMember, error) { +func (s *OpenTracingLayerTeamStore) GetMembers(teamID string, offset int, limit int, teamMembersGetOptions *model.TeamMembersGetOptions) ([]*model.TeamMember, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.GetMembers") s.Root.Store.SetContext(newCtx) @@ -7086,7 +7086,7 @@ func (s *OpenTracingLayerTeamStore) GetMembers(teamId string, offset int, limit }() defer span.Finish() - result, err := s.TeamStore.GetMembers(teamId, offset, limit, teamMembersGetOptions) + result, err := s.TeamStore.GetMembers(teamID, offset, limit, teamMembersGetOptions) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7095,7 +7095,7 @@ func (s *OpenTracingLayerTeamStore) GetMembers(teamId string, offset int, limit return result, err } -func (s *OpenTracingLayerTeamStore) GetMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, error) { +func (s *OpenTracingLayerTeamStore) GetMembersByIds(teamID string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.GetMembersByIds") s.Root.Store.SetContext(newCtx) @@ -7104,7 +7104,7 @@ func (s *OpenTracingLayerTeamStore) GetMembersByIds(teamId string, userIds []str }() defer span.Finish() - result, err := s.TeamStore.GetMembersByIds(teamId, userIds, restrictions) + result, err := s.TeamStore.GetMembersByIds(teamID, userIds, restrictions) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7131,7 +7131,7 @@ func (s *OpenTracingLayerTeamStore) GetTeamMembersForExport(userId string) ([]*m return result, err } -func (s *OpenTracingLayerTeamStore) GetTeamsByScheme(schemeId string, offset int, limit int) ([]*model.Team, error) { +func (s *OpenTracingLayerTeamStore) GetTeamsByScheme(schemeID string, offset int, limit int) ([]*model.Team, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.GetTeamsByScheme") s.Root.Store.SetContext(newCtx) @@ -7140,7 +7140,7 @@ func (s *OpenTracingLayerTeamStore) GetTeamsByScheme(schemeId string, offset int }() defer span.Finish() - result, err := s.TeamStore.GetTeamsByScheme(schemeId, offset, limit) + result, err := s.TeamStore.GetTeamsByScheme(schemeID, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7203,7 +7203,7 @@ func (s *OpenTracingLayerTeamStore) GetTeamsForUserWithPagination(userId string, return result, err } -func (s *OpenTracingLayerTeamStore) GetTotalMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, error) { +func (s *OpenTracingLayerTeamStore) GetTotalMemberCount(teamID string, restrictions *model.ViewUsersRestrictions) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.GetTotalMemberCount") s.Root.Store.SetContext(newCtx) @@ -7212,7 +7212,7 @@ func (s *OpenTracingLayerTeamStore) GetTotalMemberCount(teamId string, restricti }() defer span.Finish() - result, err := s.TeamStore.GetTotalMemberCount(teamId, restrictions) + result, err := s.TeamStore.GetTotalMemberCount(teamID, restrictions) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7270,7 +7270,7 @@ func (s *OpenTracingLayerTeamStore) InvalidateAllTeamIdsForUser(userId string) { } -func (s *OpenTracingLayerTeamStore) MigrateTeamMembers(fromTeamId string, fromUserId string) (map[string]string, error) { +func (s *OpenTracingLayerTeamStore) MigrateTeamMembers(fromTeamID string, fromUserId string) (map[string]string, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.MigrateTeamMembers") s.Root.Store.SetContext(newCtx) @@ -7279,7 +7279,7 @@ func (s *OpenTracingLayerTeamStore) MigrateTeamMembers(fromTeamId string, fromUs }() defer span.Finish() - result, err := s.TeamStore.MigrateTeamMembers(fromTeamId, fromUserId) + result, err := s.TeamStore.MigrateTeamMembers(fromTeamID, fromUserId) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7288,7 +7288,7 @@ func (s *OpenTracingLayerTeamStore) MigrateTeamMembers(fromTeamId string, fromUs return result, err } -func (s *OpenTracingLayerTeamStore) PermanentDelete(teamId string) error { +func (s *OpenTracingLayerTeamStore) PermanentDelete(teamID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.PermanentDelete") s.Root.Store.SetContext(newCtx) @@ -7297,7 +7297,7 @@ func (s *OpenTracingLayerTeamStore) PermanentDelete(teamId string) error { }() defer span.Finish() - err := s.TeamStore.PermanentDelete(teamId) + err := s.TeamStore.PermanentDelete(teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7306,7 +7306,7 @@ func (s *OpenTracingLayerTeamStore) PermanentDelete(teamId string) error { return err } -func (s *OpenTracingLayerTeamStore) RemoveAllMembersByTeam(teamId string) error { +func (s *OpenTracingLayerTeamStore) RemoveAllMembersByTeam(teamID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.RemoveAllMembersByTeam") s.Root.Store.SetContext(newCtx) @@ -7315,7 +7315,7 @@ func (s *OpenTracingLayerTeamStore) RemoveAllMembersByTeam(teamId string) error }() defer span.Finish() - err := s.TeamStore.RemoveAllMembersByTeam(teamId) + err := s.TeamStore.RemoveAllMembersByTeam(teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7342,7 +7342,7 @@ func (s *OpenTracingLayerTeamStore) RemoveAllMembersByUser(userId string) error return err } -func (s *OpenTracingLayerTeamStore) RemoveMember(teamId string, userId string) error { +func (s *OpenTracingLayerTeamStore) RemoveMember(teamID string, userId string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.RemoveMember") s.Root.Store.SetContext(newCtx) @@ -7351,7 +7351,7 @@ func (s *OpenTracingLayerTeamStore) RemoveMember(teamId string, userId string) e }() defer span.Finish() - err := s.TeamStore.RemoveMember(teamId, userId) + err := s.TeamStore.RemoveMember(teamID, userId) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7360,7 +7360,7 @@ func (s *OpenTracingLayerTeamStore) RemoveMember(teamId string, userId string) e return err } -func (s *OpenTracingLayerTeamStore) RemoveMembers(teamId string, userIds []string) error { +func (s *OpenTracingLayerTeamStore) RemoveMembers(teamID string, userIds []string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.RemoveMembers") s.Root.Store.SetContext(newCtx) @@ -7369,7 +7369,7 @@ func (s *OpenTracingLayerTeamStore) RemoveMembers(teamId string, userIds []strin }() defer span.Finish() - err := s.TeamStore.RemoveMembers(teamId, userIds) + err := s.TeamStore.RemoveMembers(teamID, userIds) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7540,7 +7540,7 @@ func (s *OpenTracingLayerTeamStore) Update(team *model.Team) (*model.Team, error return result, err } -func (s *OpenTracingLayerTeamStore) UpdateLastTeamIconUpdate(teamId string, curTime int64) error { +func (s *OpenTracingLayerTeamStore) UpdateLastTeamIconUpdate(teamID string, curTime int64) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.UpdateLastTeamIconUpdate") s.Root.Store.SetContext(newCtx) @@ -7549,7 +7549,7 @@ func (s *OpenTracingLayerTeamStore) UpdateLastTeamIconUpdate(teamId string, curT }() defer span.Finish() - err := s.TeamStore.UpdateLastTeamIconUpdate(teamId, curTime) + err := s.TeamStore.UpdateLastTeamIconUpdate(teamID, curTime) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7702,7 +7702,7 @@ func (s *OpenTracingLayerThreadStore) CollectThreadsWithNewerReplies(userId stri return result, err } -func (s *OpenTracingLayerThreadStore) CreateMembershipIfNeeded(userId string, postId string, following bool, incrementMentions bool, updateFollowing bool) error { +func (s *OpenTracingLayerThreadStore) CreateMembershipIfNeeded(userId string, postID string, following bool, incrementMentions bool, updateFollowing bool) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ThreadStore.CreateMembershipIfNeeded") s.Root.Store.SetContext(newCtx) @@ -7711,7 +7711,7 @@ func (s *OpenTracingLayerThreadStore) CreateMembershipIfNeeded(userId string, po }() defer span.Finish() - err := s.ThreadStore.CreateMembershipIfNeeded(userId, postId, following, incrementMentions, updateFollowing) + err := s.ThreadStore.CreateMembershipIfNeeded(userId, postID, following, incrementMentions, updateFollowing) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7738,7 +7738,7 @@ func (s *OpenTracingLayerThreadStore) Delete(postId string) error { return err } -func (s *OpenTracingLayerThreadStore) DeleteMembershipForUser(userId string, postId string) error { +func (s *OpenTracingLayerThreadStore) DeleteMembershipForUser(userId string, postID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ThreadStore.DeleteMembershipForUser") s.Root.Store.SetContext(newCtx) @@ -7747,7 +7747,7 @@ func (s *OpenTracingLayerThreadStore) DeleteMembershipForUser(userId string, pos }() defer span.Finish() - err := s.ThreadStore.DeleteMembershipForUser(userId, postId) + err := s.ThreadStore.DeleteMembershipForUser(userId, postID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7774,7 +7774,7 @@ func (s *OpenTracingLayerThreadStore) Get(id string) (*model.Thread, error) { return result, err } -func (s *OpenTracingLayerThreadStore) GetMembershipForUser(userId string, postId string) (*model.ThreadMembership, error) { +func (s *OpenTracingLayerThreadStore) GetMembershipForUser(userId string, postID string) (*model.ThreadMembership, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ThreadStore.GetMembershipForUser") s.Root.Store.SetContext(newCtx) @@ -7783,7 +7783,7 @@ func (s *OpenTracingLayerThreadStore) GetMembershipForUser(userId string, postId }() defer span.Finish() - result, err := s.ThreadStore.GetMembershipForUser(userId, postId) + result, err := s.ThreadStore.GetMembershipForUser(userId, postID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7792,7 +7792,7 @@ func (s *OpenTracingLayerThreadStore) GetMembershipForUser(userId string, postId return result, err } -func (s *OpenTracingLayerThreadStore) GetMembershipsForUser(userId string, teamId string) ([]*model.ThreadMembership, error) { +func (s *OpenTracingLayerThreadStore) GetMembershipsForUser(userId string, teamID string) ([]*model.ThreadMembership, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ThreadStore.GetMembershipsForUser") s.Root.Store.SetContext(newCtx) @@ -7801,7 +7801,7 @@ func (s *OpenTracingLayerThreadStore) GetMembershipsForUser(userId string, teamI }() defer span.Finish() - result, err := s.ThreadStore.GetMembershipsForUser(userId, teamId) + result, err := s.ThreadStore.GetMembershipsForUser(userId, teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7882,7 +7882,7 @@ func (s *OpenTracingLayerThreadStore) GetThreadsForUser(userId string, teamId st return result, err } -func (s *OpenTracingLayerThreadStore) MarkAllAsRead(userId string, teamId string) error { +func (s *OpenTracingLayerThreadStore) MarkAllAsRead(userId string, teamID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ThreadStore.MarkAllAsRead") s.Root.Store.SetContext(newCtx) @@ -7891,7 +7891,7 @@ func (s *OpenTracingLayerThreadStore) MarkAllAsRead(userId string, teamId string }() defer span.Finish() - err := s.ThreadStore.MarkAllAsRead(userId, teamId) + err := s.ThreadStore.MarkAllAsRead(userId, teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7900,7 +7900,7 @@ func (s *OpenTracingLayerThreadStore) MarkAllAsRead(userId string, teamId string return err } -func (s *OpenTracingLayerThreadStore) MarkAsRead(userId string, threadId string, timestamp int64) error { +func (s *OpenTracingLayerThreadStore) MarkAsRead(userId string, threadID string, timestamp int64) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ThreadStore.MarkAsRead") s.Root.Store.SetContext(newCtx) @@ -7909,7 +7909,7 @@ func (s *OpenTracingLayerThreadStore) MarkAsRead(userId string, threadId string, }() defer span.Finish() - err := s.ThreadStore.MarkAsRead(userId, threadId, timestamp) + err := s.ThreadStore.MarkAsRead(userId, threadID, timestamp) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -8309,7 +8309,7 @@ func (s *OpenTracingLayerUserStore) AnalyticsGetSystemAdminCount() (int64, error return result, err } -func (s *OpenTracingLayerUserStore) AutocompleteUsersInChannel(teamId string, channelId string, term string, options *model.UserSearchOptions) (*model.UserAutocompleteInChannel, error) { +func (s *OpenTracingLayerUserStore) AutocompleteUsersInChannel(teamID string, channelID string, term string, options *model.UserSearchOptions) (*model.UserAutocompleteInChannel, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.AutocompleteUsersInChannel") s.Root.Store.SetContext(newCtx) @@ -8318,7 +8318,7 @@ func (s *OpenTracingLayerUserStore) AutocompleteUsersInChannel(teamId string, ch }() defer span.Finish() - result, err := s.UserStore.AutocompleteUsersInChannel(teamId, channelId, term, options) + result, err := s.UserStore.AutocompleteUsersInChannel(teamID, channelID, term, options) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -8448,7 +8448,7 @@ func (s *OpenTracingLayerUserStore) GetAll() ([]*model.User, error) { return result, err } -func (s *OpenTracingLayerUserStore) GetAllAfter(limit int, afterId string) ([]*model.User, error) { +func (s *OpenTracingLayerUserStore) GetAllAfter(limit int, afterID string) ([]*model.User, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.GetAllAfter") s.Root.Store.SetContext(newCtx) @@ -8457,7 +8457,7 @@ func (s *OpenTracingLayerUserStore) GetAllAfter(limit int, afterId string) ([]*m }() defer span.Finish() - result, err := s.UserStore.GetAllAfter(limit, afterId) + result, err := s.UserStore.GetAllAfter(limit, afterID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -8538,7 +8538,7 @@ func (s *OpenTracingLayerUserStore) GetAllUsingAuthService(authService string) ( return result, err } -func (s *OpenTracingLayerUserStore) GetAnyUnreadPostCountForChannel(userId string, channelId string) (int64, error) { +func (s *OpenTracingLayerUserStore) GetAnyUnreadPostCountForChannel(userId string, channelID string) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.GetAnyUnreadPostCountForChannel") s.Root.Store.SetContext(newCtx) @@ -8547,7 +8547,7 @@ func (s *OpenTracingLayerUserStore) GetAnyUnreadPostCountForChannel(userId strin }() defer span.Finish() - result, err := s.UserStore.GetAnyUnreadPostCountForChannel(userId, channelId) + result, err := s.UserStore.GetAnyUnreadPostCountForChannel(userId, channelID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -8641,7 +8641,7 @@ func (s *OpenTracingLayerUserStore) GetEtagForAllProfiles() string { return result } -func (s *OpenTracingLayerUserStore) GetEtagForProfiles(teamId string) string { +func (s *OpenTracingLayerUserStore) GetEtagForProfiles(teamID string) string { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.GetEtagForProfiles") s.Root.Store.SetContext(newCtx) @@ -8650,11 +8650,11 @@ func (s *OpenTracingLayerUserStore) GetEtagForProfiles(teamId string) string { }() defer span.Finish() - result := s.UserStore.GetEtagForProfiles(teamId) + result := s.UserStore.GetEtagForProfiles(teamID) return result } -func (s *OpenTracingLayerUserStore) GetEtagForProfilesNotInTeam(teamId string) string { +func (s *OpenTracingLayerUserStore) GetEtagForProfilesNotInTeam(teamID string) string { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.GetEtagForProfilesNotInTeam") s.Root.Store.SetContext(newCtx) @@ -8663,11 +8663,11 @@ func (s *OpenTracingLayerUserStore) GetEtagForProfilesNotInTeam(teamId string) s }() defer span.Finish() - result := s.UserStore.GetEtagForProfilesNotInTeam(teamId) + result := s.UserStore.GetEtagForProfilesNotInTeam(teamID) return result } -func (s *OpenTracingLayerUserStore) GetForLogin(loginId string, allowSignInWithUsername bool, allowSignInWithEmail bool) (*model.User, error) { +func (s *OpenTracingLayerUserStore) GetForLogin(loginID string, allowSignInWithUsername bool, allowSignInWithEmail bool) (*model.User, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.GetForLogin") s.Root.Store.SetContext(newCtx) @@ -8676,7 +8676,7 @@ func (s *OpenTracingLayerUserStore) GetForLogin(loginId string, allowSignInWithU }() defer span.Finish() - result, err := s.UserStore.GetForLogin(loginId, allowSignInWithUsername, allowSignInWithEmail) + result, err := s.UserStore.GetForLogin(loginID, allowSignInWithUsername, allowSignInWithEmail) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -8721,7 +8721,7 @@ func (s *OpenTracingLayerUserStore) GetMany(ctx context.Context, ids []string) ( return result, err } -func (s *OpenTracingLayerUserStore) GetNewUsersForTeam(teamId string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { +func (s *OpenTracingLayerUserStore) GetNewUsersForTeam(teamID string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.GetNewUsersForTeam") s.Root.Store.SetContext(newCtx) @@ -8730,7 +8730,7 @@ func (s *OpenTracingLayerUserStore) GetNewUsersForTeam(teamId string, offset int }() defer span.Finish() - result, err := s.UserStore.GetNewUsersForTeam(teamId, offset, limit, viewRestrictions) + result, err := s.UserStore.GetNewUsersForTeam(teamID, offset, limit, viewRestrictions) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -8865,7 +8865,7 @@ func (s *OpenTracingLayerUserStore) GetProfilesNotInChannel(teamId string, chann return result, err } -func (s *OpenTracingLayerUserStore) GetProfilesNotInTeam(teamId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { +func (s *OpenTracingLayerUserStore) GetProfilesNotInTeam(teamID string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.GetProfilesNotInTeam") s.Root.Store.SetContext(newCtx) @@ -8874,7 +8874,7 @@ func (s *OpenTracingLayerUserStore) GetProfilesNotInTeam(teamId string, groupCon }() defer span.Finish() - result, err := s.UserStore.GetProfilesNotInTeam(teamId, groupConstrained, offset, limit, viewRestrictions) + result, err := s.UserStore.GetProfilesNotInTeam(teamID, groupConstrained, offset, limit, viewRestrictions) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -8901,7 +8901,7 @@ func (s *OpenTracingLayerUserStore) GetProfilesWithoutTeam(options *model.UserGe return result, err } -func (s *OpenTracingLayerUserStore) GetRecentlyActiveUsersForTeam(teamId string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { +func (s *OpenTracingLayerUserStore) GetRecentlyActiveUsersForTeam(teamID string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.GetRecentlyActiveUsersForTeam") s.Root.Store.SetContext(newCtx) @@ -8910,7 +8910,7 @@ func (s *OpenTracingLayerUserStore) GetRecentlyActiveUsersForTeam(teamId string, }() defer span.Finish() - result, err := s.UserStore.GetRecentlyActiveUsersForTeam(teamId, offset, limit, viewRestrictions) + result, err := s.UserStore.GetRecentlyActiveUsersForTeam(teamID, offset, limit, viewRestrictions) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -8973,7 +8973,7 @@ func (s *OpenTracingLayerUserStore) GetUnreadCount(userId string) (int64, error) return result, err } -func (s *OpenTracingLayerUserStore) GetUnreadCountForChannel(userId string, channelId string) (int64, error) { +func (s *OpenTracingLayerUserStore) GetUnreadCountForChannel(userId string, channelID string) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.GetUnreadCountForChannel") s.Root.Store.SetContext(newCtx) @@ -8982,7 +8982,7 @@ func (s *OpenTracingLayerUserStore) GetUnreadCountForChannel(userId string, chan }() defer span.Finish() - result, err := s.UserStore.GetUnreadCountForChannel(userId, channelId) + result, err := s.UserStore.GetUnreadCountForChannel(userId, channelID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9040,7 +9040,7 @@ func (s *OpenTracingLayerUserStore) InvalidateProfileCacheForUser(userId string) } -func (s *OpenTracingLayerUserStore) InvalidateProfilesInChannelCache(channelId string) { +func (s *OpenTracingLayerUserStore) InvalidateProfilesInChannelCache(channelID string) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.InvalidateProfilesInChannelCache") s.Root.Store.SetContext(newCtx) @@ -9049,7 +9049,7 @@ func (s *OpenTracingLayerUserStore) InvalidateProfilesInChannelCache(channelId s }() defer span.Finish() - s.UserStore.InvalidateProfilesInChannelCache(channelId) + s.UserStore.InvalidateProfilesInChannelCache(channelID) } @@ -9138,7 +9138,7 @@ func (s *OpenTracingLayerUserStore) Save(user *model.User) (*model.User, error) return result, err } -func (s *OpenTracingLayerUserStore) Search(teamId string, term string, options *model.UserSearchOptions) ([]*model.User, error) { +func (s *OpenTracingLayerUserStore) Search(teamID string, term string, options *model.UserSearchOptions) ([]*model.User, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.Search") s.Root.Store.SetContext(newCtx) @@ -9147,7 +9147,7 @@ func (s *OpenTracingLayerUserStore) Search(teamId string, term string, options * }() defer span.Finish() - result, err := s.UserStore.Search(teamId, term, options) + result, err := s.UserStore.Search(teamID, term, options) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9156,7 +9156,7 @@ func (s *OpenTracingLayerUserStore) Search(teamId string, term string, options * return result, err } -func (s *OpenTracingLayerUserStore) SearchInChannel(channelId string, term string, options *model.UserSearchOptions) ([]*model.User, error) { +func (s *OpenTracingLayerUserStore) SearchInChannel(channelID string, term string, options *model.UserSearchOptions) ([]*model.User, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.SearchInChannel") s.Root.Store.SetContext(newCtx) @@ -9165,7 +9165,7 @@ func (s *OpenTracingLayerUserStore) SearchInChannel(channelId string, term strin }() defer span.Finish() - result, err := s.UserStore.SearchInChannel(channelId, term, options) + result, err := s.UserStore.SearchInChannel(channelID, term, options) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9192,7 +9192,7 @@ func (s *OpenTracingLayerUserStore) SearchInGroup(groupID string, term string, o return result, err } -func (s *OpenTracingLayerUserStore) SearchNotInChannel(teamId string, channelId string, term string, options *model.UserSearchOptions) ([]*model.User, error) { +func (s *OpenTracingLayerUserStore) SearchNotInChannel(teamID string, channelID string, term string, options *model.UserSearchOptions) ([]*model.User, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.SearchNotInChannel") s.Root.Store.SetContext(newCtx) @@ -9201,7 +9201,7 @@ func (s *OpenTracingLayerUserStore) SearchNotInChannel(teamId string, channelId }() defer span.Finish() - result, err := s.UserStore.SearchNotInChannel(teamId, channelId, term, options) + result, err := s.UserStore.SearchNotInChannel(teamID, channelID, term, options) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9408,7 +9408,7 @@ func (s *OpenTracingLayerUserStore) VerifyEmail(userId string, email string) (st return result, err } -func (s *OpenTracingLayerUserAccessTokenStore) Delete(tokenId string) error { +func (s *OpenTracingLayerUserAccessTokenStore) Delete(tokenID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserAccessTokenStore.Delete") s.Root.Store.SetContext(newCtx) @@ -9417,7 +9417,7 @@ func (s *OpenTracingLayerUserAccessTokenStore) Delete(tokenId string) error { }() defer span.Finish() - err := s.UserAccessTokenStore.Delete(tokenId) + err := s.UserAccessTokenStore.Delete(tokenID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9444,7 +9444,7 @@ func (s *OpenTracingLayerUserAccessTokenStore) DeleteAllForUser(userId string) e return err } -func (s *OpenTracingLayerUserAccessTokenStore) Get(tokenId string) (*model.UserAccessToken, error) { +func (s *OpenTracingLayerUserAccessTokenStore) Get(tokenID string) (*model.UserAccessToken, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserAccessTokenStore.Get") s.Root.Store.SetContext(newCtx) @@ -9453,7 +9453,7 @@ func (s *OpenTracingLayerUserAccessTokenStore) Get(tokenId string) (*model.UserA }() defer span.Finish() - result, err := s.UserAccessTokenStore.Get(tokenId) + result, err := s.UserAccessTokenStore.Get(tokenID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9552,7 +9552,7 @@ func (s *OpenTracingLayerUserAccessTokenStore) Search(term string) ([]*model.Use return result, err } -func (s *OpenTracingLayerUserAccessTokenStore) UpdateTokenDisable(tokenId string) error { +func (s *OpenTracingLayerUserAccessTokenStore) UpdateTokenDisable(tokenID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserAccessTokenStore.UpdateTokenDisable") s.Root.Store.SetContext(newCtx) @@ -9561,7 +9561,7 @@ func (s *OpenTracingLayerUserAccessTokenStore) UpdateTokenDisable(tokenId string }() defer span.Finish() - err := s.UserAccessTokenStore.UpdateTokenDisable(tokenId) + err := s.UserAccessTokenStore.UpdateTokenDisable(tokenID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9570,7 +9570,7 @@ func (s *OpenTracingLayerUserAccessTokenStore) UpdateTokenDisable(tokenId string return err } -func (s *OpenTracingLayerUserAccessTokenStore) UpdateTokenEnable(tokenId string) error { +func (s *OpenTracingLayerUserAccessTokenStore) UpdateTokenEnable(tokenID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserAccessTokenStore.UpdateTokenEnable") s.Root.Store.SetContext(newCtx) @@ -9579,7 +9579,7 @@ func (s *OpenTracingLayerUserAccessTokenStore) UpdateTokenEnable(tokenId string) }() defer span.Finish() - err := s.UserAccessTokenStore.UpdateTokenEnable(tokenId) + err := s.UserAccessTokenStore.UpdateTokenEnable(tokenID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9642,7 +9642,7 @@ func (s *OpenTracingLayerUserTermsOfServiceStore) Save(userTermsOfService *model return result, err } -func (s *OpenTracingLayerWebhookStore) AnalyticsIncomingCount(teamId string) (int64, error) { +func (s *OpenTracingLayerWebhookStore) AnalyticsIncomingCount(teamID string) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "WebhookStore.AnalyticsIncomingCount") s.Root.Store.SetContext(newCtx) @@ -9651,7 +9651,7 @@ func (s *OpenTracingLayerWebhookStore) AnalyticsIncomingCount(teamId string) (in }() defer span.Finish() - result, err := s.WebhookStore.AnalyticsIncomingCount(teamId) + result, err := s.WebhookStore.AnalyticsIncomingCount(teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9660,7 +9660,7 @@ func (s *OpenTracingLayerWebhookStore) AnalyticsIncomingCount(teamId string) (in return result, err } -func (s *OpenTracingLayerWebhookStore) AnalyticsOutgoingCount(teamId string) (int64, error) { +func (s *OpenTracingLayerWebhookStore) AnalyticsOutgoingCount(teamID string) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "WebhookStore.AnalyticsOutgoingCount") s.Root.Store.SetContext(newCtx) @@ -9669,7 +9669,7 @@ func (s *OpenTracingLayerWebhookStore) AnalyticsOutgoingCount(teamId string) (in }() defer span.Finish() - result, err := s.WebhookStore.AnalyticsOutgoingCount(teamId) + result, err := s.WebhookStore.AnalyticsOutgoingCount(teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9691,7 +9691,7 @@ func (s *OpenTracingLayerWebhookStore) ClearCaches() { } -func (s *OpenTracingLayerWebhookStore) DeleteIncoming(webhookId string, time int64) error { +func (s *OpenTracingLayerWebhookStore) DeleteIncoming(webhookID string, time int64) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "WebhookStore.DeleteIncoming") s.Root.Store.SetContext(newCtx) @@ -9700,7 +9700,7 @@ func (s *OpenTracingLayerWebhookStore) DeleteIncoming(webhookId string, time int }() defer span.Finish() - err := s.WebhookStore.DeleteIncoming(webhookId, time) + err := s.WebhookStore.DeleteIncoming(webhookID, time) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9709,7 +9709,7 @@ func (s *OpenTracingLayerWebhookStore) DeleteIncoming(webhookId string, time int return err } -func (s *OpenTracingLayerWebhookStore) DeleteOutgoing(webhookId string, time int64) error { +func (s *OpenTracingLayerWebhookStore) DeleteOutgoing(webhookID string, time int64) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "WebhookStore.DeleteOutgoing") s.Root.Store.SetContext(newCtx) @@ -9718,7 +9718,7 @@ func (s *OpenTracingLayerWebhookStore) DeleteOutgoing(webhookId string, time int }() defer span.Finish() - err := s.WebhookStore.DeleteOutgoing(webhookId, time) + err := s.WebhookStore.DeleteOutgoing(webhookID, time) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9745,7 +9745,7 @@ func (s *OpenTracingLayerWebhookStore) GetIncoming(id string, allowFromCache boo return result, err } -func (s *OpenTracingLayerWebhookStore) GetIncomingByChannel(channelId string) ([]*model.IncomingWebhook, error) { +func (s *OpenTracingLayerWebhookStore) GetIncomingByChannel(channelID string) ([]*model.IncomingWebhook, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "WebhookStore.GetIncomingByChannel") s.Root.Store.SetContext(newCtx) @@ -9754,7 +9754,7 @@ func (s *OpenTracingLayerWebhookStore) GetIncomingByChannel(channelId string) ([ }() defer span.Finish() - result, err := s.WebhookStore.GetIncomingByChannel(channelId) + result, err := s.WebhookStore.GetIncomingByChannel(channelID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9763,7 +9763,7 @@ func (s *OpenTracingLayerWebhookStore) GetIncomingByChannel(channelId string) ([ return result, err } -func (s *OpenTracingLayerWebhookStore) GetIncomingByTeam(teamId string, offset int, limit int) ([]*model.IncomingWebhook, error) { +func (s *OpenTracingLayerWebhookStore) GetIncomingByTeam(teamID string, offset int, limit int) ([]*model.IncomingWebhook, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "WebhookStore.GetIncomingByTeam") s.Root.Store.SetContext(newCtx) @@ -9772,7 +9772,7 @@ func (s *OpenTracingLayerWebhookStore) GetIncomingByTeam(teamId string, offset i }() defer span.Finish() - result, err := s.WebhookStore.GetIncomingByTeam(teamId, offset, limit) + result, err := s.WebhookStore.GetIncomingByTeam(teamID, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9781,7 +9781,7 @@ func (s *OpenTracingLayerWebhookStore) GetIncomingByTeam(teamId string, offset i return result, err } -func (s *OpenTracingLayerWebhookStore) GetIncomingByTeamByUser(teamId string, userId string, offset int, limit int) ([]*model.IncomingWebhook, error) { +func (s *OpenTracingLayerWebhookStore) GetIncomingByTeamByUser(teamID string, userId string, offset int, limit int) ([]*model.IncomingWebhook, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "WebhookStore.GetIncomingByTeamByUser") s.Root.Store.SetContext(newCtx) @@ -9790,7 +9790,7 @@ func (s *OpenTracingLayerWebhookStore) GetIncomingByTeamByUser(teamId string, us }() defer span.Finish() - result, err := s.WebhookStore.GetIncomingByTeamByUser(teamId, userId, offset, limit) + result, err := s.WebhookStore.GetIncomingByTeamByUser(teamID, userId, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9853,7 +9853,7 @@ func (s *OpenTracingLayerWebhookStore) GetOutgoing(id string) (*model.OutgoingWe return result, err } -func (s *OpenTracingLayerWebhookStore) GetOutgoingByChannel(channelId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { +func (s *OpenTracingLayerWebhookStore) GetOutgoingByChannel(channelID string, offset int, limit int) ([]*model.OutgoingWebhook, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "WebhookStore.GetOutgoingByChannel") s.Root.Store.SetContext(newCtx) @@ -9862,7 +9862,7 @@ func (s *OpenTracingLayerWebhookStore) GetOutgoingByChannel(channelId string, of }() defer span.Finish() - result, err := s.WebhookStore.GetOutgoingByChannel(channelId, offset, limit) + result, err := s.WebhookStore.GetOutgoingByChannel(channelID, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9871,7 +9871,7 @@ func (s *OpenTracingLayerWebhookStore) GetOutgoingByChannel(channelId string, of return result, err } -func (s *OpenTracingLayerWebhookStore) GetOutgoingByChannelByUser(channelId string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { +func (s *OpenTracingLayerWebhookStore) GetOutgoingByChannelByUser(channelID string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "WebhookStore.GetOutgoingByChannelByUser") s.Root.Store.SetContext(newCtx) @@ -9880,7 +9880,7 @@ func (s *OpenTracingLayerWebhookStore) GetOutgoingByChannelByUser(channelId stri }() defer span.Finish() - result, err := s.WebhookStore.GetOutgoingByChannelByUser(channelId, userId, offset, limit) + result, err := s.WebhookStore.GetOutgoingByChannelByUser(channelID, userId, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9889,7 +9889,7 @@ func (s *OpenTracingLayerWebhookStore) GetOutgoingByChannelByUser(channelId stri return result, err } -func (s *OpenTracingLayerWebhookStore) GetOutgoingByTeam(teamId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { +func (s *OpenTracingLayerWebhookStore) GetOutgoingByTeam(teamID string, offset int, limit int) ([]*model.OutgoingWebhook, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "WebhookStore.GetOutgoingByTeam") s.Root.Store.SetContext(newCtx) @@ -9898,7 +9898,7 @@ func (s *OpenTracingLayerWebhookStore) GetOutgoingByTeam(teamId string, offset i }() defer span.Finish() - result, err := s.WebhookStore.GetOutgoingByTeam(teamId, offset, limit) + result, err := s.WebhookStore.GetOutgoingByTeam(teamID, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9907,7 +9907,7 @@ func (s *OpenTracingLayerWebhookStore) GetOutgoingByTeam(teamId string, offset i return result, err } -func (s *OpenTracingLayerWebhookStore) GetOutgoingByTeamByUser(teamId string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { +func (s *OpenTracingLayerWebhookStore) GetOutgoingByTeamByUser(teamID string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "WebhookStore.GetOutgoingByTeamByUser") s.Root.Store.SetContext(newCtx) @@ -9916,7 +9916,7 @@ func (s *OpenTracingLayerWebhookStore) GetOutgoingByTeamByUser(teamId string, us }() defer span.Finish() - result, err := s.WebhookStore.GetOutgoingByTeamByUser(teamId, userId, offset, limit) + result, err := s.WebhookStore.GetOutgoingByTeamByUser(teamID, userId, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9974,7 +9974,7 @@ func (s *OpenTracingLayerWebhookStore) InvalidateWebhookCache(webhook string) { } -func (s *OpenTracingLayerWebhookStore) PermanentDeleteIncomingByChannel(channelId string) error { +func (s *OpenTracingLayerWebhookStore) PermanentDeleteIncomingByChannel(channelID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "WebhookStore.PermanentDeleteIncomingByChannel") s.Root.Store.SetContext(newCtx) @@ -9983,7 +9983,7 @@ func (s *OpenTracingLayerWebhookStore) PermanentDeleteIncomingByChannel(channelI }() defer span.Finish() - err := s.WebhookStore.PermanentDeleteIncomingByChannel(channelId) + err := s.WebhookStore.PermanentDeleteIncomingByChannel(channelID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -10010,7 +10010,7 @@ func (s *OpenTracingLayerWebhookStore) PermanentDeleteIncomingByUser(userId stri return err } -func (s *OpenTracingLayerWebhookStore) PermanentDeleteOutgoingByChannel(channelId string) error { +func (s *OpenTracingLayerWebhookStore) PermanentDeleteOutgoingByChannel(channelID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "WebhookStore.PermanentDeleteOutgoingByChannel") s.Root.Store.SetContext(newCtx) @@ -10019,7 +10019,7 @@ func (s *OpenTracingLayerWebhookStore) PermanentDeleteOutgoingByChannel(channelI }() defer span.Finish() - err := s.WebhookStore.PermanentDeleteOutgoingByChannel(channelId) + err := s.WebhookStore.PermanentDeleteOutgoingByChannel(channelID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) diff --git a/store/retrylayer/retrylayer.go b/store/retrylayer/retrylayer.go index 897db52e8a..00e23e9485 100644 --- a/store/retrylayer/retrylayer.go +++ b/store/retrylayer/retrylayer.go @@ -538,11 +538,11 @@ func (s *RetryLayerBotStore) Update(bot *model.Bot) (*model.Bot, error) { } -func (s *RetryLayerChannelStore) AnalyticsDeletedTypeCount(teamId string, channelType string) (int64, error) { +func (s *RetryLayerChannelStore) AnalyticsDeletedTypeCount(teamID string, channelType string) (int64, error) { tries := 0 for { - result, err := s.ChannelStore.AnalyticsDeletedTypeCount(teamId, channelType) + result, err := s.ChannelStore.AnalyticsDeletedTypeCount(teamID, channelType) if err == nil { return result, nil } @@ -558,11 +558,11 @@ func (s *RetryLayerChannelStore) AnalyticsDeletedTypeCount(teamId string, channe } -func (s *RetryLayerChannelStore) AnalyticsTypeCount(teamId string, channelType string) (int64, error) { +func (s *RetryLayerChannelStore) AnalyticsTypeCount(teamID string, channelType string) (int64, error) { tries := 0 for { - result, err := s.ChannelStore.AnalyticsTypeCount(teamId, channelType) + result, err := s.ChannelStore.AnalyticsTypeCount(teamID, channelType) if err == nil { return result, nil } @@ -578,11 +578,11 @@ func (s *RetryLayerChannelStore) AnalyticsTypeCount(teamId string, channelType s } -func (s *RetryLayerChannelStore) AutocompleteInTeam(teamId string, term string, includeDeleted bool) (*model.ChannelList, error) { +func (s *RetryLayerChannelStore) AutocompleteInTeam(teamID string, term string, includeDeleted bool) (*model.ChannelList, error) { tries := 0 for { - result, err := s.ChannelStore.AutocompleteInTeam(teamId, term, includeDeleted) + result, err := s.ChannelStore.AutocompleteInTeam(teamID, term, includeDeleted) if err == nil { return result, nil } @@ -598,11 +598,11 @@ func (s *RetryLayerChannelStore) AutocompleteInTeam(teamId string, term string, } -func (s *RetryLayerChannelStore) AutocompleteInTeamForSearch(teamId string, userId string, term string, includeDeleted bool) (*model.ChannelList, error) { +func (s *RetryLayerChannelStore) AutocompleteInTeamForSearch(teamID string, userId string, term string, includeDeleted bool) (*model.ChannelList, error) { tries := 0 for { - result, err := s.ChannelStore.AutocompleteInTeamForSearch(teamId, userId, term, includeDeleted) + result, err := s.ChannelStore.AutocompleteInTeamForSearch(teamID, userId, term, includeDeleted) if err == nil { return result, nil } @@ -644,11 +644,11 @@ func (s *RetryLayerChannelStore) ClearCaches() { } -func (s *RetryLayerChannelStore) ClearSidebarOnTeamLeave(userId string, teamId string) error { +func (s *RetryLayerChannelStore) ClearSidebarOnTeamLeave(userId string, teamID string) error { tries := 0 for { - err := s.ChannelStore.ClearSidebarOnTeamLeave(userId, teamId) + err := s.ChannelStore.ClearSidebarOnTeamLeave(userId, teamID) if err == nil { return nil } @@ -664,11 +664,11 @@ func (s *RetryLayerChannelStore) ClearSidebarOnTeamLeave(userId string, teamId s } -func (s *RetryLayerChannelStore) CountPostsAfter(channelId string, timestamp int64, userId string) (int, error) { +func (s *RetryLayerChannelStore) CountPostsAfter(channelID string, timestamp int64, userId string) (int, error) { tries := 0 for { - result, err := s.ChannelStore.CountPostsAfter(channelId, timestamp, userId) + result, err := s.ChannelStore.CountPostsAfter(channelID, timestamp, userId) if err == nil { return result, nil } @@ -704,11 +704,11 @@ func (s *RetryLayerChannelStore) CreateDirectChannel(userId *model.User, otherUs } -func (s *RetryLayerChannelStore) CreateInitialSidebarCategories(userId string, teamId string) error { +func (s *RetryLayerChannelStore) CreateInitialSidebarCategories(userId string, teamID string) error { tries := 0 for { - err := s.ChannelStore.CreateInitialSidebarCategories(userId, teamId) + err := s.ChannelStore.CreateInitialSidebarCategories(userId, teamID) if err == nil { return nil } @@ -724,11 +724,11 @@ func (s *RetryLayerChannelStore) CreateInitialSidebarCategories(userId string, t } -func (s *RetryLayerChannelStore) CreateSidebarCategory(userId string, teamId string, newCategory *model.SidebarCategoryWithChannels) (*model.SidebarCategoryWithChannels, error) { +func (s *RetryLayerChannelStore) CreateSidebarCategory(userId string, teamID string, newCategory *model.SidebarCategoryWithChannels) (*model.SidebarCategoryWithChannels, error) { tries := 0 for { - result, err := s.ChannelStore.CreateSidebarCategory(userId, teamId, newCategory) + result, err := s.ChannelStore.CreateSidebarCategory(userId, teamID, newCategory) if err == nil { return result, nil } @@ -744,11 +744,11 @@ func (s *RetryLayerChannelStore) CreateSidebarCategory(userId string, teamId str } -func (s *RetryLayerChannelStore) Delete(channelId string, time int64) error { +func (s *RetryLayerChannelStore) Delete(channelID string, time int64) error { tries := 0 for { - err := s.ChannelStore.Delete(channelId, time) + err := s.ChannelStore.Delete(channelID, time) if err == nil { return nil } @@ -764,11 +764,11 @@ func (s *RetryLayerChannelStore) Delete(channelId string, time int64) error { } -func (s *RetryLayerChannelStore) DeleteSidebarCategory(categoryId string) error { +func (s *RetryLayerChannelStore) DeleteSidebarCategory(categoryID string) error { tries := 0 for { - err := s.ChannelStore.DeleteSidebarCategory(categoryId) + err := s.ChannelStore.DeleteSidebarCategory(categoryID) if err == nil { return nil } @@ -824,11 +824,11 @@ func (s *RetryLayerChannelStore) Get(id string, allowFromCache bool) (*model.Cha } -func (s *RetryLayerChannelStore) GetAll(teamId string) ([]*model.Channel, error) { +func (s *RetryLayerChannelStore) GetAll(teamID string) ([]*model.Channel, error) { tries := 0 for { - result, err := s.ChannelStore.GetAll(teamId) + result, err := s.ChannelStore.GetAll(teamID) if err == nil { return result, nil } @@ -864,11 +864,11 @@ func (s *RetryLayerChannelStore) GetAllChannelMembersForUser(userId string, allo } -func (s *RetryLayerChannelStore) GetAllChannelMembersNotifyPropsForChannel(channelId string, allowFromCache bool) (map[string]model.StringMap, error) { +func (s *RetryLayerChannelStore) GetAllChannelMembersNotifyPropsForChannel(channelID string, allowFromCache bool) (map[string]model.StringMap, error) { tries := 0 for { - result, err := s.ChannelStore.GetAllChannelMembersNotifyPropsForChannel(channelId, allowFromCache) + result, err := s.ChannelStore.GetAllChannelMembersNotifyPropsForChannel(channelID, allowFromCache) if err == nil { return result, nil } @@ -924,11 +924,11 @@ func (s *RetryLayerChannelStore) GetAllChannelsCount(opts store.ChannelSearchOpt } -func (s *RetryLayerChannelStore) GetAllChannelsForExportAfter(limit int, afterId string) ([]*model.ChannelForExport, error) { +func (s *RetryLayerChannelStore) GetAllChannelsForExportAfter(limit int, afterID string) ([]*model.ChannelForExport, error) { tries := 0 for { - result, err := s.ChannelStore.GetAllChannelsForExportAfter(limit, afterId) + result, err := s.ChannelStore.GetAllChannelsForExportAfter(limit, afterID) if err == nil { return result, nil } @@ -944,11 +944,11 @@ func (s *RetryLayerChannelStore) GetAllChannelsForExportAfter(limit int, afterId } -func (s *RetryLayerChannelStore) GetAllDirectChannelsForExportAfter(limit int, afterId string) ([]*model.DirectChannelForExport, error) { +func (s *RetryLayerChannelStore) GetAllDirectChannelsForExportAfter(limit int, afterID string) ([]*model.DirectChannelForExport, error) { tries := 0 for { - result, err := s.ChannelStore.GetAllDirectChannelsForExportAfter(limit, afterId) + result, err := s.ChannelStore.GetAllDirectChannelsForExportAfter(limit, afterID) if err == nil { return result, nil } @@ -1024,11 +1024,11 @@ func (s *RetryLayerChannelStore) GetByNames(team_id string, names []string, allo } -func (s *RetryLayerChannelStore) GetChannelCounts(teamId string, userId string) (*model.ChannelCounts, error) { +func (s *RetryLayerChannelStore) GetChannelCounts(teamID string, userId string) (*model.ChannelCounts, error) { tries := 0 for { - result, err := s.ChannelStore.GetChannelCounts(teamId, userId) + result, err := s.ChannelStore.GetChannelCounts(teamID, userId) if err == nil { return result, nil } @@ -1044,11 +1044,11 @@ func (s *RetryLayerChannelStore) GetChannelCounts(teamId string, userId string) } -func (s *RetryLayerChannelStore) GetChannelMembersForExport(userId string, teamId string) ([]*model.ChannelMemberForExport, error) { +func (s *RetryLayerChannelStore) GetChannelMembersForExport(userId string, teamID string) ([]*model.ChannelMemberForExport, error) { tries := 0 for { - result, err := s.ChannelStore.GetChannelMembersForExport(userId, teamId) + result, err := s.ChannelStore.GetChannelMembersForExport(userId, teamID) if err == nil { return result, nil } @@ -1064,11 +1064,11 @@ func (s *RetryLayerChannelStore) GetChannelMembersForExport(userId string, teamI } -func (s *RetryLayerChannelStore) GetChannelMembersTimezones(channelId string) ([]model.StringMap, error) { +func (s *RetryLayerChannelStore) GetChannelMembersTimezones(channelID string) ([]model.StringMap, error) { tries := 0 for { - result, err := s.ChannelStore.GetChannelMembersTimezones(channelId) + result, err := s.ChannelStore.GetChannelMembersTimezones(channelID) if err == nil { return result, nil } @@ -1084,11 +1084,11 @@ func (s *RetryLayerChannelStore) GetChannelMembersTimezones(channelId string) ([ } -func (s *RetryLayerChannelStore) GetChannelUnread(channelId string, userId string) (*model.ChannelUnread, error) { +func (s *RetryLayerChannelStore) GetChannelUnread(channelID string, userId string) (*model.ChannelUnread, error) { tries := 0 for { - result, err := s.ChannelStore.GetChannelUnread(channelId, userId) + result, err := s.ChannelStore.GetChannelUnread(channelID, userId) if err == nil { return result, nil } @@ -1104,11 +1104,11 @@ func (s *RetryLayerChannelStore) GetChannelUnread(channelId string, userId strin } -func (s *RetryLayerChannelStore) GetChannels(teamId string, userId string, includeDeleted bool, lastDeleteAt int) (*model.ChannelList, error) { +func (s *RetryLayerChannelStore) GetChannels(teamID string, userId string, includeDeleted bool, lastDeleteAt int) (*model.ChannelList, error) { tries := 0 for { - result, err := s.ChannelStore.GetChannels(teamId, userId, includeDeleted, lastDeleteAt) + result, err := s.ChannelStore.GetChannels(teamID, userId, includeDeleted, lastDeleteAt) if err == nil { return result, nil } @@ -1164,11 +1164,11 @@ func (s *RetryLayerChannelStore) GetChannelsByIds(channelIds []string, includeDe } -func (s *RetryLayerChannelStore) GetChannelsByScheme(schemeId string, offset int, limit int) (model.ChannelList, error) { +func (s *RetryLayerChannelStore) GetChannelsByScheme(schemeID string, offset int, limit int) (model.ChannelList, error) { tries := 0 for { - result, err := s.ChannelStore.GetChannelsByScheme(schemeId, offset, limit) + result, err := s.ChannelStore.GetChannelsByScheme(schemeID, offset, limit) if err == nil { return result, nil } @@ -1224,11 +1224,11 @@ func (s *RetryLayerChannelStore) GetDeletedByName(team_id string, name string) ( } -func (s *RetryLayerChannelStore) GetForPost(postId string) (*model.Channel, error) { +func (s *RetryLayerChannelStore) GetForPost(postID string) (*model.Channel, error) { tries := 0 for { - result, err := s.ChannelStore.GetForPost(postId) + result, err := s.ChannelStore.GetForPost(postID) if err == nil { return result, nil } @@ -1264,11 +1264,11 @@ func (s *RetryLayerChannelStore) GetFromMaster(id string) (*model.Channel, error } -func (s *RetryLayerChannelStore) GetGuestCount(channelId string, allowFromCache bool) (int64, error) { +func (s *RetryLayerChannelStore) GetGuestCount(channelID string, allowFromCache bool) (int64, error) { tries := 0 for { - result, err := s.ChannelStore.GetGuestCount(channelId, allowFromCache) + result, err := s.ChannelStore.GetGuestCount(channelID, allowFromCache) if err == nil { return result, nil } @@ -1284,11 +1284,11 @@ func (s *RetryLayerChannelStore) GetGuestCount(channelId string, allowFromCache } -func (s *RetryLayerChannelStore) GetMember(channelId string, userId string) (*model.ChannelMember, error) { +func (s *RetryLayerChannelStore) GetMember(channelID string, userId string) (*model.ChannelMember, error) { tries := 0 for { - result, err := s.ChannelStore.GetMember(channelId, userId) + result, err := s.ChannelStore.GetMember(channelID, userId) if err == nil { return result, nil } @@ -1304,11 +1304,11 @@ func (s *RetryLayerChannelStore) GetMember(channelId string, userId string) (*mo } -func (s *RetryLayerChannelStore) GetMemberCount(channelId string, allowFromCache bool) (int64, error) { +func (s *RetryLayerChannelStore) GetMemberCount(channelID string, allowFromCache bool) (int64, error) { tries := 0 for { - result, err := s.ChannelStore.GetMemberCount(channelId, allowFromCache) + result, err := s.ChannelStore.GetMemberCount(channelID, allowFromCache) if err == nil { return result, nil } @@ -1324,9 +1324,9 @@ func (s *RetryLayerChannelStore) GetMemberCount(channelId string, allowFromCache } -func (s *RetryLayerChannelStore) GetMemberCountFromCache(channelId string) int64 { +func (s *RetryLayerChannelStore) GetMemberCountFromCache(channelID string) int64 { - return s.ChannelStore.GetMemberCountFromCache(channelId) + return s.ChannelStore.GetMemberCountFromCache(channelID) } @@ -1350,11 +1350,11 @@ func (s *RetryLayerChannelStore) GetMemberCountsByGroup(channelID string, includ } -func (s *RetryLayerChannelStore) GetMemberForPost(postId string, userId string) (*model.ChannelMember, error) { +func (s *RetryLayerChannelStore) GetMemberForPost(postID string, userId string) (*model.ChannelMember, error) { tries := 0 for { - result, err := s.ChannelStore.GetMemberForPost(postId, userId) + result, err := s.ChannelStore.GetMemberForPost(postID, userId) if err == nil { return result, nil } @@ -1370,11 +1370,11 @@ func (s *RetryLayerChannelStore) GetMemberForPost(postId string, userId string) } -func (s *RetryLayerChannelStore) GetMembers(channelId string, offset int, limit int) (*model.ChannelMembers, error) { +func (s *RetryLayerChannelStore) GetMembers(channelID string, offset int, limit int) (*model.ChannelMembers, error) { tries := 0 for { - result, err := s.ChannelStore.GetMembers(channelId, offset, limit) + result, err := s.ChannelStore.GetMembers(channelID, offset, limit) if err == nil { return result, nil } @@ -1410,11 +1410,11 @@ func (s *RetryLayerChannelStore) GetMembersByChannelIds(channelIds []string, use } -func (s *RetryLayerChannelStore) GetMembersByIds(channelId string, userIds []string) (*model.ChannelMembers, error) { +func (s *RetryLayerChannelStore) GetMembersByIds(channelID string, userIds []string) (*model.ChannelMembers, error) { tries := 0 for { - result, err := s.ChannelStore.GetMembersByIds(channelId, userIds) + result, err := s.ChannelStore.GetMembersByIds(channelID, userIds) if err == nil { return result, nil } @@ -1430,11 +1430,11 @@ func (s *RetryLayerChannelStore) GetMembersByIds(channelId string, userIds []str } -func (s *RetryLayerChannelStore) GetMembersForUser(teamId string, userId string) (*model.ChannelMembers, error) { +func (s *RetryLayerChannelStore) GetMembersForUser(teamID string, userId string) (*model.ChannelMembers, error) { tries := 0 for { - result, err := s.ChannelStore.GetMembersForUser(teamId, userId) + result, err := s.ChannelStore.GetMembersForUser(teamID, userId) if err == nil { return result, nil } @@ -1450,11 +1450,11 @@ func (s *RetryLayerChannelStore) GetMembersForUser(teamId string, userId string) } -func (s *RetryLayerChannelStore) GetMembersForUserWithPagination(teamId string, userId string, page int, perPage int) (*model.ChannelMembers, error) { +func (s *RetryLayerChannelStore) GetMembersForUserWithPagination(teamID string, userId string, page int, perPage int) (*model.ChannelMembers, error) { tries := 0 for { - result, err := s.ChannelStore.GetMembersForUserWithPagination(teamId, userId, page, perPage) + result, err := s.ChannelStore.GetMembersForUserWithPagination(teamID, userId, page, perPage) if err == nil { return result, nil } @@ -1470,11 +1470,11 @@ func (s *RetryLayerChannelStore) GetMembersForUserWithPagination(teamId string, } -func (s *RetryLayerChannelStore) GetMoreChannels(teamId string, userId string, offset int, limit int) (*model.ChannelList, error) { +func (s *RetryLayerChannelStore) GetMoreChannels(teamID string, userId string, offset int, limit int) (*model.ChannelList, error) { tries := 0 for { - result, err := s.ChannelStore.GetMoreChannels(teamId, userId, offset, limit) + result, err := s.ChannelStore.GetMoreChannels(teamID, userId, offset, limit) if err == nil { return result, nil } @@ -1490,11 +1490,11 @@ func (s *RetryLayerChannelStore) GetMoreChannels(teamId string, userId string, o } -func (s *RetryLayerChannelStore) GetPinnedPostCount(channelId string, allowFromCache bool) (int64, error) { +func (s *RetryLayerChannelStore) GetPinnedPostCount(channelID string, allowFromCache bool) (int64, error) { tries := 0 for { - result, err := s.ChannelStore.GetPinnedPostCount(channelId, allowFromCache) + result, err := s.ChannelStore.GetPinnedPostCount(channelID, allowFromCache) if err == nil { return result, nil } @@ -1510,11 +1510,11 @@ func (s *RetryLayerChannelStore) GetPinnedPostCount(channelId string, allowFromC } -func (s *RetryLayerChannelStore) GetPinnedPosts(channelId string) (*model.PostList, error) { +func (s *RetryLayerChannelStore) GetPinnedPosts(channelID string) (*model.PostList, error) { tries := 0 for { - result, err := s.ChannelStore.GetPinnedPosts(channelId) + result, err := s.ChannelStore.GetPinnedPosts(channelID) if err == nil { return result, nil } @@ -1530,11 +1530,11 @@ func (s *RetryLayerChannelStore) GetPinnedPosts(channelId string) (*model.PostLi } -func (s *RetryLayerChannelStore) GetPrivateChannelsForTeam(teamId string, offset int, limit int) (*model.ChannelList, error) { +func (s *RetryLayerChannelStore) GetPrivateChannelsForTeam(teamID string, offset int, limit int) (*model.ChannelList, error) { tries := 0 for { - result, err := s.ChannelStore.GetPrivateChannelsForTeam(teamId, offset, limit) + result, err := s.ChannelStore.GetPrivateChannelsForTeam(teamID, offset, limit) if err == nil { return result, nil } @@ -1550,11 +1550,11 @@ func (s *RetryLayerChannelStore) GetPrivateChannelsForTeam(teamId string, offset } -func (s *RetryLayerChannelStore) GetPublicChannelsByIdsForTeam(teamId string, channelIds []string) (*model.ChannelList, error) { +func (s *RetryLayerChannelStore) GetPublicChannelsByIdsForTeam(teamID string, channelIds []string) (*model.ChannelList, error) { tries := 0 for { - result, err := s.ChannelStore.GetPublicChannelsByIdsForTeam(teamId, channelIds) + result, err := s.ChannelStore.GetPublicChannelsByIdsForTeam(teamID, channelIds) if err == nil { return result, nil } @@ -1570,11 +1570,11 @@ func (s *RetryLayerChannelStore) GetPublicChannelsByIdsForTeam(teamId string, ch } -func (s *RetryLayerChannelStore) GetPublicChannelsForTeam(teamId string, offset int, limit int) (*model.ChannelList, error) { +func (s *RetryLayerChannelStore) GetPublicChannelsForTeam(teamID string, offset int, limit int) (*model.ChannelList, error) { tries := 0 for { - result, err := s.ChannelStore.GetPublicChannelsForTeam(teamId, offset, limit) + result, err := s.ChannelStore.GetPublicChannelsForTeam(teamID, offset, limit) if err == nil { return result, nil } @@ -1590,11 +1590,11 @@ func (s *RetryLayerChannelStore) GetPublicChannelsForTeam(teamId string, offset } -func (s *RetryLayerChannelStore) GetSidebarCategories(userId string, teamId string) (*model.OrderedSidebarCategories, error) { +func (s *RetryLayerChannelStore) GetSidebarCategories(userId string, teamID string) (*model.OrderedSidebarCategories, error) { tries := 0 for { - result, err := s.ChannelStore.GetSidebarCategories(userId, teamId) + result, err := s.ChannelStore.GetSidebarCategories(userId, teamID) if err == nil { return result, nil } @@ -1610,11 +1610,11 @@ func (s *RetryLayerChannelStore) GetSidebarCategories(userId string, teamId stri } -func (s *RetryLayerChannelStore) GetSidebarCategory(categoryId string) (*model.SidebarCategoryWithChannels, error) { +func (s *RetryLayerChannelStore) GetSidebarCategory(categoryID string) (*model.SidebarCategoryWithChannels, error) { tries := 0 for { - result, err := s.ChannelStore.GetSidebarCategory(categoryId) + result, err := s.ChannelStore.GetSidebarCategory(categoryID) if err == nil { return result, nil } @@ -1630,11 +1630,11 @@ func (s *RetryLayerChannelStore) GetSidebarCategory(categoryId string) (*model.S } -func (s *RetryLayerChannelStore) GetSidebarCategoryOrder(userId string, teamId string) ([]string, error) { +func (s *RetryLayerChannelStore) GetSidebarCategoryOrder(userId string, teamID string) ([]string, error) { tries := 0 for { - result, err := s.ChannelStore.GetSidebarCategoryOrder(userId, teamId) + result, err := s.ChannelStore.GetSidebarCategoryOrder(userId, teamID) if err == nil { return result, nil } @@ -1650,11 +1650,11 @@ func (s *RetryLayerChannelStore) GetSidebarCategoryOrder(userId string, teamId s } -func (s *RetryLayerChannelStore) GetTeamChannels(teamId string) (*model.ChannelList, error) { +func (s *RetryLayerChannelStore) GetTeamChannels(teamID string) (*model.ChannelList, error) { tries := 0 for { - result, err := s.ChannelStore.GetTeamChannels(teamId) + result, err := s.ChannelStore.GetTeamChannels(teamID) if err == nil { return result, nil } @@ -1690,11 +1690,11 @@ func (s *RetryLayerChannelStore) GroupSyncedChannelCount() (int64, error) { } -func (s *RetryLayerChannelStore) IncrementMentionCount(channelId string, userId string, updateThreads bool) error { +func (s *RetryLayerChannelStore) IncrementMentionCount(channelID string, userId string, updateThreads bool) error { tries := 0 for { - err := s.ChannelStore.IncrementMentionCount(channelId, userId, updateThreads) + err := s.ChannelStore.IncrementMentionCount(channelID, userId, updateThreads) if err == nil { return nil } @@ -1716,9 +1716,9 @@ func (s *RetryLayerChannelStore) InvalidateAllChannelMembersForUser(userId strin } -func (s *RetryLayerChannelStore) InvalidateCacheForChannelMembersNotifyProps(channelId string) { +func (s *RetryLayerChannelStore) InvalidateCacheForChannelMembersNotifyProps(channelID string) { - s.ChannelStore.InvalidateCacheForChannelMembersNotifyProps(channelId) + s.ChannelStore.InvalidateCacheForChannelMembersNotifyProps(channelID) } @@ -1728,33 +1728,33 @@ func (s *RetryLayerChannelStore) InvalidateChannel(id string) { } -func (s *RetryLayerChannelStore) InvalidateChannelByName(teamId string, name string) { +func (s *RetryLayerChannelStore) InvalidateChannelByName(teamID string, name string) { - s.ChannelStore.InvalidateChannelByName(teamId, name) + s.ChannelStore.InvalidateChannelByName(teamID, name) } -func (s *RetryLayerChannelStore) InvalidateGuestCount(channelId string) { +func (s *RetryLayerChannelStore) InvalidateGuestCount(channelID string) { - s.ChannelStore.InvalidateGuestCount(channelId) + s.ChannelStore.InvalidateGuestCount(channelID) } -func (s *RetryLayerChannelStore) InvalidateMemberCount(channelId string) { +func (s *RetryLayerChannelStore) InvalidateMemberCount(channelID string) { - s.ChannelStore.InvalidateMemberCount(channelId) + s.ChannelStore.InvalidateMemberCount(channelID) } -func (s *RetryLayerChannelStore) InvalidatePinnedPostCount(channelId string) { +func (s *RetryLayerChannelStore) InvalidatePinnedPostCount(channelID string) { - s.ChannelStore.InvalidatePinnedPostCount(channelId) + s.ChannelStore.InvalidatePinnedPostCount(channelID) } -func (s *RetryLayerChannelStore) IsUserInChannelUseCache(userId string, channelId string) bool { +func (s *RetryLayerChannelStore) IsUserInChannelUseCache(userId string, channelID string) bool { - return s.ChannelStore.IsUserInChannelUseCache(userId, channelId) + return s.ChannelStore.IsUserInChannelUseCache(userId, channelID) } @@ -1798,11 +1798,11 @@ func (s *RetryLayerChannelStore) MigratePublicChannels() error { } -func (s *RetryLayerChannelStore) PermanentDelete(channelId string) error { +func (s *RetryLayerChannelStore) PermanentDelete(channelID string) error { tries := 0 for { - err := s.ChannelStore.PermanentDelete(channelId) + err := s.ChannelStore.PermanentDelete(channelID) if err == nil { return nil } @@ -1818,11 +1818,11 @@ func (s *RetryLayerChannelStore) PermanentDelete(channelId string) error { } -func (s *RetryLayerChannelStore) PermanentDeleteByTeam(teamId string) error { +func (s *RetryLayerChannelStore) PermanentDeleteByTeam(teamID string) error { tries := 0 for { - err := s.ChannelStore.PermanentDeleteByTeam(teamId) + err := s.ChannelStore.PermanentDeleteByTeam(teamID) if err == nil { return nil } @@ -1838,11 +1838,11 @@ func (s *RetryLayerChannelStore) PermanentDeleteByTeam(teamId string) error { } -func (s *RetryLayerChannelStore) PermanentDeleteMembersByChannel(channelId string) error { +func (s *RetryLayerChannelStore) PermanentDeleteMembersByChannel(channelID string) error { tries := 0 for { - err := s.ChannelStore.PermanentDeleteMembersByChannel(channelId) + err := s.ChannelStore.PermanentDeleteMembersByChannel(channelID) if err == nil { return nil } @@ -1878,11 +1878,11 @@ func (s *RetryLayerChannelStore) PermanentDeleteMembersByUser(userId string) err } -func (s *RetryLayerChannelStore) RemoveAllDeactivatedMembers(channelId string) error { +func (s *RetryLayerChannelStore) RemoveAllDeactivatedMembers(channelID string) error { tries := 0 for { - err := s.ChannelStore.RemoveAllDeactivatedMembers(channelId) + err := s.ChannelStore.RemoveAllDeactivatedMembers(channelID) if err == nil { return nil } @@ -1898,11 +1898,11 @@ func (s *RetryLayerChannelStore) RemoveAllDeactivatedMembers(channelId string) e } -func (s *RetryLayerChannelStore) RemoveMember(channelId string, userId string) error { +func (s *RetryLayerChannelStore) RemoveMember(channelID string, userId string) error { tries := 0 for { - err := s.ChannelStore.RemoveMember(channelId, userId) + err := s.ChannelStore.RemoveMember(channelID, userId) if err == nil { return nil } @@ -1918,11 +1918,11 @@ func (s *RetryLayerChannelStore) RemoveMember(channelId string, userId string) e } -func (s *RetryLayerChannelStore) RemoveMembers(channelId string, userIds []string) error { +func (s *RetryLayerChannelStore) RemoveMembers(channelID string, userIds []string) error { tries := 0 for { - err := s.ChannelStore.RemoveMembers(channelId, userIds) + err := s.ChannelStore.RemoveMembers(channelID, userIds) if err == nil { return nil } @@ -1958,11 +1958,11 @@ func (s *RetryLayerChannelStore) ResetAllChannelSchemes() error { } -func (s *RetryLayerChannelStore) Restore(channelId string, time int64) error { +func (s *RetryLayerChannelStore) Restore(channelID string, time int64) error { tries := 0 for { - err := s.ChannelStore.Restore(channelId, time) + err := s.ChannelStore.Restore(channelID, time) if err == nil { return nil } @@ -2078,11 +2078,11 @@ func (s *RetryLayerChannelStore) SearchAllChannels(term string, opts store.Chann } -func (s *RetryLayerChannelStore) SearchArchivedInTeam(teamId string, term string, userId string) (*model.ChannelList, error) { +func (s *RetryLayerChannelStore) SearchArchivedInTeam(teamID string, term string, userId string) (*model.ChannelList, error) { tries := 0 for { - result, err := s.ChannelStore.SearchArchivedInTeam(teamId, term, userId) + result, err := s.ChannelStore.SearchArchivedInTeam(teamID, term, userId) if err == nil { return result, nil } @@ -2098,11 +2098,11 @@ func (s *RetryLayerChannelStore) SearchArchivedInTeam(teamId string, term string } -func (s *RetryLayerChannelStore) SearchForUserInTeam(userId string, teamId string, term string, includeDeleted bool) (*model.ChannelList, error) { +func (s *RetryLayerChannelStore) SearchForUserInTeam(userId string, teamID string, term string, includeDeleted bool) (*model.ChannelList, error) { tries := 0 for { - result, err := s.ChannelStore.SearchForUserInTeam(userId, teamId, term, includeDeleted) + result, err := s.ChannelStore.SearchForUserInTeam(userId, teamID, term, includeDeleted) if err == nil { return result, nil } @@ -2138,11 +2138,11 @@ func (s *RetryLayerChannelStore) SearchGroupChannels(userId string, term string) } -func (s *RetryLayerChannelStore) SearchInTeam(teamId string, term string, includeDeleted bool) (*model.ChannelList, error) { +func (s *RetryLayerChannelStore) SearchInTeam(teamID string, term string, includeDeleted bool) (*model.ChannelList, error) { tries := 0 for { - result, err := s.ChannelStore.SearchInTeam(teamId, term, includeDeleted) + result, err := s.ChannelStore.SearchInTeam(teamID, term, includeDeleted) if err == nil { return result, nil } @@ -2158,11 +2158,11 @@ func (s *RetryLayerChannelStore) SearchInTeam(teamId string, term string, includ } -func (s *RetryLayerChannelStore) SearchMore(userId string, teamId string, term string) (*model.ChannelList, error) { +func (s *RetryLayerChannelStore) SearchMore(userId string, teamID string, term string) (*model.ChannelList, error) { tries := 0 for { - result, err := s.ChannelStore.SearchMore(userId, teamId, term) + result, err := s.ChannelStore.SearchMore(userId, teamID, term) if err == nil { return result, nil } @@ -2178,11 +2178,11 @@ func (s *RetryLayerChannelStore) SearchMore(userId string, teamId string, term s } -func (s *RetryLayerChannelStore) SetDeleteAt(channelId string, deleteAt int64, updateAt int64) error { +func (s *RetryLayerChannelStore) SetDeleteAt(channelID string, deleteAt int64, updateAt int64) error { tries := 0 for { - err := s.ChannelStore.SetDeleteAt(channelId, deleteAt, updateAt) + err := s.ChannelStore.SetDeleteAt(channelID, deleteAt, updateAt) if err == nil { return nil } @@ -2318,11 +2318,11 @@ func (s *RetryLayerChannelStore) UpdateMultipleMembers(members []*model.ChannelM } -func (s *RetryLayerChannelStore) UpdateSidebarCategories(userId string, teamId string, categories []*model.SidebarCategoryWithChannels) ([]*model.SidebarCategoryWithChannels, []*model.SidebarCategoryWithChannels, error) { +func (s *RetryLayerChannelStore) UpdateSidebarCategories(userId string, teamID string, categories []*model.SidebarCategoryWithChannels) ([]*model.SidebarCategoryWithChannels, []*model.SidebarCategoryWithChannels, error) { tries := 0 for { - result, resultVar1, err := s.ChannelStore.UpdateSidebarCategories(userId, teamId, categories) + result, resultVar1, err := s.ChannelStore.UpdateSidebarCategories(userId, teamID, categories) if err == nil { return result, resultVar1, nil } @@ -2338,11 +2338,11 @@ func (s *RetryLayerChannelStore) UpdateSidebarCategories(userId string, teamId s } -func (s *RetryLayerChannelStore) UpdateSidebarCategoryOrder(userId string, teamId string, categoryOrder []string) error { +func (s *RetryLayerChannelStore) UpdateSidebarCategoryOrder(userId string, teamID string, categoryOrder []string) error { tries := 0 for { - err := s.ChannelStore.UpdateSidebarCategoryOrder(userId, teamId, categoryOrder) + err := s.ChannelStore.UpdateSidebarCategoryOrder(userId, teamID, categoryOrder) if err == nil { return nil } @@ -2358,11 +2358,11 @@ func (s *RetryLayerChannelStore) UpdateSidebarCategoryOrder(userId string, teamI } -func (s *RetryLayerChannelStore) UpdateSidebarChannelCategoryOnMove(channel *model.Channel, newTeamId string) error { +func (s *RetryLayerChannelStore) UpdateSidebarChannelCategoryOnMove(channel *model.Channel, newTeamID string) error { tries := 0 for { - err := s.ChannelStore.UpdateSidebarChannelCategoryOnMove(channel, newTeamId) + err := s.ChannelStore.UpdateSidebarChannelCategoryOnMove(channel, newTeamID) if err == nil { return nil } @@ -2418,11 +2418,11 @@ func (s *RetryLayerChannelStore) UserBelongsToChannels(userId string, channelIds } -func (s *RetryLayerChannelMemberHistoryStore) GetUsersInChannelDuring(startTime int64, endTime int64, channelId string) ([]*model.ChannelMemberHistoryResult, error) { +func (s *RetryLayerChannelMemberHistoryStore) GetUsersInChannelDuring(startTime int64, endTime int64, channelID string) ([]*model.ChannelMemberHistoryResult, error) { tries := 0 for { - result, err := s.ChannelMemberHistoryStore.GetUsersInChannelDuring(startTime, endTime, channelId) + result, err := s.ChannelMemberHistoryStore.GetUsersInChannelDuring(startTime, endTime, channelID) if err == nil { return result, nil } @@ -2438,11 +2438,11 @@ func (s *RetryLayerChannelMemberHistoryStore) GetUsersInChannelDuring(startTime } -func (s *RetryLayerChannelMemberHistoryStore) LogJoinEvent(userId string, channelId string, joinTime int64) error { +func (s *RetryLayerChannelMemberHistoryStore) LogJoinEvent(userId string, channelID string, joinTime int64) error { tries := 0 for { - err := s.ChannelMemberHistoryStore.LogJoinEvent(userId, channelId, joinTime) + err := s.ChannelMemberHistoryStore.LogJoinEvent(userId, channelID, joinTime) if err == nil { return nil } @@ -2458,11 +2458,11 @@ func (s *RetryLayerChannelMemberHistoryStore) LogJoinEvent(userId string, channe } -func (s *RetryLayerChannelMemberHistoryStore) LogLeaveEvent(userId string, channelId string, leaveTime int64) error { +func (s *RetryLayerChannelMemberHistoryStore) LogLeaveEvent(userId string, channelID string, leaveTime int64) error { tries := 0 for { - err := s.ChannelMemberHistoryStore.LogLeaveEvent(userId, channelId, leaveTime) + err := s.ChannelMemberHistoryStore.LogLeaveEvent(userId, channelID, leaveTime) if err == nil { return nil } @@ -2618,11 +2618,11 @@ func (s *RetryLayerClusterDiscoveryStore) SetLastPingAt(discovery *model.Cluster } -func (s *RetryLayerCommandStore) AnalyticsCommandCount(teamId string) (int64, error) { +func (s *RetryLayerCommandStore) AnalyticsCommandCount(teamID string) (int64, error) { tries := 0 for { - result, err := s.CommandStore.AnalyticsCommandCount(teamId) + result, err := s.CommandStore.AnalyticsCommandCount(teamID) if err == nil { return result, nil } @@ -2638,11 +2638,11 @@ func (s *RetryLayerCommandStore) AnalyticsCommandCount(teamId string) (int64, er } -func (s *RetryLayerCommandStore) Delete(commandId string, time int64) error { +func (s *RetryLayerCommandStore) Delete(commandID string, time int64) error { tries := 0 for { - err := s.CommandStore.Delete(commandId, time) + err := s.CommandStore.Delete(commandID, time) if err == nil { return nil } @@ -2678,11 +2678,11 @@ func (s *RetryLayerCommandStore) Get(id string) (*model.Command, error) { } -func (s *RetryLayerCommandStore) GetByTeam(teamId string) ([]*model.Command, error) { +func (s *RetryLayerCommandStore) GetByTeam(teamID string) ([]*model.Command, error) { tries := 0 for { - result, err := s.CommandStore.GetByTeam(teamId) + result, err := s.CommandStore.GetByTeam(teamID) if err == nil { return result, nil } @@ -2698,11 +2698,11 @@ func (s *RetryLayerCommandStore) GetByTeam(teamId string) ([]*model.Command, err } -func (s *RetryLayerCommandStore) GetByTrigger(teamId string, trigger string) (*model.Command, error) { +func (s *RetryLayerCommandStore) GetByTrigger(teamID string, trigger string) (*model.Command, error) { tries := 0 for { - result, err := s.CommandStore.GetByTrigger(teamId, trigger) + result, err := s.CommandStore.GetByTrigger(teamID, trigger) if err == nil { return result, nil } @@ -2718,11 +2718,11 @@ func (s *RetryLayerCommandStore) GetByTrigger(teamId string, trigger string) (*m } -func (s *RetryLayerCommandStore) PermanentDeleteByTeam(teamId string) error { +func (s *RetryLayerCommandStore) PermanentDeleteByTeam(teamID string) error { tries := 0 for { - err := s.CommandStore.PermanentDeleteByTeam(teamId) + err := s.CommandStore.PermanentDeleteByTeam(teamID) if err == nil { return nil } @@ -3124,11 +3124,11 @@ func (s *RetryLayerEmojiStore) Search(name string, prefixOnly bool, limit int) ( } -func (s *RetryLayerFileInfoStore) AttachToPost(fileId string, postId string, creatorId string) error { +func (s *RetryLayerFileInfoStore) AttachToPost(fileID string, postID string, creatorId string) error { tries := 0 for { - err := s.FileInfoStore.AttachToPost(fileId, postId, creatorId) + err := s.FileInfoStore.AttachToPost(fileID, postID, creatorId) if err == nil { return nil } @@ -3150,11 +3150,11 @@ func (s *RetryLayerFileInfoStore) ClearCaches() { } -func (s *RetryLayerFileInfoStore) DeleteForPost(postId string) (string, error) { +func (s *RetryLayerFileInfoStore) DeleteForPost(postID string) (string, error) { tries := 0 for { - result, err := s.FileInfoStore.DeleteForPost(postId) + result, err := s.FileInfoStore.DeleteForPost(postID) if err == nil { return result, nil } @@ -3230,11 +3230,11 @@ func (s *RetryLayerFileInfoStore) GetByPath(path string) (*model.FileInfo, error } -func (s *RetryLayerFileInfoStore) GetForPost(postId string, readFromMaster bool, includeDeleted bool, allowFromCache bool) ([]*model.FileInfo, error) { +func (s *RetryLayerFileInfoStore) GetForPost(postID string, readFromMaster bool, includeDeleted bool, allowFromCache bool) ([]*model.FileInfo, error) { tries := 0 for { - result, err := s.FileInfoStore.GetForPost(postId, readFromMaster, includeDeleted, allowFromCache) + result, err := s.FileInfoStore.GetForPost(postID, readFromMaster, includeDeleted, allowFromCache) if err == nil { return result, nil } @@ -3290,17 +3290,17 @@ func (s *RetryLayerFileInfoStore) GetWithOptions(page int, perPage int, opt *mod } -func (s *RetryLayerFileInfoStore) InvalidateFileInfosForPostCache(postId string, deleted bool) { +func (s *RetryLayerFileInfoStore) InvalidateFileInfosForPostCache(postID string, deleted bool) { - s.FileInfoStore.InvalidateFileInfosForPostCache(postId, deleted) + s.FileInfoStore.InvalidateFileInfosForPostCache(postID, deleted) } -func (s *RetryLayerFileInfoStore) PermanentDelete(fileId string) error { +func (s *RetryLayerFileInfoStore) PermanentDelete(fileID string) error { tries := 0 for { - err := s.FileInfoStore.PermanentDelete(fileId) + err := s.FileInfoStore.PermanentDelete(fileID) if err == nil { return nil } @@ -3376,11 +3376,11 @@ func (s *RetryLayerFileInfoStore) Save(info *model.FileInfo) (*model.FileInfo, e } -func (s *RetryLayerFileInfoStore) Search(paramsList []*model.SearchParams, userId string, teamId string, page int, perPage int) (*model.FileInfoList, error) { +func (s *RetryLayerFileInfoStore) Search(paramsList []*model.SearchParams, userId string, teamID string, page int, perPage int) (*model.FileInfoList, error) { tries := 0 for { - result, err := s.FileInfoStore.Search(paramsList, userId, teamId, page, perPage) + result, err := s.FileInfoStore.Search(paramsList, userId, teamID, page, perPage) if err == nil { return result, nil } @@ -3396,11 +3396,11 @@ func (s *RetryLayerFileInfoStore) Search(paramsList []*model.SearchParams, userI } -func (s *RetryLayerFileInfoStore) SetContent(fileId string, content string) error { +func (s *RetryLayerFileInfoStore) SetContent(fileID string, content string) error { tries := 0 for { - err := s.FileInfoStore.SetContent(fileId, content) + err := s.FileInfoStore.SetContent(fileID, content) if err == nil { return nil } @@ -3536,11 +3536,11 @@ func (s *RetryLayerGroupStore) CountChannelMembersMinusGroupMembers(channelID st } -func (s *RetryLayerGroupStore) CountGroupsByChannel(channelId string, opts model.GroupSearchOpts) (int64, error) { +func (s *RetryLayerGroupStore) CountGroupsByChannel(channelID string, opts model.GroupSearchOpts) (int64, error) { tries := 0 for { - result, err := s.GroupStore.CountGroupsByChannel(channelId, opts) + result, err := s.GroupStore.CountGroupsByChannel(channelID, opts) if err == nil { return result, nil } @@ -3556,11 +3556,11 @@ func (s *RetryLayerGroupStore) CountGroupsByChannel(channelId string, opts model } -func (s *RetryLayerGroupStore) CountGroupsByTeam(teamId string, opts model.GroupSearchOpts) (int64, error) { +func (s *RetryLayerGroupStore) CountGroupsByTeam(teamID string, opts model.GroupSearchOpts) (int64, error) { tries := 0 for { - result, err := s.GroupStore.CountGroupsByTeam(teamId, opts) + result, err := s.GroupStore.CountGroupsByTeam(teamID, opts) if err == nil { return result, nil } @@ -3896,11 +3896,11 @@ func (s *RetryLayerGroupStore) GetGroups(page int, perPage int, opts model.Group } -func (s *RetryLayerGroupStore) GetGroupsAssociatedToChannelsByTeam(teamId string, opts model.GroupSearchOpts) (map[string][]*model.GroupWithSchemeAdmin, error) { +func (s *RetryLayerGroupStore) GetGroupsAssociatedToChannelsByTeam(teamID string, opts model.GroupSearchOpts) (map[string][]*model.GroupWithSchemeAdmin, error) { tries := 0 for { - result, err := s.GroupStore.GetGroupsAssociatedToChannelsByTeam(teamId, opts) + result, err := s.GroupStore.GetGroupsAssociatedToChannelsByTeam(teamID, opts) if err == nil { return result, nil } @@ -3916,11 +3916,11 @@ func (s *RetryLayerGroupStore) GetGroupsAssociatedToChannelsByTeam(teamId string } -func (s *RetryLayerGroupStore) GetGroupsByChannel(channelId string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) { +func (s *RetryLayerGroupStore) GetGroupsByChannel(channelID string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) { tries := 0 for { - result, err := s.GroupStore.GetGroupsByChannel(channelId, opts) + result, err := s.GroupStore.GetGroupsByChannel(channelID, opts) if err == nil { return result, nil } @@ -3936,11 +3936,11 @@ func (s *RetryLayerGroupStore) GetGroupsByChannel(channelId string, opts model.G } -func (s *RetryLayerGroupStore) GetGroupsByTeam(teamId string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) { +func (s *RetryLayerGroupStore) GetGroupsByTeam(teamID string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) { tries := 0 for { - result, err := s.GroupStore.GetGroupsByTeam(teamId, opts) + result, err := s.GroupStore.GetGroupsByTeam(teamID, opts) if err == nil { return result, nil } @@ -5076,11 +5076,11 @@ func (s *RetryLayerPluginStore) CompareAndSet(keyVal *model.PluginKeyValue, oldV } -func (s *RetryLayerPluginStore) Delete(pluginId string, key string) error { +func (s *RetryLayerPluginStore) Delete(pluginID string, key string) error { tries := 0 for { - err := s.PluginStore.Delete(pluginId, key) + err := s.PluginStore.Delete(pluginID, key) if err == nil { return nil } @@ -5116,11 +5116,11 @@ func (s *RetryLayerPluginStore) DeleteAllExpired() error { } -func (s *RetryLayerPluginStore) DeleteAllForPlugin(PluginId string) error { +func (s *RetryLayerPluginStore) DeleteAllForPlugin(PluginID string) error { tries := 0 for { - err := s.PluginStore.DeleteAllForPlugin(PluginId) + err := s.PluginStore.DeleteAllForPlugin(PluginID) if err == nil { return nil } @@ -5136,11 +5136,11 @@ func (s *RetryLayerPluginStore) DeleteAllForPlugin(PluginId string) error { } -func (s *RetryLayerPluginStore) Get(pluginId string, key string) (*model.PluginKeyValue, error) { +func (s *RetryLayerPluginStore) Get(pluginID string, key string) (*model.PluginKeyValue, error) { tries := 0 for { - result, err := s.PluginStore.Get(pluginId, key) + result, err := s.PluginStore.Get(pluginID, key) if err == nil { return result, nil } @@ -5156,11 +5156,11 @@ func (s *RetryLayerPluginStore) Get(pluginId string, key string) (*model.PluginK } -func (s *RetryLayerPluginStore) List(pluginId string, page int, perPage int) ([]string, error) { +func (s *RetryLayerPluginStore) List(pluginID string, page int, perPage int) ([]string, error) { tries := 0 for { - result, err := s.PluginStore.List(pluginId, page, perPage) + result, err := s.PluginStore.List(pluginID, page, perPage) if err == nil { return result, nil } @@ -5196,11 +5196,11 @@ func (s *RetryLayerPluginStore) SaveOrUpdate(keyVal *model.PluginKeyValue) (*mod } -func (s *RetryLayerPluginStore) SetWithOptions(pluginId string, key string, value []byte, options model.PluginKVSetOptions) (bool, error) { +func (s *RetryLayerPluginStore) SetWithOptions(pluginID string, key string, value []byte, options model.PluginKVSetOptions) (bool, error) { tries := 0 for { - result, err := s.PluginStore.SetWithOptions(pluginId, key, value, options) + result, err := s.PluginStore.SetWithOptions(pluginID, key, value, options) if err == nil { return result, nil } @@ -5216,11 +5216,11 @@ func (s *RetryLayerPluginStore) SetWithOptions(pluginId string, key string, valu } -func (s *RetryLayerPostStore) AnalyticsPostCount(teamId string, mustHaveFile bool, mustHaveHashtag bool) (int64, error) { +func (s *RetryLayerPostStore) AnalyticsPostCount(teamID string, mustHaveFile bool, mustHaveHashtag bool) (int64, error) { tries := 0 for { - result, err := s.PostStore.AnalyticsPostCount(teamId, mustHaveFile, mustHaveHashtag) + result, err := s.PostStore.AnalyticsPostCount(teamID, mustHaveFile, mustHaveHashtag) if err == nil { return result, nil } @@ -5256,11 +5256,11 @@ func (s *RetryLayerPostStore) AnalyticsPostCountsByDay(options *model.AnalyticsP } -func (s *RetryLayerPostStore) AnalyticsUserCountsWithPostsByDay(teamId string) (model.AnalyticsRows, error) { +func (s *RetryLayerPostStore) AnalyticsUserCountsWithPostsByDay(teamID string) (model.AnalyticsRows, error) { tries := 0 for { - result, err := s.PostStore.AnalyticsUserCountsWithPostsByDay(teamId) + result, err := s.PostStore.AnalyticsUserCountsWithPostsByDay(teamID) if err == nil { return result, nil } @@ -5282,11 +5282,11 @@ func (s *RetryLayerPostStore) ClearCaches() { } -func (s *RetryLayerPostStore) Delete(postId string, time int64, deleteByID string) error { +func (s *RetryLayerPostStore) Delete(postID string, time int64, deleteByID string) error { tries := 0 for { - err := s.PostStore.Delete(postId, time, deleteByID) + err := s.PostStore.Delete(postID, time, deleteByID) if err == nil { return nil } @@ -5322,11 +5322,11 @@ func (s *RetryLayerPostStore) Get(id string, skipFetchThreads bool, collapsedThr } -func (s *RetryLayerPostStore) GetDirectPostParentsForExportAfter(limit int, afterId string) ([]*model.DirectPostForExport, error) { +func (s *RetryLayerPostStore) GetDirectPostParentsForExportAfter(limit int, afterID string) ([]*model.DirectPostForExport, error) { tries := 0 for { - result, err := s.PostStore.GetDirectPostParentsForExportAfter(limit, afterId) + result, err := s.PostStore.GetDirectPostParentsForExportAfter(limit, afterID) if err == nil { return result, nil } @@ -5342,9 +5342,9 @@ func (s *RetryLayerPostStore) GetDirectPostParentsForExportAfter(limit int, afte } -func (s *RetryLayerPostStore) GetEtag(channelId string, allowFromCache bool, collapsedThreads bool) string { +func (s *RetryLayerPostStore) GetEtag(channelID string, allowFromCache bool, collapsedThreads bool) string { - return s.PostStore.GetEtag(channelId, allowFromCache, collapsedThreads) + return s.PostStore.GetEtag(channelID, allowFromCache, collapsedThreads) } @@ -5368,11 +5368,11 @@ func (s *RetryLayerPostStore) GetFlaggedPosts(userId string, offset int, limit i } -func (s *RetryLayerPostStore) GetFlaggedPostsForChannel(userId string, channelId string, offset int, limit int) (*model.PostList, error) { +func (s *RetryLayerPostStore) GetFlaggedPostsForChannel(userId string, channelID string, offset int, limit int) (*model.PostList, error) { tries := 0 for { - result, err := s.PostStore.GetFlaggedPostsForChannel(userId, channelId, offset, limit) + result, err := s.PostStore.GetFlaggedPostsForChannel(userId, channelID, offset, limit) if err == nil { return result, nil } @@ -5388,11 +5388,11 @@ func (s *RetryLayerPostStore) GetFlaggedPostsForChannel(userId string, channelId } -func (s *RetryLayerPostStore) GetFlaggedPostsForTeam(userId string, teamId string, offset int, limit int) (*model.PostList, error) { +func (s *RetryLayerPostStore) GetFlaggedPostsForTeam(userId string, teamID string, offset int, limit int) (*model.PostList, error) { tries := 0 for { - result, err := s.PostStore.GetFlaggedPostsForTeam(userId, teamId, offset, limit) + result, err := s.PostStore.GetFlaggedPostsForTeam(userId, teamID, offset, limit) if err == nil { return result, nil } @@ -5454,11 +5454,11 @@ func (s *RetryLayerPostStore) GetOldestEntityCreationTime() (int64, error) { } -func (s *RetryLayerPostStore) GetParentsForExportAfter(limit int, afterId string) ([]*model.PostForExport, error) { +func (s *RetryLayerPostStore) GetParentsForExportAfter(limit int, afterID string) ([]*model.PostForExport, error) { tries := 0 for { - result, err := s.PostStore.GetParentsForExportAfter(limit, afterId) + result, err := s.PostStore.GetParentsForExportAfter(limit, afterID) if err == nil { return result, nil } @@ -5474,11 +5474,11 @@ func (s *RetryLayerPostStore) GetParentsForExportAfter(limit int, afterId string } -func (s *RetryLayerPostStore) GetPostAfterTime(channelId string, time int64) (*model.Post, error) { +func (s *RetryLayerPostStore) GetPostAfterTime(channelID string, time int64) (*model.Post, error) { tries := 0 for { - result, err := s.PostStore.GetPostAfterTime(channelId, time) + result, err := s.PostStore.GetPostAfterTime(channelID, time) if err == nil { return result, nil } @@ -5494,11 +5494,11 @@ func (s *RetryLayerPostStore) GetPostAfterTime(channelId string, time int64) (*m } -func (s *RetryLayerPostStore) GetPostIdAfterTime(channelId string, time int64) (string, error) { +func (s *RetryLayerPostStore) GetPostIdAfterTime(channelID string, time int64) (string, error) { tries := 0 for { - result, err := s.PostStore.GetPostIdAfterTime(channelId, time) + result, err := s.PostStore.GetPostIdAfterTime(channelID, time) if err == nil { return result, nil } @@ -5514,11 +5514,11 @@ func (s *RetryLayerPostStore) GetPostIdAfterTime(channelId string, time int64) ( } -func (s *RetryLayerPostStore) GetPostIdBeforeTime(channelId string, time int64) (string, error) { +func (s *RetryLayerPostStore) GetPostIdBeforeTime(channelID string, time int64) (string, error) { tries := 0 for { - result, err := s.PostStore.GetPostIdBeforeTime(channelId, time) + result, err := s.PostStore.GetPostIdBeforeTime(channelID, time) if err == nil { return result, nil } @@ -5634,11 +5634,11 @@ func (s *RetryLayerPostStore) GetPostsByIds(postIds []string) ([]*model.Post, er } -func (s *RetryLayerPostStore) GetPostsCreatedAt(channelId string, time int64) ([]*model.Post, error) { +func (s *RetryLayerPostStore) GetPostsCreatedAt(channelID string, time int64) ([]*model.Post, error) { tries := 0 for { - result, err := s.PostStore.GetPostsCreatedAt(channelId, time) + result, err := s.PostStore.GetPostsCreatedAt(channelID, time) if err == nil { return result, nil } @@ -5674,11 +5674,11 @@ func (s *RetryLayerPostStore) GetPostsSince(options model.GetPostsSinceOptions, } -func (s *RetryLayerPostStore) GetRepliesForExport(parentId string) ([]*model.ReplyForExport, error) { +func (s *RetryLayerPostStore) GetRepliesForExport(parentID string) ([]*model.ReplyForExport, error) { tries := 0 for { - result, err := s.PostStore.GetRepliesForExport(parentId) + result, err := s.PostStore.GetRepliesForExport(parentID) if err == nil { return result, nil } @@ -5714,9 +5714,9 @@ func (s *RetryLayerPostStore) GetSingle(id string) (*model.Post, error) { } -func (s *RetryLayerPostStore) InvalidateLastPostTimeCache(channelId string) { +func (s *RetryLayerPostStore) InvalidateLastPostTimeCache(channelID string) { - s.PostStore.InvalidateLastPostTimeCache(channelId) + s.PostStore.InvalidateLastPostTimeCache(channelID) } @@ -5780,11 +5780,11 @@ func (s *RetryLayerPostStore) PermanentDeleteBatch(endTime int64, limit int64) ( } -func (s *RetryLayerPostStore) PermanentDeleteByChannel(channelId string) error { +func (s *RetryLayerPostStore) PermanentDeleteByChannel(channelID string) error { tries := 0 for { - err := s.PostStore.PermanentDeleteByChannel(channelId) + err := s.PostStore.PermanentDeleteByChannel(channelID) if err == nil { return nil } @@ -5860,11 +5860,11 @@ func (s *RetryLayerPostStore) SaveMultiple(posts []*model.Post) ([]*model.Post, } -func (s *RetryLayerPostStore) Search(teamId string, userId string, params *model.SearchParams) (*model.PostList, error) { +func (s *RetryLayerPostStore) Search(teamID string, userId string, params *model.SearchParams) (*model.PostList, error) { tries := 0 for { - result, err := s.PostStore.Search(teamId, userId, params) + result, err := s.PostStore.Search(teamID, userId, params) if err == nil { return result, nil } @@ -5880,11 +5880,11 @@ func (s *RetryLayerPostStore) Search(teamId string, userId string, params *model } -func (s *RetryLayerPostStore) SearchPostsInTeamForUser(paramsList []*model.SearchParams, userId string, teamId string, page int, perPage int) (*model.PostSearchResults, error) { +func (s *RetryLayerPostStore) SearchPostsInTeamForUser(paramsList []*model.SearchParams, userId string, teamID string, page int, perPage int) (*model.PostSearchResults, error) { tries := 0 for { - result, err := s.PostStore.SearchPostsInTeamForUser(paramsList, userId, teamId, page, perPage) + result, err := s.PostStore.SearchPostsInTeamForUser(paramsList, userId, teamID, page, perPage) if err == nil { return result, nil } @@ -6240,11 +6240,11 @@ func (s *RetryLayerReactionStore) DeleteAllWithEmojiName(emojiName string) error } -func (s *RetryLayerReactionStore) GetForPost(postId string, allowFromCache bool) ([]*model.Reaction, error) { +func (s *RetryLayerReactionStore) GetForPost(postID string, allowFromCache bool) ([]*model.Reaction, error) { tries := 0 for { - result, err := s.ReactionStore.GetForPost(postId, allowFromCache) + result, err := s.ReactionStore.GetForPost(postID, allowFromCache) if err == nil { return result, nil } @@ -6360,11 +6360,11 @@ func (s *RetryLayerRoleStore) ChannelRolesUnderTeamRole(roleName string) ([]*mod } -func (s *RetryLayerRoleStore) Delete(roleId string) (*model.Role, error) { +func (s *RetryLayerRoleStore) Delete(roleID string) (*model.Role, error) { tries := 0 for { - result, err := s.RoleStore.Delete(roleId) + result, err := s.RoleStore.Delete(roleID) if err == nil { return result, nil } @@ -6380,11 +6380,11 @@ func (s *RetryLayerRoleStore) Delete(roleId string) (*model.Role, error) { } -func (s *RetryLayerRoleStore) Get(roleId string) (*model.Role, error) { +func (s *RetryLayerRoleStore) Get(roleID string) (*model.Role, error) { tries := 0 for { - result, err := s.RoleStore.Get(roleId) + result, err := s.RoleStore.Get(roleID) if err == nil { return result, nil } @@ -6540,11 +6540,11 @@ func (s *RetryLayerSchemeStore) CountWithoutPermission(scope string, permissionI } -func (s *RetryLayerSchemeStore) Delete(schemeId string) (*model.Scheme, error) { +func (s *RetryLayerSchemeStore) Delete(schemeID string) (*model.Scheme, error) { tries := 0 for { - result, err := s.SchemeStore.Delete(schemeId) + result, err := s.SchemeStore.Delete(schemeID) if err == nil { return result, nil } @@ -6560,11 +6560,11 @@ func (s *RetryLayerSchemeStore) Delete(schemeId string) (*model.Scheme, error) { } -func (s *RetryLayerSchemeStore) Get(schemeId string) (*model.Scheme, error) { +func (s *RetryLayerSchemeStore) Get(schemeID string) (*model.Scheme, error) { tries := 0 for { - result, err := s.SchemeStore.Get(schemeId) + result, err := s.SchemeStore.Get(schemeID) if err == nil { return result, nil } @@ -6686,11 +6686,11 @@ func (s *RetryLayerSessionStore) Cleanup(expiryTime int64, batchSize int64) { } -func (s *RetryLayerSessionStore) Get(sessionIdOrToken string) (*model.Session, error) { +func (s *RetryLayerSessionStore) Get(sessionIDOrToken string) (*model.Session, error) { tries := 0 for { - result, err := s.SessionStore.Get(sessionIdOrToken) + result, err := s.SessionStore.Get(sessionIDOrToken) if err == nil { return result, nil } @@ -6766,11 +6766,11 @@ func (s *RetryLayerSessionStore) GetSessionsWithActiveDeviceIds(userId string) ( } -func (s *RetryLayerSessionStore) PermanentDeleteSessionsByUser(teamId string) error { +func (s *RetryLayerSessionStore) PermanentDeleteSessionsByUser(teamID string) error { tries := 0 for { - err := s.SessionStore.PermanentDeleteSessionsByUser(teamId) + err := s.SessionStore.PermanentDeleteSessionsByUser(teamID) if err == nil { return nil } @@ -6786,11 +6786,11 @@ func (s *RetryLayerSessionStore) PermanentDeleteSessionsByUser(teamId string) er } -func (s *RetryLayerSessionStore) Remove(sessionIdOrToken string) error { +func (s *RetryLayerSessionStore) Remove(sessionIDOrToken string) error { tries := 0 for { - err := s.SessionStore.Remove(sessionIdOrToken) + err := s.SessionStore.Remove(sessionIDOrToken) if err == nil { return nil } @@ -6846,11 +6846,11 @@ func (s *RetryLayerSessionStore) Save(session *model.Session) (*model.Session, e } -func (s *RetryLayerSessionStore) UpdateDeviceId(id string, deviceId string, expiresAt int64) (string, error) { +func (s *RetryLayerSessionStore) UpdateDeviceId(id string, deviceID string, expiresAt int64) (string, error) { tries := 0 for { - result, err := s.SessionStore.UpdateDeviceId(id, deviceId, expiresAt) + result, err := s.SessionStore.UpdateDeviceId(id, deviceID, expiresAt) if err == nil { return result, nil } @@ -6886,11 +6886,11 @@ func (s *RetryLayerSessionStore) UpdateExpiredNotify(sessionid string, notified } -func (s *RetryLayerSessionStore) UpdateExpiresAt(sessionId string, time int64) error { +func (s *RetryLayerSessionStore) UpdateExpiresAt(sessionID string, time int64) error { tries := 0 for { - err := s.SessionStore.UpdateExpiresAt(sessionId, time) + err := s.SessionStore.UpdateExpiresAt(sessionID, time) if err == nil { return nil } @@ -6906,11 +6906,11 @@ func (s *RetryLayerSessionStore) UpdateExpiresAt(sessionId string, time int64) e } -func (s *RetryLayerSessionStore) UpdateLastActivityAt(sessionId string, time int64) error { +func (s *RetryLayerSessionStore) UpdateLastActivityAt(sessionID string, time int64) error { tries := 0 for { - err := s.SessionStore.UpdateLastActivityAt(sessionId, time) + err := s.SessionStore.UpdateLastActivityAt(sessionID, time) if err == nil { return nil } @@ -7246,11 +7246,11 @@ func (s *RetryLayerSystemStore) Update(system *model.System) error { } -func (s *RetryLayerTeamStore) AnalyticsGetTeamCountForScheme(schemeId string) (int64, error) { +func (s *RetryLayerTeamStore) AnalyticsGetTeamCountForScheme(schemeID string) (int64, error) { tries := 0 for { - result, err := s.TeamStore.AnalyticsGetTeamCountForScheme(schemeId) + result, err := s.TeamStore.AnalyticsGetTeamCountForScheme(schemeID) if err == nil { return result, nil } @@ -7372,11 +7372,11 @@ func (s *RetryLayerTeamStore) Get(id string) (*model.Team, error) { } -func (s *RetryLayerTeamStore) GetActiveMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, error) { +func (s *RetryLayerTeamStore) GetActiveMemberCount(teamID string, restrictions *model.ViewUsersRestrictions) (int64, error) { tries := 0 for { - result, err := s.TeamStore.GetActiveMemberCount(teamId, restrictions) + result, err := s.TeamStore.GetActiveMemberCount(teamID, restrictions) if err == nil { return result, nil } @@ -7412,11 +7412,11 @@ func (s *RetryLayerTeamStore) GetAll() ([]*model.Team, error) { } -func (s *RetryLayerTeamStore) GetAllForExportAfter(limit int, afterId string) ([]*model.TeamForExport, error) { +func (s *RetryLayerTeamStore) GetAllForExportAfter(limit int, afterID string) ([]*model.TeamForExport, error) { tries := 0 for { - result, err := s.TeamStore.GetAllForExportAfter(limit, afterId) + result, err := s.TeamStore.GetAllForExportAfter(limit, afterID) if err == nil { return result, nil } @@ -7552,11 +7552,11 @@ func (s *RetryLayerTeamStore) GetAllTeamPageListing(offset int, limit int) ([]*m } -func (s *RetryLayerTeamStore) GetByInviteId(inviteId string) (*model.Team, error) { +func (s *RetryLayerTeamStore) GetByInviteId(inviteID string) (*model.Team, error) { tries := 0 for { - result, err := s.TeamStore.GetByInviteId(inviteId) + result, err := s.TeamStore.GetByInviteId(inviteID) if err == nil { return result, nil } @@ -7612,11 +7612,11 @@ func (s *RetryLayerTeamStore) GetByNames(name []string) ([]*model.Team, error) { } -func (s *RetryLayerTeamStore) GetChannelUnreadsForAllTeams(excludeTeamId string, userId string) ([]*model.ChannelUnread, error) { +func (s *RetryLayerTeamStore) GetChannelUnreadsForAllTeams(excludeTeamID string, userId string) ([]*model.ChannelUnread, error) { tries := 0 for { - result, err := s.TeamStore.GetChannelUnreadsForAllTeams(excludeTeamId, userId) + result, err := s.TeamStore.GetChannelUnreadsForAllTeams(excludeTeamID, userId) if err == nil { return result, nil } @@ -7632,11 +7632,11 @@ func (s *RetryLayerTeamStore) GetChannelUnreadsForAllTeams(excludeTeamId string, } -func (s *RetryLayerTeamStore) GetChannelUnreadsForTeam(teamId string, userId string) ([]*model.ChannelUnread, error) { +func (s *RetryLayerTeamStore) GetChannelUnreadsForTeam(teamID string, userId string) ([]*model.ChannelUnread, error) { tries := 0 for { - result, err := s.TeamStore.GetChannelUnreadsForTeam(teamId, userId) + result, err := s.TeamStore.GetChannelUnreadsForTeam(teamID, userId) if err == nil { return result, nil } @@ -7652,11 +7652,11 @@ func (s *RetryLayerTeamStore) GetChannelUnreadsForTeam(teamId string, userId str } -func (s *RetryLayerTeamStore) GetMember(teamId string, userId string) (*model.TeamMember, error) { +func (s *RetryLayerTeamStore) GetMember(teamID string, userId string) (*model.TeamMember, error) { tries := 0 for { - result, err := s.TeamStore.GetMember(teamId, userId) + result, err := s.TeamStore.GetMember(teamID, userId) if err == nil { return result, nil } @@ -7672,11 +7672,11 @@ func (s *RetryLayerTeamStore) GetMember(teamId string, userId string) (*model.Te } -func (s *RetryLayerTeamStore) GetMembers(teamId string, offset int, limit int, teamMembersGetOptions *model.TeamMembersGetOptions) ([]*model.TeamMember, error) { +func (s *RetryLayerTeamStore) GetMembers(teamID string, offset int, limit int, teamMembersGetOptions *model.TeamMembersGetOptions) ([]*model.TeamMember, error) { tries := 0 for { - result, err := s.TeamStore.GetMembers(teamId, offset, limit, teamMembersGetOptions) + result, err := s.TeamStore.GetMembers(teamID, offset, limit, teamMembersGetOptions) if err == nil { return result, nil } @@ -7692,11 +7692,11 @@ func (s *RetryLayerTeamStore) GetMembers(teamId string, offset int, limit int, t } -func (s *RetryLayerTeamStore) GetMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, error) { +func (s *RetryLayerTeamStore) GetMembersByIds(teamID string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, error) { tries := 0 for { - result, err := s.TeamStore.GetMembersByIds(teamId, userIds, restrictions) + result, err := s.TeamStore.GetMembersByIds(teamID, userIds, restrictions) if err == nil { return result, nil } @@ -7732,11 +7732,11 @@ func (s *RetryLayerTeamStore) GetTeamMembersForExport(userId string) ([]*model.T } -func (s *RetryLayerTeamStore) GetTeamsByScheme(schemeId string, offset int, limit int) ([]*model.Team, error) { +func (s *RetryLayerTeamStore) GetTeamsByScheme(schemeID string, offset int, limit int) ([]*model.Team, error) { tries := 0 for { - result, err := s.TeamStore.GetTeamsByScheme(schemeId, offset, limit) + result, err := s.TeamStore.GetTeamsByScheme(schemeID, offset, limit) if err == nil { return result, nil } @@ -7812,11 +7812,11 @@ func (s *RetryLayerTeamStore) GetTeamsForUserWithPagination(userId string, page } -func (s *RetryLayerTeamStore) GetTotalMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, error) { +func (s *RetryLayerTeamStore) GetTotalMemberCount(teamID string, restrictions *model.ViewUsersRestrictions) (int64, error) { tries := 0 for { - result, err := s.TeamStore.GetTotalMemberCount(teamId, restrictions) + result, err := s.TeamStore.GetTotalMemberCount(teamID, restrictions) if err == nil { return result, nil } @@ -7878,11 +7878,11 @@ func (s *RetryLayerTeamStore) InvalidateAllTeamIdsForUser(userId string) { } -func (s *RetryLayerTeamStore) MigrateTeamMembers(fromTeamId string, fromUserId string) (map[string]string, error) { +func (s *RetryLayerTeamStore) MigrateTeamMembers(fromTeamID string, fromUserId string) (map[string]string, error) { tries := 0 for { - result, err := s.TeamStore.MigrateTeamMembers(fromTeamId, fromUserId) + result, err := s.TeamStore.MigrateTeamMembers(fromTeamID, fromUserId) if err == nil { return result, nil } @@ -7898,11 +7898,11 @@ func (s *RetryLayerTeamStore) MigrateTeamMembers(fromTeamId string, fromUserId s } -func (s *RetryLayerTeamStore) PermanentDelete(teamId string) error { +func (s *RetryLayerTeamStore) PermanentDelete(teamID string) error { tries := 0 for { - err := s.TeamStore.PermanentDelete(teamId) + err := s.TeamStore.PermanentDelete(teamID) if err == nil { return nil } @@ -7918,11 +7918,11 @@ func (s *RetryLayerTeamStore) PermanentDelete(teamId string) error { } -func (s *RetryLayerTeamStore) RemoveAllMembersByTeam(teamId string) error { +func (s *RetryLayerTeamStore) RemoveAllMembersByTeam(teamID string) error { tries := 0 for { - err := s.TeamStore.RemoveAllMembersByTeam(teamId) + err := s.TeamStore.RemoveAllMembersByTeam(teamID) if err == nil { return nil } @@ -7958,11 +7958,11 @@ func (s *RetryLayerTeamStore) RemoveAllMembersByUser(userId string) error { } -func (s *RetryLayerTeamStore) RemoveMember(teamId string, userId string) error { +func (s *RetryLayerTeamStore) RemoveMember(teamID string, userId string) error { tries := 0 for { - err := s.TeamStore.RemoveMember(teamId, userId) + err := s.TeamStore.RemoveMember(teamID, userId) if err == nil { return nil } @@ -7978,11 +7978,11 @@ func (s *RetryLayerTeamStore) RemoveMember(teamId string, userId string) error { } -func (s *RetryLayerTeamStore) RemoveMembers(teamId string, userIds []string) error { +func (s *RetryLayerTeamStore) RemoveMembers(teamID string, userIds []string) error { tries := 0 for { - err := s.TeamStore.RemoveMembers(teamId, userIds) + err := s.TeamStore.RemoveMembers(teamID, userIds) if err == nil { return nil } @@ -8178,11 +8178,11 @@ func (s *RetryLayerTeamStore) Update(team *model.Team) (*model.Team, error) { } -func (s *RetryLayerTeamStore) UpdateLastTeamIconUpdate(teamId string, curTime int64) error { +func (s *RetryLayerTeamStore) UpdateLastTeamIconUpdate(teamID string, curTime int64) error { tries := 0 for { - err := s.TeamStore.UpdateLastTeamIconUpdate(teamId, curTime) + err := s.TeamStore.UpdateLastTeamIconUpdate(teamID, curTime) if err == nil { return nil } @@ -8358,11 +8358,11 @@ func (s *RetryLayerThreadStore) CollectThreadsWithNewerReplies(userId string, ch } -func (s *RetryLayerThreadStore) CreateMembershipIfNeeded(userId string, postId string, following bool, incrementMentions bool, updateFollowing bool) error { +func (s *RetryLayerThreadStore) CreateMembershipIfNeeded(userId string, postID string, following bool, incrementMentions bool, updateFollowing bool) error { tries := 0 for { - err := s.ThreadStore.CreateMembershipIfNeeded(userId, postId, following, incrementMentions, updateFollowing) + err := s.ThreadStore.CreateMembershipIfNeeded(userId, postID, following, incrementMentions, updateFollowing) if err == nil { return nil } @@ -8398,11 +8398,11 @@ func (s *RetryLayerThreadStore) Delete(postId string) error { } -func (s *RetryLayerThreadStore) DeleteMembershipForUser(userId string, postId string) error { +func (s *RetryLayerThreadStore) DeleteMembershipForUser(userId string, postID string) error { tries := 0 for { - err := s.ThreadStore.DeleteMembershipForUser(userId, postId) + err := s.ThreadStore.DeleteMembershipForUser(userId, postID) if err == nil { return nil } @@ -8438,11 +8438,11 @@ func (s *RetryLayerThreadStore) Get(id string) (*model.Thread, error) { } -func (s *RetryLayerThreadStore) GetMembershipForUser(userId string, postId string) (*model.ThreadMembership, error) { +func (s *RetryLayerThreadStore) GetMembershipForUser(userId string, postID string) (*model.ThreadMembership, error) { tries := 0 for { - result, err := s.ThreadStore.GetMembershipForUser(userId, postId) + result, err := s.ThreadStore.GetMembershipForUser(userId, postID) if err == nil { return result, nil } @@ -8458,11 +8458,11 @@ func (s *RetryLayerThreadStore) GetMembershipForUser(userId string, postId strin } -func (s *RetryLayerThreadStore) GetMembershipsForUser(userId string, teamId string) ([]*model.ThreadMembership, error) { +func (s *RetryLayerThreadStore) GetMembershipsForUser(userId string, teamID string) ([]*model.ThreadMembership, error) { tries := 0 for { - result, err := s.ThreadStore.GetMembershipsForUser(userId, teamId) + result, err := s.ThreadStore.GetMembershipsForUser(userId, teamID) if err == nil { return result, nil } @@ -8558,11 +8558,11 @@ func (s *RetryLayerThreadStore) GetThreadsForUser(userId string, teamId string, } -func (s *RetryLayerThreadStore) MarkAllAsRead(userId string, teamId string) error { +func (s *RetryLayerThreadStore) MarkAllAsRead(userId string, teamID string) error { tries := 0 for { - err := s.ThreadStore.MarkAllAsRead(userId, teamId) + err := s.ThreadStore.MarkAllAsRead(userId, teamID) if err == nil { return nil } @@ -8578,11 +8578,11 @@ func (s *RetryLayerThreadStore) MarkAllAsRead(userId string, teamId string) erro } -func (s *RetryLayerThreadStore) MarkAsRead(userId string, threadId string, timestamp int64) error { +func (s *RetryLayerThreadStore) MarkAsRead(userId string, threadID string, timestamp int64) error { tries := 0 for { - err := s.ThreadStore.MarkAsRead(userId, threadId, timestamp) + err := s.ThreadStore.MarkAsRead(userId, threadID, timestamp) if err == nil { return nil } @@ -9024,11 +9024,11 @@ func (s *RetryLayerUserStore) AnalyticsGetSystemAdminCount() (int64, error) { } -func (s *RetryLayerUserStore) AutocompleteUsersInChannel(teamId string, channelId string, term string, options *model.UserSearchOptions) (*model.UserAutocompleteInChannel, error) { +func (s *RetryLayerUserStore) AutocompleteUsersInChannel(teamID string, channelID string, term string, options *model.UserSearchOptions) (*model.UserAutocompleteInChannel, error) { tries := 0 for { - result, err := s.UserStore.AutocompleteUsersInChannel(teamId, channelId, term, options) + result, err := s.UserStore.AutocompleteUsersInChannel(teamID, channelID, term, options) if err == nil { return result, nil } @@ -9170,11 +9170,11 @@ func (s *RetryLayerUserStore) GetAll() ([]*model.User, error) { } -func (s *RetryLayerUserStore) GetAllAfter(limit int, afterId string) ([]*model.User, error) { +func (s *RetryLayerUserStore) GetAllAfter(limit int, afterID string) ([]*model.User, error) { tries := 0 for { - result, err := s.UserStore.GetAllAfter(limit, afterId) + result, err := s.UserStore.GetAllAfter(limit, afterID) if err == nil { return result, nil } @@ -9270,11 +9270,11 @@ func (s *RetryLayerUserStore) GetAllUsingAuthService(authService string) ([]*mod } -func (s *RetryLayerUserStore) GetAnyUnreadPostCountForChannel(userId string, channelId string) (int64, error) { +func (s *RetryLayerUserStore) GetAnyUnreadPostCountForChannel(userId string, channelID string) (int64, error) { tries := 0 for { - result, err := s.UserStore.GetAnyUnreadPostCountForChannel(userId, channelId) + result, err := s.UserStore.GetAnyUnreadPostCountForChannel(userId, channelID) if err == nil { return result, nil } @@ -9376,23 +9376,23 @@ func (s *RetryLayerUserStore) GetEtagForAllProfiles() string { } -func (s *RetryLayerUserStore) GetEtagForProfiles(teamId string) string { +func (s *RetryLayerUserStore) GetEtagForProfiles(teamID string) string { - return s.UserStore.GetEtagForProfiles(teamId) + return s.UserStore.GetEtagForProfiles(teamID) } -func (s *RetryLayerUserStore) GetEtagForProfilesNotInTeam(teamId string) string { +func (s *RetryLayerUserStore) GetEtagForProfilesNotInTeam(teamID string) string { - return s.UserStore.GetEtagForProfilesNotInTeam(teamId) + return s.UserStore.GetEtagForProfilesNotInTeam(teamID) } -func (s *RetryLayerUserStore) GetForLogin(loginId string, allowSignInWithUsername bool, allowSignInWithEmail bool) (*model.User, error) { +func (s *RetryLayerUserStore) GetForLogin(loginID string, allowSignInWithUsername bool, allowSignInWithEmail bool) (*model.User, error) { tries := 0 for { - result, err := s.UserStore.GetForLogin(loginId, allowSignInWithUsername, allowSignInWithEmail) + result, err := s.UserStore.GetForLogin(loginID, allowSignInWithUsername, allowSignInWithEmail) if err == nil { return result, nil } @@ -9448,11 +9448,11 @@ func (s *RetryLayerUserStore) GetMany(ctx context.Context, ids []string) ([]*mod } -func (s *RetryLayerUserStore) GetNewUsersForTeam(teamId string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { +func (s *RetryLayerUserStore) GetNewUsersForTeam(teamID string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { tries := 0 for { - result, err := s.UserStore.GetNewUsersForTeam(teamId, offset, limit, viewRestrictions) + result, err := s.UserStore.GetNewUsersForTeam(teamID, offset, limit, viewRestrictions) if err == nil { return result, nil } @@ -9608,11 +9608,11 @@ func (s *RetryLayerUserStore) GetProfilesNotInChannel(teamId string, channelId s } -func (s *RetryLayerUserStore) GetProfilesNotInTeam(teamId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { +func (s *RetryLayerUserStore) GetProfilesNotInTeam(teamID string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { tries := 0 for { - result, err := s.UserStore.GetProfilesNotInTeam(teamId, groupConstrained, offset, limit, viewRestrictions) + result, err := s.UserStore.GetProfilesNotInTeam(teamID, groupConstrained, offset, limit, viewRestrictions) if err == nil { return result, nil } @@ -9648,11 +9648,11 @@ func (s *RetryLayerUserStore) GetProfilesWithoutTeam(options *model.UserGetOptio } -func (s *RetryLayerUserStore) GetRecentlyActiveUsersForTeam(teamId string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { +func (s *RetryLayerUserStore) GetRecentlyActiveUsersForTeam(teamID string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { tries := 0 for { - result, err := s.UserStore.GetRecentlyActiveUsersForTeam(teamId, offset, limit, viewRestrictions) + result, err := s.UserStore.GetRecentlyActiveUsersForTeam(teamID, offset, limit, viewRestrictions) if err == nil { return result, nil } @@ -9728,11 +9728,11 @@ func (s *RetryLayerUserStore) GetUnreadCount(userId string) (int64, error) { } -func (s *RetryLayerUserStore) GetUnreadCountForChannel(userId string, channelId string) (int64, error) { +func (s *RetryLayerUserStore) GetUnreadCountForChannel(userId string, channelID string) (int64, error) { tries := 0 for { - result, err := s.UserStore.GetUnreadCountForChannel(userId, channelId) + result, err := s.UserStore.GetUnreadCountForChannel(userId, channelID) if err == nil { return result, nil } @@ -9794,9 +9794,9 @@ func (s *RetryLayerUserStore) InvalidateProfileCacheForUser(userId string) { } -func (s *RetryLayerUserStore) InvalidateProfilesInChannelCache(channelId string) { +func (s *RetryLayerUserStore) InvalidateProfilesInChannelCache(channelID string) { - s.UserStore.InvalidateProfilesInChannelCache(channelId) + s.UserStore.InvalidateProfilesInChannelCache(channelID) } @@ -9886,11 +9886,11 @@ func (s *RetryLayerUserStore) Save(user *model.User) (*model.User, error) { } -func (s *RetryLayerUserStore) Search(teamId string, term string, options *model.UserSearchOptions) ([]*model.User, error) { +func (s *RetryLayerUserStore) Search(teamID string, term string, options *model.UserSearchOptions) ([]*model.User, error) { tries := 0 for { - result, err := s.UserStore.Search(teamId, term, options) + result, err := s.UserStore.Search(teamID, term, options) if err == nil { return result, nil } @@ -9906,11 +9906,11 @@ func (s *RetryLayerUserStore) Search(teamId string, term string, options *model. } -func (s *RetryLayerUserStore) SearchInChannel(channelId string, term string, options *model.UserSearchOptions) ([]*model.User, error) { +func (s *RetryLayerUserStore) SearchInChannel(channelID string, term string, options *model.UserSearchOptions) ([]*model.User, error) { tries := 0 for { - result, err := s.UserStore.SearchInChannel(channelId, term, options) + result, err := s.UserStore.SearchInChannel(channelID, term, options) if err == nil { return result, nil } @@ -9946,11 +9946,11 @@ func (s *RetryLayerUserStore) SearchInGroup(groupID string, term string, options } -func (s *RetryLayerUserStore) SearchNotInChannel(teamId string, channelId string, term string, options *model.UserSearchOptions) ([]*model.User, error) { +func (s *RetryLayerUserStore) SearchNotInChannel(teamID string, channelID string, term string, options *model.UserSearchOptions) ([]*model.User, error) { tries := 0 for { - result, err := s.UserStore.SearchNotInChannel(teamId, channelId, term, options) + result, err := s.UserStore.SearchNotInChannel(teamID, channelID, term, options) if err == nil { return result, nil } @@ -10186,11 +10186,11 @@ func (s *RetryLayerUserStore) VerifyEmail(userId string, email string) (string, } -func (s *RetryLayerUserAccessTokenStore) Delete(tokenId string) error { +func (s *RetryLayerUserAccessTokenStore) Delete(tokenID string) error { tries := 0 for { - err := s.UserAccessTokenStore.Delete(tokenId) + err := s.UserAccessTokenStore.Delete(tokenID) if err == nil { return nil } @@ -10226,11 +10226,11 @@ func (s *RetryLayerUserAccessTokenStore) DeleteAllForUser(userId string) error { } -func (s *RetryLayerUserAccessTokenStore) Get(tokenId string) (*model.UserAccessToken, error) { +func (s *RetryLayerUserAccessTokenStore) Get(tokenID string) (*model.UserAccessToken, error) { tries := 0 for { - result, err := s.UserAccessTokenStore.Get(tokenId) + result, err := s.UserAccessTokenStore.Get(tokenID) if err == nil { return result, nil } @@ -10346,11 +10346,11 @@ func (s *RetryLayerUserAccessTokenStore) Search(term string) ([]*model.UserAcces } -func (s *RetryLayerUserAccessTokenStore) UpdateTokenDisable(tokenId string) error { +func (s *RetryLayerUserAccessTokenStore) UpdateTokenDisable(tokenID string) error { tries := 0 for { - err := s.UserAccessTokenStore.UpdateTokenDisable(tokenId) + err := s.UserAccessTokenStore.UpdateTokenDisable(tokenID) if err == nil { return nil } @@ -10366,11 +10366,11 @@ func (s *RetryLayerUserAccessTokenStore) UpdateTokenDisable(tokenId string) erro } -func (s *RetryLayerUserAccessTokenStore) UpdateTokenEnable(tokenId string) error { +func (s *RetryLayerUserAccessTokenStore) UpdateTokenEnable(tokenID string) error { tries := 0 for { - err := s.UserAccessTokenStore.UpdateTokenEnable(tokenId) + err := s.UserAccessTokenStore.UpdateTokenEnable(tokenID) if err == nil { return nil } @@ -10446,11 +10446,11 @@ func (s *RetryLayerUserTermsOfServiceStore) Save(userTermsOfService *model.UserT } -func (s *RetryLayerWebhookStore) AnalyticsIncomingCount(teamId string) (int64, error) { +func (s *RetryLayerWebhookStore) AnalyticsIncomingCount(teamID string) (int64, error) { tries := 0 for { - result, err := s.WebhookStore.AnalyticsIncomingCount(teamId) + result, err := s.WebhookStore.AnalyticsIncomingCount(teamID) if err == nil { return result, nil } @@ -10466,11 +10466,11 @@ func (s *RetryLayerWebhookStore) AnalyticsIncomingCount(teamId string) (int64, e } -func (s *RetryLayerWebhookStore) AnalyticsOutgoingCount(teamId string) (int64, error) { +func (s *RetryLayerWebhookStore) AnalyticsOutgoingCount(teamID string) (int64, error) { tries := 0 for { - result, err := s.WebhookStore.AnalyticsOutgoingCount(teamId) + result, err := s.WebhookStore.AnalyticsOutgoingCount(teamID) if err == nil { return result, nil } @@ -10492,11 +10492,11 @@ func (s *RetryLayerWebhookStore) ClearCaches() { } -func (s *RetryLayerWebhookStore) DeleteIncoming(webhookId string, time int64) error { +func (s *RetryLayerWebhookStore) DeleteIncoming(webhookID string, time int64) error { tries := 0 for { - err := s.WebhookStore.DeleteIncoming(webhookId, time) + err := s.WebhookStore.DeleteIncoming(webhookID, time) if err == nil { return nil } @@ -10512,11 +10512,11 @@ func (s *RetryLayerWebhookStore) DeleteIncoming(webhookId string, time int64) er } -func (s *RetryLayerWebhookStore) DeleteOutgoing(webhookId string, time int64) error { +func (s *RetryLayerWebhookStore) DeleteOutgoing(webhookID string, time int64) error { tries := 0 for { - err := s.WebhookStore.DeleteOutgoing(webhookId, time) + err := s.WebhookStore.DeleteOutgoing(webhookID, time) if err == nil { return nil } @@ -10552,11 +10552,11 @@ func (s *RetryLayerWebhookStore) GetIncoming(id string, allowFromCache bool) (*m } -func (s *RetryLayerWebhookStore) GetIncomingByChannel(channelId string) ([]*model.IncomingWebhook, error) { +func (s *RetryLayerWebhookStore) GetIncomingByChannel(channelID string) ([]*model.IncomingWebhook, error) { tries := 0 for { - result, err := s.WebhookStore.GetIncomingByChannel(channelId) + result, err := s.WebhookStore.GetIncomingByChannel(channelID) if err == nil { return result, nil } @@ -10572,11 +10572,11 @@ func (s *RetryLayerWebhookStore) GetIncomingByChannel(channelId string) ([]*mode } -func (s *RetryLayerWebhookStore) GetIncomingByTeam(teamId string, offset int, limit int) ([]*model.IncomingWebhook, error) { +func (s *RetryLayerWebhookStore) GetIncomingByTeam(teamID string, offset int, limit int) ([]*model.IncomingWebhook, error) { tries := 0 for { - result, err := s.WebhookStore.GetIncomingByTeam(teamId, offset, limit) + result, err := s.WebhookStore.GetIncomingByTeam(teamID, offset, limit) if err == nil { return result, nil } @@ -10592,11 +10592,11 @@ func (s *RetryLayerWebhookStore) GetIncomingByTeam(teamId string, offset int, li } -func (s *RetryLayerWebhookStore) GetIncomingByTeamByUser(teamId string, userId string, offset int, limit int) ([]*model.IncomingWebhook, error) { +func (s *RetryLayerWebhookStore) GetIncomingByTeamByUser(teamID string, userId string, offset int, limit int) ([]*model.IncomingWebhook, error) { tries := 0 for { - result, err := s.WebhookStore.GetIncomingByTeamByUser(teamId, userId, offset, limit) + result, err := s.WebhookStore.GetIncomingByTeamByUser(teamID, userId, offset, limit) if err == nil { return result, nil } @@ -10672,11 +10672,11 @@ func (s *RetryLayerWebhookStore) GetOutgoing(id string) (*model.OutgoingWebhook, } -func (s *RetryLayerWebhookStore) GetOutgoingByChannel(channelId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { +func (s *RetryLayerWebhookStore) GetOutgoingByChannel(channelID string, offset int, limit int) ([]*model.OutgoingWebhook, error) { tries := 0 for { - result, err := s.WebhookStore.GetOutgoingByChannel(channelId, offset, limit) + result, err := s.WebhookStore.GetOutgoingByChannel(channelID, offset, limit) if err == nil { return result, nil } @@ -10692,11 +10692,11 @@ func (s *RetryLayerWebhookStore) GetOutgoingByChannel(channelId string, offset i } -func (s *RetryLayerWebhookStore) GetOutgoingByChannelByUser(channelId string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { +func (s *RetryLayerWebhookStore) GetOutgoingByChannelByUser(channelID string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { tries := 0 for { - result, err := s.WebhookStore.GetOutgoingByChannelByUser(channelId, userId, offset, limit) + result, err := s.WebhookStore.GetOutgoingByChannelByUser(channelID, userId, offset, limit) if err == nil { return result, nil } @@ -10712,11 +10712,11 @@ func (s *RetryLayerWebhookStore) GetOutgoingByChannelByUser(channelId string, us } -func (s *RetryLayerWebhookStore) GetOutgoingByTeam(teamId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { +func (s *RetryLayerWebhookStore) GetOutgoingByTeam(teamID string, offset int, limit int) ([]*model.OutgoingWebhook, error) { tries := 0 for { - result, err := s.WebhookStore.GetOutgoingByTeam(teamId, offset, limit) + result, err := s.WebhookStore.GetOutgoingByTeam(teamID, offset, limit) if err == nil { return result, nil } @@ -10732,11 +10732,11 @@ func (s *RetryLayerWebhookStore) GetOutgoingByTeam(teamId string, offset int, li } -func (s *RetryLayerWebhookStore) GetOutgoingByTeamByUser(teamId string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { +func (s *RetryLayerWebhookStore) GetOutgoingByTeamByUser(teamID string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { tries := 0 for { - result, err := s.WebhookStore.GetOutgoingByTeamByUser(teamId, userId, offset, limit) + result, err := s.WebhookStore.GetOutgoingByTeamByUser(teamID, userId, offset, limit) if err == nil { return result, nil } @@ -10798,11 +10798,11 @@ func (s *RetryLayerWebhookStore) InvalidateWebhookCache(webhook string) { } -func (s *RetryLayerWebhookStore) PermanentDeleteIncomingByChannel(channelId string) error { +func (s *RetryLayerWebhookStore) PermanentDeleteIncomingByChannel(channelID string) error { tries := 0 for { - err := s.WebhookStore.PermanentDeleteIncomingByChannel(channelId) + err := s.WebhookStore.PermanentDeleteIncomingByChannel(channelID) if err == nil { return nil } @@ -10838,11 +10838,11 @@ func (s *RetryLayerWebhookStore) PermanentDeleteIncomingByUser(userId string) er } -func (s *RetryLayerWebhookStore) PermanentDeleteOutgoingByChannel(channelId string) error { +func (s *RetryLayerWebhookStore) PermanentDeleteOutgoingByChannel(channelID string) error { tries := 0 for { - err := s.WebhookStore.PermanentDeleteOutgoingByChannel(channelId) + err := s.WebhookStore.PermanentDeleteOutgoingByChannel(channelID) if err == nil { return nil } diff --git a/store/store.go b/store/store.go index 79564a2eef..dd2031f15b 100644 --- a/store/store.go +++ b/store/store.go @@ -88,8 +88,8 @@ type TeamStore interface { GetAllTeamListing() ([]*model.Team, error) GetAllTeamPageListing(offset int, limit int) ([]*model.Team, error) GetTeamsByUserId(userId string) ([]*model.Team, error) - GetByInviteId(inviteId string) (*model.Team, error) - PermanentDelete(teamId string) error + GetByInviteId(inviteID string) (*model.Team, error) + PermanentDelete(teamID string) error AnalyticsTeamCount(includeDeleted bool) (int64, error) AnalyticsPublicTeamCount() (int64, error) AnalyticsPrivateTeamCount() (int64, error) @@ -97,26 +97,26 @@ type TeamStore interface { SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) UpdateMember(member *model.TeamMember) (*model.TeamMember, error) UpdateMultipleMembers(members []*model.TeamMember) ([]*model.TeamMember, error) - GetMember(teamId string, userId string) (*model.TeamMember, error) - GetMembers(teamId string, offset int, limit int, teamMembersGetOptions *model.TeamMembersGetOptions) ([]*model.TeamMember, error) - GetMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, error) - GetTotalMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, error) - GetActiveMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, error) + GetMember(teamID string, userId string) (*model.TeamMember, error) + GetMembers(teamID string, offset int, limit int, teamMembersGetOptions *model.TeamMembersGetOptions) ([]*model.TeamMember, error) + GetMembersByIds(teamID string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, error) + GetTotalMemberCount(teamID string, restrictions *model.ViewUsersRestrictions) (int64, error) + GetActiveMemberCount(teamID string, restrictions *model.ViewUsersRestrictions) (int64, error) GetTeamsForUser(ctx context.Context, userId string) ([]*model.TeamMember, error) GetTeamsForUserWithPagination(userId string, page, perPage int) ([]*model.TeamMember, error) - GetChannelUnreadsForAllTeams(excludeTeamId, userId string) ([]*model.ChannelUnread, error) - GetChannelUnreadsForTeam(teamId, userId string) ([]*model.ChannelUnread, error) - RemoveMember(teamId string, userId string) error - RemoveMembers(teamId string, userIds []string) error - RemoveAllMembersByTeam(teamId string) error + GetChannelUnreadsForAllTeams(excludeTeamID, userId string) ([]*model.ChannelUnread, error) + GetChannelUnreadsForTeam(teamID, userId string) ([]*model.ChannelUnread, error) + RemoveMember(teamID string, userId string) error + RemoveMembers(teamID string, userIds []string) error + RemoveAllMembersByTeam(teamID string) error RemoveAllMembersByUser(userId string) error - UpdateLastTeamIconUpdate(teamId string, curTime int64) error - GetTeamsByScheme(schemeId string, offset int, limit int) ([]*model.Team, error) - MigrateTeamMembers(fromTeamId string, fromUserId string) (map[string]string, error) + UpdateLastTeamIconUpdate(teamID string, curTime int64) error + GetTeamsByScheme(schemeID string, offset int, limit int) ([]*model.Team, error) + MigrateTeamMembers(fromTeamID string, fromUserId string) (map[string]string, error) ResetAllTeamSchemes() error ClearAllCustomRoleAssignments() error - AnalyticsGetTeamCountForScheme(schemeId string) (int64, error) - GetAllForExportAfter(limit int, afterId string) ([]*model.TeamForExport, error) + AnalyticsGetTeamCountForScheme(schemeID string) (int64, error) + GetAllForExportAfter(limit int, afterID string) ([]*model.TeamForExport, error) GetTeamMembersForExport(userId string) ([]*model.TeamMemberForExport, error) UserBelongsToTeams(userId string, teamIds []string) (bool, error) GetUserTeamIds(userId string, allowFromCache bool) ([]string, error) @@ -136,99 +136,99 @@ type ChannelStore interface { CreateDirectChannel(userId *model.User, otherUserId *model.User) (*model.Channel, error) SaveDirectChannel(channel *model.Channel, member1 *model.ChannelMember, member2 *model.ChannelMember) (*model.Channel, error) Update(channel *model.Channel) (*model.Channel, error) - UpdateSidebarChannelCategoryOnMove(channel *model.Channel, newTeamId string) error - ClearSidebarOnTeamLeave(userId, teamId string) error + UpdateSidebarChannelCategoryOnMove(channel *model.Channel, newTeamID string) error + ClearSidebarOnTeamLeave(userId, teamID string) error Get(id string, allowFromCache bool) (*model.Channel, error) InvalidateChannel(id string) - InvalidateChannelByName(teamId, name string) + InvalidateChannelByName(teamID, name string) GetFromMaster(id string) (*model.Channel, error) - Delete(channelId string, time int64) error - Restore(channelId string, time int64) error - SetDeleteAt(channelId string, deleteAt int64, updateAt int64) error - PermanentDelete(channelId string) error - PermanentDeleteByTeam(teamId string) error + Delete(channelID string, time int64) error + Restore(channelID string, time int64) error + SetDeleteAt(channelID string, deleteAt int64, updateAt int64) error + PermanentDelete(channelID string) error + PermanentDeleteByTeam(teamID string) error GetByName(team_id string, name string, allowFromCache bool) (*model.Channel, error) GetByNames(team_id string, names []string, allowFromCache bool) ([]*model.Channel, error) GetByNameIncludeDeleted(team_id string, name string, allowFromCache bool) (*model.Channel, error) GetDeletedByName(team_id string, name string) (*model.Channel, error) GetDeleted(team_id string, offset int, limit int, userId string) (*model.ChannelList, error) - GetChannels(teamId string, userId string, includeDeleted bool, lastDeleteAt int) (*model.ChannelList, error) + GetChannels(teamID string, userId string, includeDeleted bool, lastDeleteAt int) (*model.ChannelList, error) GetAllChannels(page, perPage int, opts ChannelSearchOpts) (*model.ChannelListWithTeamData, error) GetAllChannelsCount(opts ChannelSearchOpts) (int64, error) - GetMoreChannels(teamId string, userId string, offset int, limit int) (*model.ChannelList, error) - GetPrivateChannelsForTeam(teamId string, offset int, limit int) (*model.ChannelList, error) - GetPublicChannelsForTeam(teamId string, offset int, limit int) (*model.ChannelList, error) - GetPublicChannelsByIdsForTeam(teamId string, channelIds []string) (*model.ChannelList, error) - GetChannelCounts(teamId string, userId string) (*model.ChannelCounts, error) - GetTeamChannels(teamId string) (*model.ChannelList, error) - GetAll(teamId string) ([]*model.Channel, error) + GetMoreChannels(teamID string, userId string, offset int, limit int) (*model.ChannelList, error) + GetPrivateChannelsForTeam(teamID string, offset int, limit int) (*model.ChannelList, error) + GetPublicChannelsForTeam(teamID string, offset int, limit int) (*model.ChannelList, error) + GetPublicChannelsByIdsForTeam(teamID string, channelIds []string) (*model.ChannelList, error) + GetChannelCounts(teamID string, userId string) (*model.ChannelCounts, error) + GetTeamChannels(teamID string) (*model.ChannelList, error) + GetAll(teamID string) ([]*model.Channel, error) GetChannelsByIds(channelIds []string, includeDeleted bool) ([]*model.Channel, error) - GetForPost(postId string) (*model.Channel, error) + GetForPost(postID string) (*model.Channel, error) SaveMultipleMembers(members []*model.ChannelMember) ([]*model.ChannelMember, error) SaveMember(member *model.ChannelMember) (*model.ChannelMember, error) UpdateMember(member *model.ChannelMember) (*model.ChannelMember, error) UpdateMultipleMembers(members []*model.ChannelMember) ([]*model.ChannelMember, error) - GetMembers(channelId string, offset, limit int) (*model.ChannelMembers, error) - GetMember(channelId string, userId string) (*model.ChannelMember, error) - GetChannelMembersTimezones(channelId string) ([]model.StringMap, error) + GetMembers(channelID string, offset, limit int) (*model.ChannelMembers, error) + GetMember(channelID string, userId string) (*model.ChannelMember, error) + GetChannelMembersTimezones(channelID string) ([]model.StringMap, error) GetAllChannelMembersForUser(userId string, allowFromCache bool, includeDeleted bool) (map[string]string, error) InvalidateAllChannelMembersForUser(userId string) - IsUserInChannelUseCache(userId string, channelId string) bool - GetAllChannelMembersNotifyPropsForChannel(channelId string, allowFromCache bool) (map[string]model.StringMap, error) - InvalidateCacheForChannelMembersNotifyProps(channelId string) - GetMemberForPost(postId string, userId string) (*model.ChannelMember, error) - InvalidateMemberCount(channelId string) - GetMemberCountFromCache(channelId string) int64 - GetMemberCount(channelId string, allowFromCache bool) (int64, error) + IsUserInChannelUseCache(userId string, channelID string) bool + GetAllChannelMembersNotifyPropsForChannel(channelID string, allowFromCache bool) (map[string]model.StringMap, error) + InvalidateCacheForChannelMembersNotifyProps(channelID string) + GetMemberForPost(postID string, userId string) (*model.ChannelMember, error) + InvalidateMemberCount(channelID string) + GetMemberCountFromCache(channelID string) int64 + GetMemberCount(channelID string, allowFromCache bool) (int64, error) GetMemberCountsByGroup(channelID string, includeTimezones bool) ([]*model.ChannelMemberCountByGroup, error) - InvalidatePinnedPostCount(channelId string) - GetPinnedPostCount(channelId string, allowFromCache bool) (int64, error) - InvalidateGuestCount(channelId string) - GetGuestCount(channelId string, allowFromCache bool) (int64, error) - GetPinnedPosts(channelId string) (*model.PostList, error) - RemoveMember(channelId string, userId string) error - RemoveMembers(channelId string, userIds []string) error + InvalidatePinnedPostCount(channelID string) + GetPinnedPostCount(channelID string, allowFromCache bool) (int64, error) + InvalidateGuestCount(channelID string) + GetGuestCount(channelID string, allowFromCache bool) (int64, error) + GetPinnedPosts(channelID string) (*model.PostList, error) + RemoveMember(channelID string, userId string) error + RemoveMembers(channelID string, userIds []string) error PermanentDeleteMembersByUser(userId string) error - PermanentDeleteMembersByChannel(channelId string) error + PermanentDeleteMembersByChannel(channelID string) error UpdateLastViewedAt(channelIds []string, userId string, updateThreads bool) (map[string]int64, error) UpdateLastViewedAtPost(unreadPost *model.Post, userID string, mentionCount int, updateThreads bool) (*model.ChannelUnreadAt, error) - CountPostsAfter(channelId string, timestamp int64, userId string) (int, error) - IncrementMentionCount(channelId string, userId string, updateThreads bool) error - AnalyticsTypeCount(teamId string, channelType string) (int64, error) - GetMembersForUser(teamId string, userId string) (*model.ChannelMembers, error) - GetMembersForUserWithPagination(teamId, userId string, page, perPage int) (*model.ChannelMembers, error) - AutocompleteInTeam(teamId string, term string, includeDeleted bool) (*model.ChannelList, error) - AutocompleteInTeamForSearch(teamId string, userId string, term string, includeDeleted bool) (*model.ChannelList, error) + CountPostsAfter(channelID string, timestamp int64, userId string) (int, error) + IncrementMentionCount(channelID string, userId string, updateThreads bool) error + AnalyticsTypeCount(teamID string, channelType string) (int64, error) + GetMembersForUser(teamID string, userId string) (*model.ChannelMembers, error) + GetMembersForUserWithPagination(teamID, userId string, page, perPage int) (*model.ChannelMembers, error) + AutocompleteInTeam(teamID string, term string, includeDeleted bool) (*model.ChannelList, error) + AutocompleteInTeamForSearch(teamID string, userId string, term string, includeDeleted bool) (*model.ChannelList, error) SearchAllChannels(term string, opts ChannelSearchOpts) (*model.ChannelListWithTeamData, int64, error) - SearchInTeam(teamId string, term string, includeDeleted bool) (*model.ChannelList, error) - SearchArchivedInTeam(teamId string, term string, userId string) (*model.ChannelList, error) - SearchForUserInTeam(userId string, teamId string, term string, includeDeleted bool) (*model.ChannelList, error) - SearchMore(userId string, teamId string, term string) (*model.ChannelList, error) + SearchInTeam(teamID string, term string, includeDeleted bool) (*model.ChannelList, error) + SearchArchivedInTeam(teamID string, term string, userId string) (*model.ChannelList, error) + SearchForUserInTeam(userId string, teamID string, term string, includeDeleted bool) (*model.ChannelList, error) + SearchMore(userId string, teamID string, term string) (*model.ChannelList, error) SearchGroupChannels(userId, term string) (*model.ChannelList, error) - GetMembersByIds(channelId string, userIds []string) (*model.ChannelMembers, error) + GetMembersByIds(channelID string, userIds []string) (*model.ChannelMembers, error) GetMembersByChannelIds(channelIds []string, userId string) (*model.ChannelMembers, error) - AnalyticsDeletedTypeCount(teamId string, channelType string) (int64, error) - GetChannelUnread(channelId, userId string) (*model.ChannelUnread, error) + AnalyticsDeletedTypeCount(teamID string, channelType string) (int64, error) + GetChannelUnread(channelID, userId string) (*model.ChannelUnread, error) ClearCaches() - GetChannelsByScheme(schemeId string, offset int, limit int) (model.ChannelList, error) + GetChannelsByScheme(schemeID string, offset int, limit int) (model.ChannelList, error) MigrateChannelMembers(fromChannelId string, fromUserId string) (map[string]string, error) ResetAllChannelSchemes() error ClearAllCustomRoleAssignments() error MigratePublicChannels() error - CreateInitialSidebarCategories(userId, teamId string) error - GetSidebarCategories(userId, teamId string) (*model.OrderedSidebarCategories, error) - GetSidebarCategory(categoryId string) (*model.SidebarCategoryWithChannels, error) - GetSidebarCategoryOrder(userId, teamId string) ([]string, error) - CreateSidebarCategory(userId, teamId string, newCategory *model.SidebarCategoryWithChannels) (*model.SidebarCategoryWithChannels, error) - UpdateSidebarCategoryOrder(userId, teamId string, categoryOrder []string) error - UpdateSidebarCategories(userId, teamId string, categories []*model.SidebarCategoryWithChannels) ([]*model.SidebarCategoryWithChannels, []*model.SidebarCategoryWithChannels, error) + CreateInitialSidebarCategories(userId, teamID string) error + GetSidebarCategories(userId, teamID string) (*model.OrderedSidebarCategories, error) + GetSidebarCategory(categoryID string) (*model.SidebarCategoryWithChannels, error) + GetSidebarCategoryOrder(userId, teamID string) ([]string, error) + CreateSidebarCategory(userId, teamID string, newCategory *model.SidebarCategoryWithChannels) (*model.SidebarCategoryWithChannels, error) + UpdateSidebarCategoryOrder(userId, teamID string, categoryOrder []string) error + UpdateSidebarCategories(userId, teamID string, categories []*model.SidebarCategoryWithChannels) ([]*model.SidebarCategoryWithChannels, []*model.SidebarCategoryWithChannels, error) UpdateSidebarChannelsByPreferences(preferences *model.Preferences) error DeleteSidebarChannelsByPreferences(preferences *model.Preferences) error - DeleteSidebarCategory(categoryId string) error - GetAllChannelsForExportAfter(limit int, afterId string) ([]*model.ChannelForExport, error) - GetAllDirectChannelsForExportAfter(limit int, afterId string) ([]*model.DirectChannelForExport, error) - GetChannelMembersForExport(userId string, teamId string) ([]*model.ChannelMemberForExport, error) - RemoveAllDeactivatedMembers(channelId string) error + DeleteSidebarCategory(categoryID string) error + GetAllChannelsForExportAfter(limit int, afterID string) ([]*model.ChannelForExport, error) + GetAllDirectChannelsForExportAfter(limit int, afterID string) ([]*model.DirectChannelForExport, error) + GetChannelMembersForExport(userId string, teamID string) ([]*model.ChannelMemberForExport, error) + RemoveAllDeactivatedMembers(channelID string) error GetChannelsBatchForIndexing(startTime, endTime int64, limit int) ([]*model.Channel, error) UserBelongsToChannels(userId string, channelIds []string) (bool, error) @@ -241,9 +241,9 @@ type ChannelStore interface { } type ChannelMemberHistoryStore interface { - LogJoinEvent(userId string, channelId string, joinTime int64) error - LogLeaveEvent(userId string, channelId string, leaveTime int64) error - GetUsersInChannelDuring(startTime int64, endTime int64, channelId string) ([]*model.ChannelMemberHistoryResult, error) + LogJoinEvent(userId string, channelID string, joinTime int64) error + LogLeaveEvent(userId string, channelID string, leaveTime int64) error + GetUsersInChannelDuring(startTime int64, endTime int64, channelID string) ([]*model.ChannelMemberHistoryResult, error) PermanentDeleteBatch(endTime int64, limit int64) (int64, error) } type ThreadStore interface { @@ -257,15 +257,15 @@ type ThreadStore interface { GetPosts(threadId string, since int64) ([]*model.Post, error) GetThreadMentionsForUserPerChannel(userId, teamId string) (map[string]int64, error) - MarkAllAsRead(userId, teamId string) error - MarkAsRead(userId, threadId string, timestamp int64) error + MarkAllAsRead(userId, teamID string) error + MarkAsRead(userId, threadID string, timestamp int64) error SaveMembership(membership *model.ThreadMembership) (*model.ThreadMembership, error) UpdateMembership(membership *model.ThreadMembership) (*model.ThreadMembership, error) - GetMembershipsForUser(userId, teamId string) ([]*model.ThreadMembership, error) - GetMembershipForUser(userId, postId string) (*model.ThreadMembership, error) - DeleteMembershipForUser(userId, postId string) error - CreateMembershipIfNeeded(userId, postId string, following, incrementMentions, updateFollowing bool) error + GetMembershipsForUser(userId, teamID string) ([]*model.ThreadMembership, error) + GetMembershipForUser(userId, postID string) (*model.ThreadMembership, error) + DeleteMembershipForUser(userId, postID string) error + CreateMembershipIfNeeded(userId, postID string, following, incrementMentions, updateFollowing bool) error CollectThreadsWithNewerReplies(userId string, channelIds []string, timestamp int64) ([]string, error) UpdateUnreadsByChannel(userId string, changedThreads []string, timestamp int64, updateViewedTimestamp bool) error } @@ -276,28 +276,28 @@ type PostStore interface { Update(newPost *model.Post, oldPost *model.Post) (*model.Post, error) Get(id string, skipFetchThreads, collapsedThreads, collapsedThreadsExtended bool) (*model.PostList, error) GetSingle(id string) (*model.Post, error) - Delete(postId string, time int64, deleteByID string) error + Delete(postID string, time int64, deleteByID string) error PermanentDeleteByUser(userId string) error - PermanentDeleteByChannel(channelId string) error + PermanentDeleteByChannel(channelID string) error GetPosts(options model.GetPostsOptions, allowFromCache bool) (*model.PostList, error) GetFlaggedPosts(userId string, offset int, limit int) (*model.PostList, error) - // @openTracingParams userId, teamId, offset, limit - GetFlaggedPostsForTeam(userId, teamId string, offset int, limit int) (*model.PostList, error) - GetFlaggedPostsForChannel(userId, channelId string, offset int, limit int) (*model.PostList, error) + // @openTracingParams userId, teamID, offset, limit + GetFlaggedPostsForTeam(userId, teamID string, offset int, limit int) (*model.PostList, error) + GetFlaggedPostsForChannel(userId, channelID string, offset int, limit int) (*model.PostList, error) GetPostsBefore(options model.GetPostsOptions) (*model.PostList, error) GetPostsAfter(options model.GetPostsOptions) (*model.PostList, error) GetPostsSince(options model.GetPostsSinceOptions, allowFromCache bool) (*model.PostList, error) - GetPostAfterTime(channelId string, time int64) (*model.Post, error) - GetPostIdAfterTime(channelId string, time int64) (string, error) - GetPostIdBeforeTime(channelId string, time int64) (string, error) - GetEtag(channelId string, allowFromCache bool, collapsedThreads bool) string - Search(teamId string, userId string, params *model.SearchParams) (*model.PostList, error) - AnalyticsUserCountsWithPostsByDay(teamId string) (model.AnalyticsRows, error) + GetPostAfterTime(channelID string, time int64) (*model.Post, error) + GetPostIdAfterTime(channelID string, time int64) (string, error) + GetPostIdBeforeTime(channelID string, time int64) (string, error) + GetEtag(channelID string, allowFromCache bool, collapsedThreads bool) string + Search(teamID string, userId string, params *model.SearchParams) (*model.PostList, error) + AnalyticsUserCountsWithPostsByDay(teamID string) (model.AnalyticsRows, error) AnalyticsPostCountsByDay(options *model.AnalyticsPostCountsOptions) (model.AnalyticsRows, error) - AnalyticsPostCount(teamId string, mustHaveFile bool, mustHaveHashtag bool) (int64, error) + AnalyticsPostCount(teamID string, mustHaveFile bool, mustHaveHashtag bool) (int64, error) ClearCaches() - InvalidateLastPostTimeCache(channelId string) - GetPostsCreatedAt(channelId string, time int64) ([]*model.Post, error) + InvalidateLastPostTimeCache(channelID string) + GetPostsCreatedAt(channelID string, time int64) ([]*model.Post, error) Overwrite(post *model.Post) (*model.Post, error) OverwriteMultiple(posts []*model.Post) ([]*model.Post, int, error) GetPostsByIds(postIds []string) ([]*model.Post, error) @@ -305,10 +305,10 @@ type PostStore interface { PermanentDeleteBatch(endTime int64, limit int64) (int64, error) GetOldest() (*model.Post, error) GetMaxPostSize() int - GetParentsForExportAfter(limit int, afterId string) ([]*model.PostForExport, error) - GetRepliesForExport(parentId string) ([]*model.ReplyForExport, error) - GetDirectPostParentsForExportAfter(limit int, afterId string) ([]*model.DirectPostForExport, error) - SearchPostsInTeamForUser(paramsList []*model.SearchParams, userId, teamId string, page, perPage int) (*model.PostSearchResults, error) + GetParentsForExportAfter(limit int, afterID string) ([]*model.PostForExport, error) + GetRepliesForExport(parentID string) ([]*model.ReplyForExport, error) + GetDirectPostParentsForExportAfter(limit int, afterID string) ([]*model.DirectPostForExport, error) + SearchPostsInTeamForUser(paramsList []*model.SearchParams, userId, teamID string, page, perPage int) (*model.PostSearchResults, error) GetOldestEntityCreationTime() (int64, error) } @@ -327,7 +327,7 @@ type UserStore interface { GetAll() ([]*model.User, error) ClearCaches() InvalidateProfilesInChannelCacheByUser(userId string) - InvalidateProfilesInChannelCache(channelId string) + InvalidateProfilesInChannelCache(channelID string) GetProfilesInChannel(options *model.UserGetOptions) ([]*model.User, error) GetProfilesInChannelByStatus(options *model.UserGetOptions) ([]*model.User, error) GetAllProfilesInChannel(ctx context.Context, channelId string, allowFromCache bool) (map[string]*model.User, error) @@ -344,35 +344,35 @@ type UserStore interface { GetAllUsingAuthService(authService string) ([]*model.User, error) GetAllNotInAuthService(authServices []string) ([]*model.User, error) GetByUsername(username string) (*model.User, error) - GetForLogin(loginId string, allowSignInWithUsername, allowSignInWithEmail bool) (*model.User, error) + GetForLogin(loginID string, allowSignInWithUsername, allowSignInWithEmail bool) (*model.User, error) VerifyEmail(userId, email string) (string, error) GetEtagForAllProfiles() string - GetEtagForProfiles(teamId string) string + GetEtagForProfiles(teamID string) string UpdateFailedPasswordAttempts(userId string, attempts int) error GetSystemAdminProfiles() (map[string]*model.User, error) PermanentDelete(userId string) error AnalyticsActiveCount(time int64, options model.UserCountOptions) (int64, error) AnalyticsActiveCountForPeriod(startTime int64, endTime int64, options model.UserCountOptions) (int64, error) GetUnreadCount(userId string) (int64, error) - GetUnreadCountForChannel(userId string, channelId string) (int64, error) - GetAnyUnreadPostCountForChannel(userId string, channelId string) (int64, error) - GetRecentlyActiveUsersForTeam(teamId string, offset, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) - GetNewUsersForTeam(teamId string, offset, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) - Search(teamId string, term string, options *model.UserSearchOptions) ([]*model.User, error) + GetUnreadCountForChannel(userId string, channelID string) (int64, error) + GetAnyUnreadPostCountForChannel(userId string, channelID string) (int64, error) + GetRecentlyActiveUsersForTeam(teamID string, offset, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) + GetNewUsersForTeam(teamID string, offset, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) + Search(teamID string, term string, options *model.UserSearchOptions) ([]*model.User, error) SearchNotInTeam(notInTeamId string, term string, options *model.UserSearchOptions) ([]*model.User, error) - SearchInChannel(channelId string, term string, options *model.UserSearchOptions) ([]*model.User, error) - SearchNotInChannel(teamId string, channelId string, term string, options *model.UserSearchOptions) ([]*model.User, error) + SearchInChannel(channelID string, term string, options *model.UserSearchOptions) ([]*model.User, error) + SearchNotInChannel(teamID string, channelID string, term string, options *model.UserSearchOptions) ([]*model.User, error) SearchWithoutTeam(term string, options *model.UserSearchOptions) ([]*model.User, error) SearchInGroup(groupID string, term string, options *model.UserSearchOptions) ([]*model.User, error) AnalyticsGetInactiveUsersCount() (int64, error) AnalyticsGetExternalUsers(hostDomain string) (bool, error) AnalyticsGetSystemAdminCount() (int64, error) AnalyticsGetGuestCount() (int64, error) - GetProfilesNotInTeam(teamId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) - GetEtagForProfilesNotInTeam(teamId string) string + GetProfilesNotInTeam(teamID string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) + GetEtagForProfilesNotInTeam(teamID string) string ClearAllCustomRoleAssignments() error InferSystemInstallDate() (int64, error) - GetAllAfter(limit int, afterId string) ([]*model.User, error) + GetAllAfter(limit int, afterID string) ([]*model.User, error) GetUsersBatchForIndexing(startTime, endTime int64, limit int) ([]*model.UserForIndexing, error) Count(options model.UserCountOptions) (int64, error) GetTeamGroupUsers(teamID string) ([]*model.User, error) @@ -380,7 +380,7 @@ type UserStore interface { PromoteGuestToUser(userID string) error DemoteUserToGuest(userID string) (*model.User, error) DeactivateGuests() ([]string, error) - AutocompleteUsersInChannel(teamId, channelId, term string, options *model.UserSearchOptions) (*model.UserAutocompleteInChannel, error) + AutocompleteUsersInChannel(teamID, channelID, term string, options *model.UserSearchOptions) (*model.UserAutocompleteInChannel, error) GetKnownUsers(userID string) ([]string, error) } @@ -393,19 +393,19 @@ type BotStore interface { } type SessionStore interface { - Get(sessionIdOrToken string) (*model.Session, error) + Get(sessionIDOrToken string) (*model.Session, error) Save(session *model.Session) (*model.Session, error) GetSessions(userId string) ([]*model.Session, error) GetSessionsWithActiveDeviceIds(userId string) ([]*model.Session, error) GetSessionsExpired(thresholdMillis int64, mobileOnly bool, unnotifiedOnly bool) ([]*model.Session, error) UpdateExpiredNotify(sessionid string, notified bool) error - Remove(sessionIdOrToken string) error + Remove(sessionIDOrToken string) error RemoveAllSessions() error - PermanentDeleteSessionsByUser(teamId string) error - UpdateExpiresAt(sessionId string, time int64) error - UpdateLastActivityAt(sessionId string, time int64) error + PermanentDeleteSessionsByUser(teamID string) error + UpdateExpiresAt(sessionID string, time int64) error + UpdateLastActivityAt(sessionID string, time int64) error UpdateRoles(userId string, roles string) (string, error) - UpdateDeviceId(id string, deviceId string, expiresAt int64) (string, error) + UpdateDeviceId(id string, deviceID string, expiresAt int64) (string, error) UpdateProps(session *model.Session) error AnalyticsSessionCount() (int64, error) Cleanup(expiryTime int64, batchSize int64) @@ -473,43 +473,43 @@ type WebhookStore interface { GetIncoming(id string, allowFromCache bool) (*model.IncomingWebhook, error) GetIncomingList(offset, limit int) ([]*model.IncomingWebhook, error) GetIncomingListByUser(userId string, offset, limit int) ([]*model.IncomingWebhook, error) - GetIncomingByTeam(teamId string, offset, limit int) ([]*model.IncomingWebhook, error) - GetIncomingByTeamByUser(teamId string, userId string, offset, limit int) ([]*model.IncomingWebhook, error) + GetIncomingByTeam(teamID string, offset, limit int) ([]*model.IncomingWebhook, error) + GetIncomingByTeamByUser(teamID string, userId string, offset, limit int) ([]*model.IncomingWebhook, error) UpdateIncoming(webhook *model.IncomingWebhook) (*model.IncomingWebhook, error) - GetIncomingByChannel(channelId string) ([]*model.IncomingWebhook, error) - DeleteIncoming(webhookId string, time int64) error - PermanentDeleteIncomingByChannel(channelId string) error + GetIncomingByChannel(channelID string) ([]*model.IncomingWebhook, error) + DeleteIncoming(webhookID string, time int64) error + PermanentDeleteIncomingByChannel(channelID string) error PermanentDeleteIncomingByUser(userId string) error SaveOutgoing(webhook *model.OutgoingWebhook) (*model.OutgoingWebhook, error) GetOutgoing(id string) (*model.OutgoingWebhook, error) - GetOutgoingByChannel(channelId string, offset, limit int) ([]*model.OutgoingWebhook, error) - GetOutgoingByChannelByUser(channelId string, userId string, offset, limit int) ([]*model.OutgoingWebhook, error) + GetOutgoingByChannel(channelID string, offset, limit int) ([]*model.OutgoingWebhook, error) + GetOutgoingByChannelByUser(channelID string, userId string, offset, limit int) ([]*model.OutgoingWebhook, error) GetOutgoingList(offset, limit int) ([]*model.OutgoingWebhook, error) GetOutgoingListByUser(userId string, offset, limit int) ([]*model.OutgoingWebhook, error) - GetOutgoingByTeam(teamId string, offset, limit int) ([]*model.OutgoingWebhook, error) - GetOutgoingByTeamByUser(teamId string, userId string, offset, limit int) ([]*model.OutgoingWebhook, error) - DeleteOutgoing(webhookId string, time int64) error - PermanentDeleteOutgoingByChannel(channelId string) error + GetOutgoingByTeam(teamID string, offset, limit int) ([]*model.OutgoingWebhook, error) + GetOutgoingByTeamByUser(teamID string, userId string, offset, limit int) ([]*model.OutgoingWebhook, error) + DeleteOutgoing(webhookID string, time int64) error + PermanentDeleteOutgoingByChannel(channelID string) error PermanentDeleteOutgoingByUser(userId string) error UpdateOutgoing(hook *model.OutgoingWebhook) (*model.OutgoingWebhook, error) - AnalyticsIncomingCount(teamId string) (int64, error) - AnalyticsOutgoingCount(teamId string) (int64, error) + AnalyticsIncomingCount(teamID string) (int64, error) + AnalyticsOutgoingCount(teamID string) (int64, error) InvalidateWebhookCache(webhook string) ClearCaches() } type CommandStore interface { Save(webhook *model.Command) (*model.Command, error) - GetByTrigger(teamId string, trigger string) (*model.Command, error) + GetByTrigger(teamID string, trigger string) (*model.Command, error) Get(id string) (*model.Command, error) - GetByTeam(teamId string) ([]*model.Command, error) - Delete(commandId string, time int64) error - PermanentDeleteByTeam(teamId string) error + GetByTeam(teamID string) ([]*model.Command, error) + Delete(commandID string, time int64) error + PermanentDeleteByTeam(teamID string) error PermanentDeleteByUser(userId string) error Update(hook *model.Command) (*model.Command, error) - AnalyticsCommandCount(teamId string) (int64, error) + AnalyticsCommandCount(teamID string) (int64, error) } type CommandWebhookStore interface { @@ -569,17 +569,17 @@ type FileInfoStore interface { Get(id string) (*model.FileInfo, error) GetByIds(ids []string) ([]*model.FileInfo, error) GetByPath(path string) (*model.FileInfo, error) - GetForPost(postId string, readFromMaster, includeDeleted, allowFromCache bool) ([]*model.FileInfo, error) + GetForPost(postID string, readFromMaster, includeDeleted, allowFromCache bool) ([]*model.FileInfo, error) GetForUser(userId string) ([]*model.FileInfo, error) GetWithOptions(page, perPage int, opt *model.GetFileInfosOptions) ([]*model.FileInfo, error) - InvalidateFileInfosForPostCache(postId string, deleted bool) - AttachToPost(fileId string, postId string, creatorId string) error - DeleteForPost(postId string) (string, error) - PermanentDelete(fileId string) error + InvalidateFileInfosForPostCache(postID string, deleted bool) + AttachToPost(fileID string, postID string, creatorId string) error + DeleteForPost(postID string) (string, error) + PermanentDelete(fileID string) error PermanentDeleteBatch(endTime int64, limit int64) (int64, error) PermanentDeleteByUser(userId string) (int64, error) - SetContent(fileId, content string) error - Search(paramsList []*model.SearchParams, userId, teamId string, page, perPage int) (*model.FileInfoList, error) + SetContent(fileID, content string) error + Search(paramsList []*model.SearchParams, userId, teamID string, page, perPage int) (*model.FileInfoList, error) ClearCaches() } @@ -594,7 +594,7 @@ type UploadSessionStore interface { type ReactionStore interface { Save(reaction *model.Reaction) (*model.Reaction, error) Delete(reaction *model.Reaction) (*model.Reaction, error) - GetForPost(postId string, allowFromCache bool) ([]*model.Reaction, error) + GetForPost(postID string, allowFromCache bool) ([]*model.Reaction, error) DeleteAllWithEmojiName(emojiName string) error PermanentDeleteBatch(endTime int64, limit int64) (int64, error) BulkGetForPosts(postIds []string) ([]*model.Reaction, error) @@ -619,35 +619,35 @@ type JobStore interface { type UserAccessTokenStore interface { Save(token *model.UserAccessToken) (*model.UserAccessToken, error) DeleteAllForUser(userId string) error - Delete(tokenId string) error - Get(tokenId string) (*model.UserAccessToken, error) + Delete(tokenID string) error + Get(tokenID string) (*model.UserAccessToken, error) GetAll(offset int, limit int) ([]*model.UserAccessToken, error) GetByToken(tokenString string) (*model.UserAccessToken, error) GetByUser(userId string, page, perPage int) ([]*model.UserAccessToken, error) Search(term string) ([]*model.UserAccessToken, error) - UpdateTokenEnable(tokenId string) error - UpdateTokenDisable(tokenId string) error + UpdateTokenEnable(tokenID string) error + UpdateTokenDisable(tokenID string) error } type PluginStore interface { SaveOrUpdate(keyVal *model.PluginKeyValue) (*model.PluginKeyValue, error) CompareAndSet(keyVal *model.PluginKeyValue, oldValue []byte) (bool, error) CompareAndDelete(keyVal *model.PluginKeyValue, oldValue []byte) (bool, error) - SetWithOptions(pluginId string, key string, value []byte, options model.PluginKVSetOptions) (bool, error) - Get(pluginId, key string) (*model.PluginKeyValue, error) - Delete(pluginId, key string) error - DeleteAllForPlugin(PluginId string) error + SetWithOptions(pluginID string, key string, value []byte, options model.PluginKVSetOptions) (bool, error) + Get(pluginID, key string) (*model.PluginKeyValue, error) + Delete(pluginID, key string) error + DeleteAllForPlugin(PluginID string) error DeleteAllExpired() error - List(pluginId string, page, perPage int) ([]string, error) + List(pluginID string, page, perPage int) ([]string, error) } type RoleStore interface { Save(role *model.Role) (*model.Role, error) - Get(roleId string) (*model.Role, error) + Get(roleID string) (*model.Role, error) GetAll() ([]*model.Role, error) GetByName(name string) (*model.Role, error) GetByNames(names []string) ([]*model.Role, error) - Delete(roleId string) (*model.Role, error) + Delete(roleID string) (*model.Role, error) PermanentDeleteAll() error // HigherScopedPermissions retrieves the higher-scoped permissions of a list of role names. The higher-scope @@ -664,10 +664,10 @@ type RoleStore interface { type SchemeStore interface { Save(scheme *model.Scheme) (*model.Scheme, error) - Get(schemeId string) (*model.Scheme, error) + Get(schemeID string) (*model.Scheme, error) GetByName(schemeName string) (*model.Scheme, error) GetAllPage(scope string, offset int, limit int) ([]*model.Scheme, error) - Delete(schemeId string) (*model.Scheme, error) + Delete(schemeID string) (*model.Scheme, error) PermanentDeleteAll() error CountByScope(scope string) (int64, error) CountWithoutPermission(scope, permissionID string, roleScope model.RoleScope, roleType model.RoleType) (int64, error) @@ -738,12 +738,12 @@ type GroupStore interface { // ChannelMembersToRemove returns all channel members that should be removed based on group constraints. ChannelMembersToRemove(channelID *string) ([]*model.ChannelMember, error) - GetGroupsByChannel(channelId string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) - CountGroupsByChannel(channelId string, opts model.GroupSearchOpts) (int64, error) + GetGroupsByChannel(channelID string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) + CountGroupsByChannel(channelID string, opts model.GroupSearchOpts) (int64, error) - GetGroupsByTeam(teamId string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) - GetGroupsAssociatedToChannelsByTeam(teamId string, opts model.GroupSearchOpts) (map[string][]*model.GroupWithSchemeAdmin, error) - CountGroupsByTeam(teamId string, opts model.GroupSearchOpts) (int64, error) + GetGroupsByTeam(teamID string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) + GetGroupsAssociatedToChannelsByTeam(teamID string, opts model.GroupSearchOpts) (map[string][]*model.GroupWithSchemeAdmin, error) + CountGroupsByTeam(teamID string, opts model.GroupSearchOpts) (int64, error) GetGroups(page, perPage int, opts model.GroupSearchOpts) ([]*model.Group, error) diff --git a/store/storetest/mocks/ChannelMemberHistoryStore.go b/store/storetest/mocks/ChannelMemberHistoryStore.go index 7f23d7778d..70af87e459 100644 --- a/store/storetest/mocks/ChannelMemberHistoryStore.go +++ b/store/storetest/mocks/ChannelMemberHistoryStore.go @@ -14,13 +14,13 @@ type ChannelMemberHistoryStore struct { mock.Mock } -// GetUsersInChannelDuring provides a mock function with given fields: startTime, endTime, channelId -func (_m *ChannelMemberHistoryStore) GetUsersInChannelDuring(startTime int64, endTime int64, channelId string) ([]*model.ChannelMemberHistoryResult, error) { - ret := _m.Called(startTime, endTime, channelId) +// GetUsersInChannelDuring provides a mock function with given fields: startTime, endTime, channelID +func (_m *ChannelMemberHistoryStore) GetUsersInChannelDuring(startTime int64, endTime int64, channelID string) ([]*model.ChannelMemberHistoryResult, error) { + ret := _m.Called(startTime, endTime, channelID) var r0 []*model.ChannelMemberHistoryResult if rf, ok := ret.Get(0).(func(int64, int64, string) []*model.ChannelMemberHistoryResult); ok { - r0 = rf(startTime, endTime, channelId) + r0 = rf(startTime, endTime, channelID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.ChannelMemberHistoryResult) @@ -29,7 +29,7 @@ func (_m *ChannelMemberHistoryStore) GetUsersInChannelDuring(startTime int64, en var r1 error if rf, ok := ret.Get(1).(func(int64, int64, string) error); ok { - r1 = rf(startTime, endTime, channelId) + r1 = rf(startTime, endTime, channelID) } else { r1 = ret.Error(1) } @@ -37,13 +37,13 @@ func (_m *ChannelMemberHistoryStore) GetUsersInChannelDuring(startTime int64, en return r0, r1 } -// LogJoinEvent provides a mock function with given fields: userId, channelId, joinTime -func (_m *ChannelMemberHistoryStore) LogJoinEvent(userId string, channelId string, joinTime int64) error { - ret := _m.Called(userId, channelId, joinTime) +// LogJoinEvent provides a mock function with given fields: userId, channelID, joinTime +func (_m *ChannelMemberHistoryStore) LogJoinEvent(userId string, channelID string, joinTime int64) error { + ret := _m.Called(userId, channelID, joinTime) var r0 error if rf, ok := ret.Get(0).(func(string, string, int64) error); ok { - r0 = rf(userId, channelId, joinTime) + r0 = rf(userId, channelID, joinTime) } else { r0 = ret.Error(0) } @@ -51,13 +51,13 @@ func (_m *ChannelMemberHistoryStore) LogJoinEvent(userId string, channelId strin return r0 } -// LogLeaveEvent provides a mock function with given fields: userId, channelId, leaveTime -func (_m *ChannelMemberHistoryStore) LogLeaveEvent(userId string, channelId string, leaveTime int64) error { - ret := _m.Called(userId, channelId, leaveTime) +// LogLeaveEvent provides a mock function with given fields: userId, channelID, leaveTime +func (_m *ChannelMemberHistoryStore) LogLeaveEvent(userId string, channelID string, leaveTime int64) error { + ret := _m.Called(userId, channelID, leaveTime) var r0 error if rf, ok := ret.Get(0).(func(string, string, int64) error); ok { - r0 = rf(userId, channelId, leaveTime) + r0 = rf(userId, channelID, leaveTime) } else { r0 = ret.Error(0) } diff --git a/store/storetest/mocks/ChannelStore.go b/store/storetest/mocks/ChannelStore.go index 2304e0082e..8420951365 100644 --- a/store/storetest/mocks/ChannelStore.go +++ b/store/storetest/mocks/ChannelStore.go @@ -15,20 +15,20 @@ type ChannelStore struct { mock.Mock } -// AnalyticsDeletedTypeCount provides a mock function with given fields: teamId, channelType -func (_m *ChannelStore) AnalyticsDeletedTypeCount(teamId string, channelType string) (int64, error) { - ret := _m.Called(teamId, channelType) +// AnalyticsDeletedTypeCount provides a mock function with given fields: teamID, channelType +func (_m *ChannelStore) AnalyticsDeletedTypeCount(teamID string, channelType string) (int64, error) { + ret := _m.Called(teamID, channelType) var r0 int64 if rf, ok := ret.Get(0).(func(string, string) int64); ok { - r0 = rf(teamId, channelType) + r0 = rf(teamID, channelType) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(teamId, channelType) + r1 = rf(teamID, channelType) } else { r1 = ret.Error(1) } @@ -36,20 +36,20 @@ func (_m *ChannelStore) AnalyticsDeletedTypeCount(teamId string, channelType str return r0, r1 } -// AnalyticsTypeCount provides a mock function with given fields: teamId, channelType -func (_m *ChannelStore) AnalyticsTypeCount(teamId string, channelType string) (int64, error) { - ret := _m.Called(teamId, channelType) +// AnalyticsTypeCount provides a mock function with given fields: teamID, channelType +func (_m *ChannelStore) AnalyticsTypeCount(teamID string, channelType string) (int64, error) { + ret := _m.Called(teamID, channelType) var r0 int64 if rf, ok := ret.Get(0).(func(string, string) int64); ok { - r0 = rf(teamId, channelType) + r0 = rf(teamID, channelType) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(teamId, channelType) + r1 = rf(teamID, channelType) } else { r1 = ret.Error(1) } @@ -57,13 +57,13 @@ func (_m *ChannelStore) AnalyticsTypeCount(teamId string, channelType string) (i return r0, r1 } -// AutocompleteInTeam provides a mock function with given fields: teamId, term, includeDeleted -func (_m *ChannelStore) AutocompleteInTeam(teamId string, term string, includeDeleted bool) (*model.ChannelList, error) { - ret := _m.Called(teamId, term, includeDeleted) +// AutocompleteInTeam provides a mock function with given fields: teamID, term, includeDeleted +func (_m *ChannelStore) AutocompleteInTeam(teamID string, term string, includeDeleted bool) (*model.ChannelList, error) { + ret := _m.Called(teamID, term, includeDeleted) var r0 *model.ChannelList if rf, ok := ret.Get(0).(func(string, string, bool) *model.ChannelList); ok { - r0 = rf(teamId, term, includeDeleted) + r0 = rf(teamID, term, includeDeleted) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelList) @@ -72,7 +72,7 @@ func (_m *ChannelStore) AutocompleteInTeam(teamId string, term string, includeDe var r1 error if rf, ok := ret.Get(1).(func(string, string, bool) error); ok { - r1 = rf(teamId, term, includeDeleted) + r1 = rf(teamID, term, includeDeleted) } else { r1 = ret.Error(1) } @@ -80,13 +80,13 @@ func (_m *ChannelStore) AutocompleteInTeam(teamId string, term string, includeDe return r0, r1 } -// AutocompleteInTeamForSearch provides a mock function with given fields: teamId, userId, term, includeDeleted -func (_m *ChannelStore) AutocompleteInTeamForSearch(teamId string, userId string, term string, includeDeleted bool) (*model.ChannelList, error) { - ret := _m.Called(teamId, userId, term, includeDeleted) +// AutocompleteInTeamForSearch provides a mock function with given fields: teamID, userId, term, includeDeleted +func (_m *ChannelStore) AutocompleteInTeamForSearch(teamID string, userId string, term string, includeDeleted bool) (*model.ChannelList, error) { + ret := _m.Called(teamID, userId, term, includeDeleted) var r0 *model.ChannelList if rf, ok := ret.Get(0).(func(string, string, string, bool) *model.ChannelList); ok { - r0 = rf(teamId, userId, term, includeDeleted) + r0 = rf(teamID, userId, term, includeDeleted) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelList) @@ -95,7 +95,7 @@ func (_m *ChannelStore) AutocompleteInTeamForSearch(teamId string, userId string var r1 error if rf, ok := ret.Get(1).(func(string, string, string, bool) error); ok { - r1 = rf(teamId, userId, term, includeDeleted) + r1 = rf(teamID, userId, term, includeDeleted) } else { r1 = ret.Error(1) } @@ -122,13 +122,13 @@ func (_m *ChannelStore) ClearCaches() { _m.Called() } -// ClearSidebarOnTeamLeave provides a mock function with given fields: userId, teamId -func (_m *ChannelStore) ClearSidebarOnTeamLeave(userId string, teamId string) error { - ret := _m.Called(userId, teamId) +// ClearSidebarOnTeamLeave provides a mock function with given fields: userId, teamID +func (_m *ChannelStore) ClearSidebarOnTeamLeave(userId string, teamID string) error { + ret := _m.Called(userId, teamID) var r0 error if rf, ok := ret.Get(0).(func(string, string) error); ok { - r0 = rf(userId, teamId) + r0 = rf(userId, teamID) } else { r0 = ret.Error(0) } @@ -136,20 +136,20 @@ func (_m *ChannelStore) ClearSidebarOnTeamLeave(userId string, teamId string) er return r0 } -// CountPostsAfter provides a mock function with given fields: channelId, timestamp, userId -func (_m *ChannelStore) CountPostsAfter(channelId string, timestamp int64, userId string) (int, error) { - ret := _m.Called(channelId, timestamp, userId) +// CountPostsAfter provides a mock function with given fields: channelID, timestamp, userId +func (_m *ChannelStore) CountPostsAfter(channelID string, timestamp int64, userId string) (int, error) { + ret := _m.Called(channelID, timestamp, userId) var r0 int if rf, ok := ret.Get(0).(func(string, int64, string) int); ok { - r0 = rf(channelId, timestamp, userId) + r0 = rf(channelID, timestamp, userId) } else { r0 = ret.Get(0).(int) } var r1 error if rf, ok := ret.Get(1).(func(string, int64, string) error); ok { - r1 = rf(channelId, timestamp, userId) + r1 = rf(channelID, timestamp, userId) } else { r1 = ret.Error(1) } @@ -180,13 +180,13 @@ func (_m *ChannelStore) CreateDirectChannel(userId *model.User, otherUserId *mod return r0, r1 } -// CreateInitialSidebarCategories provides a mock function with given fields: userId, teamId -func (_m *ChannelStore) CreateInitialSidebarCategories(userId string, teamId string) error { - ret := _m.Called(userId, teamId) +// CreateInitialSidebarCategories provides a mock function with given fields: userId, teamID +func (_m *ChannelStore) CreateInitialSidebarCategories(userId string, teamID string) error { + ret := _m.Called(userId, teamID) var r0 error if rf, ok := ret.Get(0).(func(string, string) error); ok { - r0 = rf(userId, teamId) + r0 = rf(userId, teamID) } else { r0 = ret.Error(0) } @@ -194,13 +194,13 @@ func (_m *ChannelStore) CreateInitialSidebarCategories(userId string, teamId str return r0 } -// CreateSidebarCategory provides a mock function with given fields: userId, teamId, newCategory -func (_m *ChannelStore) CreateSidebarCategory(userId string, teamId string, newCategory *model.SidebarCategoryWithChannels) (*model.SidebarCategoryWithChannels, error) { - ret := _m.Called(userId, teamId, newCategory) +// CreateSidebarCategory provides a mock function with given fields: userId, teamID, newCategory +func (_m *ChannelStore) CreateSidebarCategory(userId string, teamID string, newCategory *model.SidebarCategoryWithChannels) (*model.SidebarCategoryWithChannels, error) { + ret := _m.Called(userId, teamID, newCategory) var r0 *model.SidebarCategoryWithChannels if rf, ok := ret.Get(0).(func(string, string, *model.SidebarCategoryWithChannels) *model.SidebarCategoryWithChannels); ok { - r0 = rf(userId, teamId, newCategory) + r0 = rf(userId, teamID, newCategory) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.SidebarCategoryWithChannels) @@ -209,7 +209,7 @@ func (_m *ChannelStore) CreateSidebarCategory(userId string, teamId string, newC var r1 error if rf, ok := ret.Get(1).(func(string, string, *model.SidebarCategoryWithChannels) error); ok { - r1 = rf(userId, teamId, newCategory) + r1 = rf(userId, teamID, newCategory) } else { r1 = ret.Error(1) } @@ -217,13 +217,13 @@ func (_m *ChannelStore) CreateSidebarCategory(userId string, teamId string, newC return r0, r1 } -// Delete provides a mock function with given fields: channelId, time -func (_m *ChannelStore) Delete(channelId string, time int64) error { - ret := _m.Called(channelId, time) +// Delete provides a mock function with given fields: channelID, time +func (_m *ChannelStore) Delete(channelID string, time int64) error { + ret := _m.Called(channelID, time) var r0 error if rf, ok := ret.Get(0).(func(string, int64) error); ok { - r0 = rf(channelId, time) + r0 = rf(channelID, time) } else { r0 = ret.Error(0) } @@ -231,13 +231,13 @@ func (_m *ChannelStore) Delete(channelId string, time int64) error { return r0 } -// DeleteSidebarCategory provides a mock function with given fields: categoryId -func (_m *ChannelStore) DeleteSidebarCategory(categoryId string) error { - ret := _m.Called(categoryId) +// DeleteSidebarCategory provides a mock function with given fields: categoryID +func (_m *ChannelStore) DeleteSidebarCategory(categoryID string) error { + ret := _m.Called(categoryID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(categoryId) + r0 = rf(categoryID) } else { r0 = ret.Error(0) } @@ -282,13 +282,13 @@ func (_m *ChannelStore) Get(id string, allowFromCache bool) (*model.Channel, err return r0, r1 } -// GetAll provides a mock function with given fields: teamId -func (_m *ChannelStore) GetAll(teamId string) ([]*model.Channel, error) { - ret := _m.Called(teamId) +// GetAll provides a mock function with given fields: teamID +func (_m *ChannelStore) GetAll(teamID string) ([]*model.Channel, error) { + ret := _m.Called(teamID) var r0 []*model.Channel if rf, ok := ret.Get(0).(func(string) []*model.Channel); ok { - r0 = rf(teamId) + r0 = rf(teamID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.Channel) @@ -297,7 +297,7 @@ func (_m *ChannelStore) GetAll(teamId string) ([]*model.Channel, error) { var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(teamId) + r1 = rf(teamID) } else { r1 = ret.Error(1) } @@ -328,13 +328,13 @@ func (_m *ChannelStore) GetAllChannelMembersForUser(userId string, allowFromCach return r0, r1 } -// GetAllChannelMembersNotifyPropsForChannel provides a mock function with given fields: channelId, allowFromCache -func (_m *ChannelStore) GetAllChannelMembersNotifyPropsForChannel(channelId string, allowFromCache bool) (map[string]model.StringMap, error) { - ret := _m.Called(channelId, allowFromCache) +// GetAllChannelMembersNotifyPropsForChannel provides a mock function with given fields: channelID, allowFromCache +func (_m *ChannelStore) GetAllChannelMembersNotifyPropsForChannel(channelID string, allowFromCache bool) (map[string]model.StringMap, error) { + ret := _m.Called(channelID, allowFromCache) var r0 map[string]model.StringMap if rf, ok := ret.Get(0).(func(string, bool) map[string]model.StringMap); ok { - r0 = rf(channelId, allowFromCache) + r0 = rf(channelID, allowFromCache) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(map[string]model.StringMap) @@ -343,7 +343,7 @@ func (_m *ChannelStore) GetAllChannelMembersNotifyPropsForChannel(channelId stri var r1 error if rf, ok := ret.Get(1).(func(string, bool) error); ok { - r1 = rf(channelId, allowFromCache) + r1 = rf(channelID, allowFromCache) } else { r1 = ret.Error(1) } @@ -395,13 +395,13 @@ func (_m *ChannelStore) GetAllChannelsCount(opts store.ChannelSearchOpts) (int64 return r0, r1 } -// GetAllChannelsForExportAfter provides a mock function with given fields: limit, afterId -func (_m *ChannelStore) GetAllChannelsForExportAfter(limit int, afterId string) ([]*model.ChannelForExport, error) { - ret := _m.Called(limit, afterId) +// GetAllChannelsForExportAfter provides a mock function with given fields: limit, afterID +func (_m *ChannelStore) GetAllChannelsForExportAfter(limit int, afterID string) ([]*model.ChannelForExport, error) { + ret := _m.Called(limit, afterID) var r0 []*model.ChannelForExport if rf, ok := ret.Get(0).(func(int, string) []*model.ChannelForExport); ok { - r0 = rf(limit, afterId) + r0 = rf(limit, afterID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.ChannelForExport) @@ -410,7 +410,7 @@ func (_m *ChannelStore) GetAllChannelsForExportAfter(limit int, afterId string) var r1 error if rf, ok := ret.Get(1).(func(int, string) error); ok { - r1 = rf(limit, afterId) + r1 = rf(limit, afterID) } else { r1 = ret.Error(1) } @@ -418,13 +418,13 @@ func (_m *ChannelStore) GetAllChannelsForExportAfter(limit int, afterId string) return r0, r1 } -// GetAllDirectChannelsForExportAfter provides a mock function with given fields: limit, afterId -func (_m *ChannelStore) GetAllDirectChannelsForExportAfter(limit int, afterId string) ([]*model.DirectChannelForExport, error) { - ret := _m.Called(limit, afterId) +// GetAllDirectChannelsForExportAfter provides a mock function with given fields: limit, afterID +func (_m *ChannelStore) GetAllDirectChannelsForExportAfter(limit int, afterID string) ([]*model.DirectChannelForExport, error) { + ret := _m.Called(limit, afterID) var r0 []*model.DirectChannelForExport if rf, ok := ret.Get(0).(func(int, string) []*model.DirectChannelForExport); ok { - r0 = rf(limit, afterId) + r0 = rf(limit, afterID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.DirectChannelForExport) @@ -433,7 +433,7 @@ func (_m *ChannelStore) GetAllDirectChannelsForExportAfter(limit int, afterId st var r1 error if rf, ok := ret.Get(1).(func(int, string) error); ok { - r1 = rf(limit, afterId) + r1 = rf(limit, afterID) } else { r1 = ret.Error(1) } @@ -510,13 +510,13 @@ func (_m *ChannelStore) GetByNames(team_id string, names []string, allowFromCach return r0, r1 } -// GetChannelCounts provides a mock function with given fields: teamId, userId -func (_m *ChannelStore) GetChannelCounts(teamId string, userId string) (*model.ChannelCounts, error) { - ret := _m.Called(teamId, userId) +// GetChannelCounts provides a mock function with given fields: teamID, userId +func (_m *ChannelStore) GetChannelCounts(teamID string, userId string) (*model.ChannelCounts, error) { + ret := _m.Called(teamID, userId) var r0 *model.ChannelCounts if rf, ok := ret.Get(0).(func(string, string) *model.ChannelCounts); ok { - r0 = rf(teamId, userId) + r0 = rf(teamID, userId) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelCounts) @@ -525,7 +525,7 @@ func (_m *ChannelStore) GetChannelCounts(teamId string, userId string) (*model.C var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(teamId, userId) + r1 = rf(teamID, userId) } else { r1 = ret.Error(1) } @@ -533,13 +533,13 @@ func (_m *ChannelStore) GetChannelCounts(teamId string, userId string) (*model.C return r0, r1 } -// GetChannelMembersForExport provides a mock function with given fields: userId, teamId -func (_m *ChannelStore) GetChannelMembersForExport(userId string, teamId string) ([]*model.ChannelMemberForExport, error) { - ret := _m.Called(userId, teamId) +// GetChannelMembersForExport provides a mock function with given fields: userId, teamID +func (_m *ChannelStore) GetChannelMembersForExport(userId string, teamID string) ([]*model.ChannelMemberForExport, error) { + ret := _m.Called(userId, teamID) var r0 []*model.ChannelMemberForExport if rf, ok := ret.Get(0).(func(string, string) []*model.ChannelMemberForExport); ok { - r0 = rf(userId, teamId) + r0 = rf(userId, teamID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.ChannelMemberForExport) @@ -548,7 +548,7 @@ func (_m *ChannelStore) GetChannelMembersForExport(userId string, teamId string) var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(userId, teamId) + r1 = rf(userId, teamID) } else { r1 = ret.Error(1) } @@ -556,13 +556,13 @@ func (_m *ChannelStore) GetChannelMembersForExport(userId string, teamId string) return r0, r1 } -// GetChannelMembersTimezones provides a mock function with given fields: channelId -func (_m *ChannelStore) GetChannelMembersTimezones(channelId string) ([]model.StringMap, error) { - ret := _m.Called(channelId) +// GetChannelMembersTimezones provides a mock function with given fields: channelID +func (_m *ChannelStore) GetChannelMembersTimezones(channelID string) ([]model.StringMap, error) { + ret := _m.Called(channelID) var r0 []model.StringMap if rf, ok := ret.Get(0).(func(string) []model.StringMap); ok { - r0 = rf(channelId) + r0 = rf(channelID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]model.StringMap) @@ -571,7 +571,7 @@ func (_m *ChannelStore) GetChannelMembersTimezones(channelId string) ([]model.St var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(channelId) + r1 = rf(channelID) } else { r1 = ret.Error(1) } @@ -579,13 +579,13 @@ func (_m *ChannelStore) GetChannelMembersTimezones(channelId string) ([]model.St return r0, r1 } -// GetChannelUnread provides a mock function with given fields: channelId, userId -func (_m *ChannelStore) GetChannelUnread(channelId string, userId string) (*model.ChannelUnread, error) { - ret := _m.Called(channelId, userId) +// GetChannelUnread provides a mock function with given fields: channelID, userId +func (_m *ChannelStore) GetChannelUnread(channelID string, userId string) (*model.ChannelUnread, error) { + ret := _m.Called(channelID, userId) var r0 *model.ChannelUnread if rf, ok := ret.Get(0).(func(string, string) *model.ChannelUnread); ok { - r0 = rf(channelId, userId) + r0 = rf(channelID, userId) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelUnread) @@ -594,7 +594,7 @@ func (_m *ChannelStore) GetChannelUnread(channelId string, userId string) (*mode var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(channelId, userId) + r1 = rf(channelID, userId) } else { r1 = ret.Error(1) } @@ -602,13 +602,13 @@ func (_m *ChannelStore) GetChannelUnread(channelId string, userId string) (*mode return r0, r1 } -// GetChannels provides a mock function with given fields: teamId, userId, includeDeleted, lastDeleteAt -func (_m *ChannelStore) GetChannels(teamId string, userId string, includeDeleted bool, lastDeleteAt int) (*model.ChannelList, error) { - ret := _m.Called(teamId, userId, includeDeleted, lastDeleteAt) +// GetChannels provides a mock function with given fields: teamID, userId, includeDeleted, lastDeleteAt +func (_m *ChannelStore) GetChannels(teamID string, userId string, includeDeleted bool, lastDeleteAt int) (*model.ChannelList, error) { + ret := _m.Called(teamID, userId, includeDeleted, lastDeleteAt) var r0 *model.ChannelList if rf, ok := ret.Get(0).(func(string, string, bool, int) *model.ChannelList); ok { - r0 = rf(teamId, userId, includeDeleted, lastDeleteAt) + r0 = rf(teamID, userId, includeDeleted, lastDeleteAt) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelList) @@ -617,7 +617,7 @@ func (_m *ChannelStore) GetChannels(teamId string, userId string, includeDeleted var r1 error if rf, ok := ret.Get(1).(func(string, string, bool, int) error); ok { - r1 = rf(teamId, userId, includeDeleted, lastDeleteAt) + r1 = rf(teamID, userId, includeDeleted, lastDeleteAt) } else { r1 = ret.Error(1) } @@ -671,13 +671,13 @@ func (_m *ChannelStore) GetChannelsByIds(channelIds []string, includeDeleted boo return r0, r1 } -// GetChannelsByScheme provides a mock function with given fields: schemeId, offset, limit -func (_m *ChannelStore) GetChannelsByScheme(schemeId string, offset int, limit int) (model.ChannelList, error) { - ret := _m.Called(schemeId, offset, limit) +// GetChannelsByScheme provides a mock function with given fields: schemeID, offset, limit +func (_m *ChannelStore) GetChannelsByScheme(schemeID string, offset int, limit int) (model.ChannelList, error) { + ret := _m.Called(schemeID, offset, limit) var r0 model.ChannelList if rf, ok := ret.Get(0).(func(string, int, int) model.ChannelList); ok { - r0 = rf(schemeId, offset, limit) + r0 = rf(schemeID, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(model.ChannelList) @@ -686,7 +686,7 @@ func (_m *ChannelStore) GetChannelsByScheme(schemeId string, offset int, limit i var r1 error if rf, ok := ret.Get(1).(func(string, int, int) error); ok { - r1 = rf(schemeId, offset, limit) + r1 = rf(schemeID, offset, limit) } else { r1 = ret.Error(1) } @@ -740,13 +740,13 @@ func (_m *ChannelStore) GetDeletedByName(team_id string, name string) (*model.Ch return r0, r1 } -// GetForPost provides a mock function with given fields: postId -func (_m *ChannelStore) GetForPost(postId string) (*model.Channel, error) { - ret := _m.Called(postId) +// GetForPost provides a mock function with given fields: postID +func (_m *ChannelStore) GetForPost(postID string) (*model.Channel, error) { + ret := _m.Called(postID) var r0 *model.Channel if rf, ok := ret.Get(0).(func(string) *model.Channel); ok { - r0 = rf(postId) + r0 = rf(postID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.Channel) @@ -755,7 +755,7 @@ func (_m *ChannelStore) GetForPost(postId string) (*model.Channel, error) { var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(postId) + r1 = rf(postID) } else { r1 = ret.Error(1) } @@ -786,20 +786,20 @@ func (_m *ChannelStore) GetFromMaster(id string) (*model.Channel, error) { return r0, r1 } -// GetGuestCount provides a mock function with given fields: channelId, allowFromCache -func (_m *ChannelStore) GetGuestCount(channelId string, allowFromCache bool) (int64, error) { - ret := _m.Called(channelId, allowFromCache) +// GetGuestCount provides a mock function with given fields: channelID, allowFromCache +func (_m *ChannelStore) GetGuestCount(channelID string, allowFromCache bool) (int64, error) { + ret := _m.Called(channelID, allowFromCache) var r0 int64 if rf, ok := ret.Get(0).(func(string, bool) int64); ok { - r0 = rf(channelId, allowFromCache) + r0 = rf(channelID, allowFromCache) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string, bool) error); ok { - r1 = rf(channelId, allowFromCache) + r1 = rf(channelID, allowFromCache) } else { r1 = ret.Error(1) } @@ -807,13 +807,13 @@ func (_m *ChannelStore) GetGuestCount(channelId string, allowFromCache bool) (in return r0, r1 } -// GetMember provides a mock function with given fields: channelId, userId -func (_m *ChannelStore) GetMember(channelId string, userId string) (*model.ChannelMember, error) { - ret := _m.Called(channelId, userId) +// GetMember provides a mock function with given fields: channelID, userId +func (_m *ChannelStore) GetMember(channelID string, userId string) (*model.ChannelMember, error) { + ret := _m.Called(channelID, userId) var r0 *model.ChannelMember if rf, ok := ret.Get(0).(func(string, string) *model.ChannelMember); ok { - r0 = rf(channelId, userId) + r0 = rf(channelID, userId) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelMember) @@ -822,7 +822,7 @@ func (_m *ChannelStore) GetMember(channelId string, userId string) (*model.Chann var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(channelId, userId) + r1 = rf(channelID, userId) } else { r1 = ret.Error(1) } @@ -830,20 +830,20 @@ func (_m *ChannelStore) GetMember(channelId string, userId string) (*model.Chann return r0, r1 } -// GetMemberCount provides a mock function with given fields: channelId, allowFromCache -func (_m *ChannelStore) GetMemberCount(channelId string, allowFromCache bool) (int64, error) { - ret := _m.Called(channelId, allowFromCache) +// GetMemberCount provides a mock function with given fields: channelID, allowFromCache +func (_m *ChannelStore) GetMemberCount(channelID string, allowFromCache bool) (int64, error) { + ret := _m.Called(channelID, allowFromCache) var r0 int64 if rf, ok := ret.Get(0).(func(string, bool) int64); ok { - r0 = rf(channelId, allowFromCache) + r0 = rf(channelID, allowFromCache) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string, bool) error); ok { - r1 = rf(channelId, allowFromCache) + r1 = rf(channelID, allowFromCache) } else { r1 = ret.Error(1) } @@ -851,13 +851,13 @@ func (_m *ChannelStore) GetMemberCount(channelId string, allowFromCache bool) (i return r0, r1 } -// GetMemberCountFromCache provides a mock function with given fields: channelId -func (_m *ChannelStore) GetMemberCountFromCache(channelId string) int64 { - ret := _m.Called(channelId) +// GetMemberCountFromCache provides a mock function with given fields: channelID +func (_m *ChannelStore) GetMemberCountFromCache(channelID string) int64 { + ret := _m.Called(channelID) var r0 int64 if rf, ok := ret.Get(0).(func(string) int64); ok { - r0 = rf(channelId) + r0 = rf(channelID) } else { r0 = ret.Get(0).(int64) } @@ -888,13 +888,13 @@ func (_m *ChannelStore) GetMemberCountsByGroup(channelID string, includeTimezone return r0, r1 } -// GetMemberForPost provides a mock function with given fields: postId, userId -func (_m *ChannelStore) GetMemberForPost(postId string, userId string) (*model.ChannelMember, error) { - ret := _m.Called(postId, userId) +// GetMemberForPost provides a mock function with given fields: postID, userId +func (_m *ChannelStore) GetMemberForPost(postID string, userId string) (*model.ChannelMember, error) { + ret := _m.Called(postID, userId) var r0 *model.ChannelMember if rf, ok := ret.Get(0).(func(string, string) *model.ChannelMember); ok { - r0 = rf(postId, userId) + r0 = rf(postID, userId) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelMember) @@ -903,7 +903,7 @@ func (_m *ChannelStore) GetMemberForPost(postId string, userId string) (*model.C var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(postId, userId) + r1 = rf(postID, userId) } else { r1 = ret.Error(1) } @@ -911,13 +911,13 @@ func (_m *ChannelStore) GetMemberForPost(postId string, userId string) (*model.C return r0, r1 } -// GetMembers provides a mock function with given fields: channelId, offset, limit -func (_m *ChannelStore) GetMembers(channelId string, offset int, limit int) (*model.ChannelMembers, error) { - ret := _m.Called(channelId, offset, limit) +// GetMembers provides a mock function with given fields: channelID, offset, limit +func (_m *ChannelStore) GetMembers(channelID string, offset int, limit int) (*model.ChannelMembers, error) { + ret := _m.Called(channelID, offset, limit) var r0 *model.ChannelMembers if rf, ok := ret.Get(0).(func(string, int, int) *model.ChannelMembers); ok { - r0 = rf(channelId, offset, limit) + r0 = rf(channelID, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelMembers) @@ -926,7 +926,7 @@ func (_m *ChannelStore) GetMembers(channelId string, offset int, limit int) (*mo var r1 error if rf, ok := ret.Get(1).(func(string, int, int) error); ok { - r1 = rf(channelId, offset, limit) + r1 = rf(channelID, offset, limit) } else { r1 = ret.Error(1) } @@ -957,13 +957,13 @@ func (_m *ChannelStore) GetMembersByChannelIds(channelIds []string, userId strin return r0, r1 } -// GetMembersByIds provides a mock function with given fields: channelId, userIds -func (_m *ChannelStore) GetMembersByIds(channelId string, userIds []string) (*model.ChannelMembers, error) { - ret := _m.Called(channelId, userIds) +// GetMembersByIds provides a mock function with given fields: channelID, userIds +func (_m *ChannelStore) GetMembersByIds(channelID string, userIds []string) (*model.ChannelMembers, error) { + ret := _m.Called(channelID, userIds) var r0 *model.ChannelMembers if rf, ok := ret.Get(0).(func(string, []string) *model.ChannelMembers); ok { - r0 = rf(channelId, userIds) + r0 = rf(channelID, userIds) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelMembers) @@ -972,7 +972,7 @@ func (_m *ChannelStore) GetMembersByIds(channelId string, userIds []string) (*mo var r1 error if rf, ok := ret.Get(1).(func(string, []string) error); ok { - r1 = rf(channelId, userIds) + r1 = rf(channelID, userIds) } else { r1 = ret.Error(1) } @@ -980,13 +980,13 @@ func (_m *ChannelStore) GetMembersByIds(channelId string, userIds []string) (*mo return r0, r1 } -// GetMembersForUser provides a mock function with given fields: teamId, userId -func (_m *ChannelStore) GetMembersForUser(teamId string, userId string) (*model.ChannelMembers, error) { - ret := _m.Called(teamId, userId) +// GetMembersForUser provides a mock function with given fields: teamID, userId +func (_m *ChannelStore) GetMembersForUser(teamID string, userId string) (*model.ChannelMembers, error) { + ret := _m.Called(teamID, userId) var r0 *model.ChannelMembers if rf, ok := ret.Get(0).(func(string, string) *model.ChannelMembers); ok { - r0 = rf(teamId, userId) + r0 = rf(teamID, userId) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelMembers) @@ -995,7 +995,7 @@ func (_m *ChannelStore) GetMembersForUser(teamId string, userId string) (*model. var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(teamId, userId) + r1 = rf(teamID, userId) } else { r1 = ret.Error(1) } @@ -1003,13 +1003,13 @@ func (_m *ChannelStore) GetMembersForUser(teamId string, userId string) (*model. return r0, r1 } -// GetMembersForUserWithPagination provides a mock function with given fields: teamId, userId, page, perPage -func (_m *ChannelStore) GetMembersForUserWithPagination(teamId string, userId string, page int, perPage int) (*model.ChannelMembers, error) { - ret := _m.Called(teamId, userId, page, perPage) +// GetMembersForUserWithPagination provides a mock function with given fields: teamID, userId, page, perPage +func (_m *ChannelStore) GetMembersForUserWithPagination(teamID string, userId string, page int, perPage int) (*model.ChannelMembers, error) { + ret := _m.Called(teamID, userId, page, perPage) var r0 *model.ChannelMembers if rf, ok := ret.Get(0).(func(string, string, int, int) *model.ChannelMembers); ok { - r0 = rf(teamId, userId, page, perPage) + r0 = rf(teamID, userId, page, perPage) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelMembers) @@ -1018,7 +1018,7 @@ func (_m *ChannelStore) GetMembersForUserWithPagination(teamId string, userId st var r1 error if rf, ok := ret.Get(1).(func(string, string, int, int) error); ok { - r1 = rf(teamId, userId, page, perPage) + r1 = rf(teamID, userId, page, perPage) } else { r1 = ret.Error(1) } @@ -1026,13 +1026,13 @@ func (_m *ChannelStore) GetMembersForUserWithPagination(teamId string, userId st return r0, r1 } -// GetMoreChannels provides a mock function with given fields: teamId, userId, offset, limit -func (_m *ChannelStore) GetMoreChannels(teamId string, userId string, offset int, limit int) (*model.ChannelList, error) { - ret := _m.Called(teamId, userId, offset, limit) +// GetMoreChannels provides a mock function with given fields: teamID, userId, offset, limit +func (_m *ChannelStore) GetMoreChannels(teamID string, userId string, offset int, limit int) (*model.ChannelList, error) { + ret := _m.Called(teamID, userId, offset, limit) var r0 *model.ChannelList if rf, ok := ret.Get(0).(func(string, string, int, int) *model.ChannelList); ok { - r0 = rf(teamId, userId, offset, limit) + r0 = rf(teamID, userId, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelList) @@ -1041,7 +1041,7 @@ func (_m *ChannelStore) GetMoreChannels(teamId string, userId string, offset int var r1 error if rf, ok := ret.Get(1).(func(string, string, int, int) error); ok { - r1 = rf(teamId, userId, offset, limit) + r1 = rf(teamID, userId, offset, limit) } else { r1 = ret.Error(1) } @@ -1049,20 +1049,20 @@ func (_m *ChannelStore) GetMoreChannels(teamId string, userId string, offset int return r0, r1 } -// GetPinnedPostCount provides a mock function with given fields: channelId, allowFromCache -func (_m *ChannelStore) GetPinnedPostCount(channelId string, allowFromCache bool) (int64, error) { - ret := _m.Called(channelId, allowFromCache) +// GetPinnedPostCount provides a mock function with given fields: channelID, allowFromCache +func (_m *ChannelStore) GetPinnedPostCount(channelID string, allowFromCache bool) (int64, error) { + ret := _m.Called(channelID, allowFromCache) var r0 int64 if rf, ok := ret.Get(0).(func(string, bool) int64); ok { - r0 = rf(channelId, allowFromCache) + r0 = rf(channelID, allowFromCache) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string, bool) error); ok { - r1 = rf(channelId, allowFromCache) + r1 = rf(channelID, allowFromCache) } else { r1 = ret.Error(1) } @@ -1070,13 +1070,13 @@ func (_m *ChannelStore) GetPinnedPostCount(channelId string, allowFromCache bool return r0, r1 } -// GetPinnedPosts provides a mock function with given fields: channelId -func (_m *ChannelStore) GetPinnedPosts(channelId string) (*model.PostList, error) { - ret := _m.Called(channelId) +// GetPinnedPosts provides a mock function with given fields: channelID +func (_m *ChannelStore) GetPinnedPosts(channelID string) (*model.PostList, error) { + ret := _m.Called(channelID) var r0 *model.PostList if rf, ok := ret.Get(0).(func(string) *model.PostList); ok { - r0 = rf(channelId) + r0 = rf(channelID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.PostList) @@ -1085,7 +1085,7 @@ func (_m *ChannelStore) GetPinnedPosts(channelId string) (*model.PostList, error var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(channelId) + r1 = rf(channelID) } else { r1 = ret.Error(1) } @@ -1093,13 +1093,13 @@ func (_m *ChannelStore) GetPinnedPosts(channelId string) (*model.PostList, error return r0, r1 } -// GetPrivateChannelsForTeam provides a mock function with given fields: teamId, offset, limit -func (_m *ChannelStore) GetPrivateChannelsForTeam(teamId string, offset int, limit int) (*model.ChannelList, error) { - ret := _m.Called(teamId, offset, limit) +// GetPrivateChannelsForTeam provides a mock function with given fields: teamID, offset, limit +func (_m *ChannelStore) GetPrivateChannelsForTeam(teamID string, offset int, limit int) (*model.ChannelList, error) { + ret := _m.Called(teamID, offset, limit) var r0 *model.ChannelList if rf, ok := ret.Get(0).(func(string, int, int) *model.ChannelList); ok { - r0 = rf(teamId, offset, limit) + r0 = rf(teamID, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelList) @@ -1108,7 +1108,7 @@ func (_m *ChannelStore) GetPrivateChannelsForTeam(teamId string, offset int, lim var r1 error if rf, ok := ret.Get(1).(func(string, int, int) error); ok { - r1 = rf(teamId, offset, limit) + r1 = rf(teamID, offset, limit) } else { r1 = ret.Error(1) } @@ -1116,13 +1116,13 @@ func (_m *ChannelStore) GetPrivateChannelsForTeam(teamId string, offset int, lim return r0, r1 } -// GetPublicChannelsByIdsForTeam provides a mock function with given fields: teamId, channelIds -func (_m *ChannelStore) GetPublicChannelsByIdsForTeam(teamId string, channelIds []string) (*model.ChannelList, error) { - ret := _m.Called(teamId, channelIds) +// GetPublicChannelsByIdsForTeam provides a mock function with given fields: teamID, channelIds +func (_m *ChannelStore) GetPublicChannelsByIdsForTeam(teamID string, channelIds []string) (*model.ChannelList, error) { + ret := _m.Called(teamID, channelIds) var r0 *model.ChannelList if rf, ok := ret.Get(0).(func(string, []string) *model.ChannelList); ok { - r0 = rf(teamId, channelIds) + r0 = rf(teamID, channelIds) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelList) @@ -1131,7 +1131,7 @@ func (_m *ChannelStore) GetPublicChannelsByIdsForTeam(teamId string, channelIds var r1 error if rf, ok := ret.Get(1).(func(string, []string) error); ok { - r1 = rf(teamId, channelIds) + r1 = rf(teamID, channelIds) } else { r1 = ret.Error(1) } @@ -1139,13 +1139,13 @@ func (_m *ChannelStore) GetPublicChannelsByIdsForTeam(teamId string, channelIds return r0, r1 } -// GetPublicChannelsForTeam provides a mock function with given fields: teamId, offset, limit -func (_m *ChannelStore) GetPublicChannelsForTeam(teamId string, offset int, limit int) (*model.ChannelList, error) { - ret := _m.Called(teamId, offset, limit) +// GetPublicChannelsForTeam provides a mock function with given fields: teamID, offset, limit +func (_m *ChannelStore) GetPublicChannelsForTeam(teamID string, offset int, limit int) (*model.ChannelList, error) { + ret := _m.Called(teamID, offset, limit) var r0 *model.ChannelList if rf, ok := ret.Get(0).(func(string, int, int) *model.ChannelList); ok { - r0 = rf(teamId, offset, limit) + r0 = rf(teamID, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelList) @@ -1154,7 +1154,7 @@ func (_m *ChannelStore) GetPublicChannelsForTeam(teamId string, offset int, limi var r1 error if rf, ok := ret.Get(1).(func(string, int, int) error); ok { - r1 = rf(teamId, offset, limit) + r1 = rf(teamID, offset, limit) } else { r1 = ret.Error(1) } @@ -1162,13 +1162,13 @@ func (_m *ChannelStore) GetPublicChannelsForTeam(teamId string, offset int, limi return r0, r1 } -// GetSidebarCategories provides a mock function with given fields: userId, teamId -func (_m *ChannelStore) GetSidebarCategories(userId string, teamId string) (*model.OrderedSidebarCategories, error) { - ret := _m.Called(userId, teamId) +// GetSidebarCategories provides a mock function with given fields: userId, teamID +func (_m *ChannelStore) GetSidebarCategories(userId string, teamID string) (*model.OrderedSidebarCategories, error) { + ret := _m.Called(userId, teamID) var r0 *model.OrderedSidebarCategories if rf, ok := ret.Get(0).(func(string, string) *model.OrderedSidebarCategories); ok { - r0 = rf(userId, teamId) + r0 = rf(userId, teamID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.OrderedSidebarCategories) @@ -1177,7 +1177,7 @@ func (_m *ChannelStore) GetSidebarCategories(userId string, teamId string) (*mod var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(userId, teamId) + r1 = rf(userId, teamID) } else { r1 = ret.Error(1) } @@ -1185,13 +1185,13 @@ func (_m *ChannelStore) GetSidebarCategories(userId string, teamId string) (*mod return r0, r1 } -// GetSidebarCategory provides a mock function with given fields: categoryId -func (_m *ChannelStore) GetSidebarCategory(categoryId string) (*model.SidebarCategoryWithChannels, error) { - ret := _m.Called(categoryId) +// GetSidebarCategory provides a mock function with given fields: categoryID +func (_m *ChannelStore) GetSidebarCategory(categoryID string) (*model.SidebarCategoryWithChannels, error) { + ret := _m.Called(categoryID) var r0 *model.SidebarCategoryWithChannels if rf, ok := ret.Get(0).(func(string) *model.SidebarCategoryWithChannels); ok { - r0 = rf(categoryId) + r0 = rf(categoryID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.SidebarCategoryWithChannels) @@ -1200,7 +1200,7 @@ func (_m *ChannelStore) GetSidebarCategory(categoryId string) (*model.SidebarCat var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(categoryId) + r1 = rf(categoryID) } else { r1 = ret.Error(1) } @@ -1208,13 +1208,13 @@ func (_m *ChannelStore) GetSidebarCategory(categoryId string) (*model.SidebarCat return r0, r1 } -// GetSidebarCategoryOrder provides a mock function with given fields: userId, teamId -func (_m *ChannelStore) GetSidebarCategoryOrder(userId string, teamId string) ([]string, error) { - ret := _m.Called(userId, teamId) +// GetSidebarCategoryOrder provides a mock function with given fields: userId, teamID +func (_m *ChannelStore) GetSidebarCategoryOrder(userId string, teamID string) ([]string, error) { + ret := _m.Called(userId, teamID) var r0 []string if rf, ok := ret.Get(0).(func(string, string) []string); ok { - r0 = rf(userId, teamId) + r0 = rf(userId, teamID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]string) @@ -1223,7 +1223,7 @@ func (_m *ChannelStore) GetSidebarCategoryOrder(userId string, teamId string) ([ var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(userId, teamId) + r1 = rf(userId, teamID) } else { r1 = ret.Error(1) } @@ -1231,13 +1231,13 @@ func (_m *ChannelStore) GetSidebarCategoryOrder(userId string, teamId string) ([ return r0, r1 } -// GetTeamChannels provides a mock function with given fields: teamId -func (_m *ChannelStore) GetTeamChannels(teamId string) (*model.ChannelList, error) { - ret := _m.Called(teamId) +// GetTeamChannels provides a mock function with given fields: teamID +func (_m *ChannelStore) GetTeamChannels(teamID string) (*model.ChannelList, error) { + ret := _m.Called(teamID) var r0 *model.ChannelList if rf, ok := ret.Get(0).(func(string) *model.ChannelList); ok { - r0 = rf(teamId) + r0 = rf(teamID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelList) @@ -1246,7 +1246,7 @@ func (_m *ChannelStore) GetTeamChannels(teamId string) (*model.ChannelList, erro var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(teamId) + r1 = rf(teamID) } else { r1 = ret.Error(1) } @@ -1275,13 +1275,13 @@ func (_m *ChannelStore) GroupSyncedChannelCount() (int64, error) { return r0, r1 } -// IncrementMentionCount provides a mock function with given fields: channelId, userId, updateThreads -func (_m *ChannelStore) IncrementMentionCount(channelId string, userId string, updateThreads bool) error { - ret := _m.Called(channelId, userId, updateThreads) +// IncrementMentionCount provides a mock function with given fields: channelID, userId, updateThreads +func (_m *ChannelStore) IncrementMentionCount(channelID string, userId string, updateThreads bool) error { + ret := _m.Called(channelID, userId, updateThreads) var r0 error if rf, ok := ret.Get(0).(func(string, string, bool) error); ok { - r0 = rf(channelId, userId, updateThreads) + r0 = rf(channelID, userId, updateThreads) } else { r0 = ret.Error(0) } @@ -1294,9 +1294,9 @@ func (_m *ChannelStore) InvalidateAllChannelMembersForUser(userId string) { _m.Called(userId) } -// InvalidateCacheForChannelMembersNotifyProps provides a mock function with given fields: channelId -func (_m *ChannelStore) InvalidateCacheForChannelMembersNotifyProps(channelId string) { - _m.Called(channelId) +// InvalidateCacheForChannelMembersNotifyProps provides a mock function with given fields: channelID +func (_m *ChannelStore) InvalidateCacheForChannelMembersNotifyProps(channelID string) { + _m.Called(channelID) } // InvalidateChannel provides a mock function with given fields: id @@ -1304,33 +1304,33 @@ func (_m *ChannelStore) InvalidateChannel(id string) { _m.Called(id) } -// InvalidateChannelByName provides a mock function with given fields: teamId, name -func (_m *ChannelStore) InvalidateChannelByName(teamId string, name string) { - _m.Called(teamId, name) +// InvalidateChannelByName provides a mock function with given fields: teamID, name +func (_m *ChannelStore) InvalidateChannelByName(teamID string, name string) { + _m.Called(teamID, name) } -// InvalidateGuestCount provides a mock function with given fields: channelId -func (_m *ChannelStore) InvalidateGuestCount(channelId string) { - _m.Called(channelId) +// InvalidateGuestCount provides a mock function with given fields: channelID +func (_m *ChannelStore) InvalidateGuestCount(channelID string) { + _m.Called(channelID) } -// InvalidateMemberCount provides a mock function with given fields: channelId -func (_m *ChannelStore) InvalidateMemberCount(channelId string) { - _m.Called(channelId) +// InvalidateMemberCount provides a mock function with given fields: channelID +func (_m *ChannelStore) InvalidateMemberCount(channelID string) { + _m.Called(channelID) } -// InvalidatePinnedPostCount provides a mock function with given fields: channelId -func (_m *ChannelStore) InvalidatePinnedPostCount(channelId string) { - _m.Called(channelId) +// InvalidatePinnedPostCount provides a mock function with given fields: channelID +func (_m *ChannelStore) InvalidatePinnedPostCount(channelID string) { + _m.Called(channelID) } -// IsUserInChannelUseCache provides a mock function with given fields: userId, channelId -func (_m *ChannelStore) IsUserInChannelUseCache(userId string, channelId string) bool { - ret := _m.Called(userId, channelId) +// IsUserInChannelUseCache provides a mock function with given fields: userId, channelID +func (_m *ChannelStore) IsUserInChannelUseCache(userId string, channelID string) bool { + ret := _m.Called(userId, channelID) var r0 bool if rf, ok := ret.Get(0).(func(string, string) bool); ok { - r0 = rf(userId, channelId) + r0 = rf(userId, channelID) } else { r0 = ret.Get(0).(bool) } @@ -1375,13 +1375,13 @@ func (_m *ChannelStore) MigratePublicChannels() error { return r0 } -// PermanentDelete provides a mock function with given fields: channelId -func (_m *ChannelStore) PermanentDelete(channelId string) error { - ret := _m.Called(channelId) +// PermanentDelete provides a mock function with given fields: channelID +func (_m *ChannelStore) PermanentDelete(channelID string) error { + ret := _m.Called(channelID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(channelId) + r0 = rf(channelID) } else { r0 = ret.Error(0) } @@ -1389,13 +1389,13 @@ func (_m *ChannelStore) PermanentDelete(channelId string) error { return r0 } -// PermanentDeleteByTeam provides a mock function with given fields: teamId -func (_m *ChannelStore) PermanentDeleteByTeam(teamId string) error { - ret := _m.Called(teamId) +// PermanentDeleteByTeam provides a mock function with given fields: teamID +func (_m *ChannelStore) PermanentDeleteByTeam(teamID string) error { + ret := _m.Called(teamID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(teamId) + r0 = rf(teamID) } else { r0 = ret.Error(0) } @@ -1403,13 +1403,13 @@ func (_m *ChannelStore) PermanentDeleteByTeam(teamId string) error { return r0 } -// PermanentDeleteMembersByChannel provides a mock function with given fields: channelId -func (_m *ChannelStore) PermanentDeleteMembersByChannel(channelId string) error { - ret := _m.Called(channelId) +// PermanentDeleteMembersByChannel provides a mock function with given fields: channelID +func (_m *ChannelStore) PermanentDeleteMembersByChannel(channelID string) error { + ret := _m.Called(channelID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(channelId) + r0 = rf(channelID) } else { r0 = ret.Error(0) } @@ -1431,13 +1431,13 @@ func (_m *ChannelStore) PermanentDeleteMembersByUser(userId string) error { return r0 } -// RemoveAllDeactivatedMembers provides a mock function with given fields: channelId -func (_m *ChannelStore) RemoveAllDeactivatedMembers(channelId string) error { - ret := _m.Called(channelId) +// RemoveAllDeactivatedMembers provides a mock function with given fields: channelID +func (_m *ChannelStore) RemoveAllDeactivatedMembers(channelID string) error { + ret := _m.Called(channelID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(channelId) + r0 = rf(channelID) } else { r0 = ret.Error(0) } @@ -1445,13 +1445,13 @@ func (_m *ChannelStore) RemoveAllDeactivatedMembers(channelId string) error { return r0 } -// RemoveMember provides a mock function with given fields: channelId, userId -func (_m *ChannelStore) RemoveMember(channelId string, userId string) error { - ret := _m.Called(channelId, userId) +// RemoveMember provides a mock function with given fields: channelID, userId +func (_m *ChannelStore) RemoveMember(channelID string, userId string) error { + ret := _m.Called(channelID, userId) var r0 error if rf, ok := ret.Get(0).(func(string, string) error); ok { - r0 = rf(channelId, userId) + r0 = rf(channelID, userId) } else { r0 = ret.Error(0) } @@ -1459,13 +1459,13 @@ func (_m *ChannelStore) RemoveMember(channelId string, userId string) error { return r0 } -// RemoveMembers provides a mock function with given fields: channelId, userIds -func (_m *ChannelStore) RemoveMembers(channelId string, userIds []string) error { - ret := _m.Called(channelId, userIds) +// RemoveMembers provides a mock function with given fields: channelID, userIds +func (_m *ChannelStore) RemoveMembers(channelID string, userIds []string) error { + ret := _m.Called(channelID, userIds) var r0 error if rf, ok := ret.Get(0).(func(string, []string) error); ok { - r0 = rf(channelId, userIds) + r0 = rf(channelID, userIds) } else { r0 = ret.Error(0) } @@ -1487,13 +1487,13 @@ func (_m *ChannelStore) ResetAllChannelSchemes() error { return r0 } -// Restore provides a mock function with given fields: channelId, time -func (_m *ChannelStore) Restore(channelId string, time int64) error { - ret := _m.Called(channelId, time) +// Restore provides a mock function with given fields: channelID, time +func (_m *ChannelStore) Restore(channelID string, time int64) error { + ret := _m.Called(channelID, time) var r0 error if rf, ok := ret.Get(0).(func(string, int64) error); ok { - r0 = rf(channelId, time) + r0 = rf(channelID, time) } else { r0 = ret.Error(0) } @@ -1623,13 +1623,13 @@ func (_m *ChannelStore) SearchAllChannels(term string, opts store.ChannelSearchO return r0, r1, r2 } -// SearchArchivedInTeam provides a mock function with given fields: teamId, term, userId -func (_m *ChannelStore) SearchArchivedInTeam(teamId string, term string, userId string) (*model.ChannelList, error) { - ret := _m.Called(teamId, term, userId) +// SearchArchivedInTeam provides a mock function with given fields: teamID, term, userId +func (_m *ChannelStore) SearchArchivedInTeam(teamID string, term string, userId string) (*model.ChannelList, error) { + ret := _m.Called(teamID, term, userId) var r0 *model.ChannelList if rf, ok := ret.Get(0).(func(string, string, string) *model.ChannelList); ok { - r0 = rf(teamId, term, userId) + r0 = rf(teamID, term, userId) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelList) @@ -1638,7 +1638,7 @@ func (_m *ChannelStore) SearchArchivedInTeam(teamId string, term string, userId var r1 error if rf, ok := ret.Get(1).(func(string, string, string) error); ok { - r1 = rf(teamId, term, userId) + r1 = rf(teamID, term, userId) } else { r1 = ret.Error(1) } @@ -1646,13 +1646,13 @@ func (_m *ChannelStore) SearchArchivedInTeam(teamId string, term string, userId return r0, r1 } -// SearchForUserInTeam provides a mock function with given fields: userId, teamId, term, includeDeleted -func (_m *ChannelStore) SearchForUserInTeam(userId string, teamId string, term string, includeDeleted bool) (*model.ChannelList, error) { - ret := _m.Called(userId, teamId, term, includeDeleted) +// SearchForUserInTeam provides a mock function with given fields: userId, teamID, term, includeDeleted +func (_m *ChannelStore) SearchForUserInTeam(userId string, teamID string, term string, includeDeleted bool) (*model.ChannelList, error) { + ret := _m.Called(userId, teamID, term, includeDeleted) var r0 *model.ChannelList if rf, ok := ret.Get(0).(func(string, string, string, bool) *model.ChannelList); ok { - r0 = rf(userId, teamId, term, includeDeleted) + r0 = rf(userId, teamID, term, includeDeleted) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelList) @@ -1661,7 +1661,7 @@ func (_m *ChannelStore) SearchForUserInTeam(userId string, teamId string, term s var r1 error if rf, ok := ret.Get(1).(func(string, string, string, bool) error); ok { - r1 = rf(userId, teamId, term, includeDeleted) + r1 = rf(userId, teamID, term, includeDeleted) } else { r1 = ret.Error(1) } @@ -1692,13 +1692,13 @@ func (_m *ChannelStore) SearchGroupChannels(userId string, term string) (*model. return r0, r1 } -// SearchInTeam provides a mock function with given fields: teamId, term, includeDeleted -func (_m *ChannelStore) SearchInTeam(teamId string, term string, includeDeleted bool) (*model.ChannelList, error) { - ret := _m.Called(teamId, term, includeDeleted) +// SearchInTeam provides a mock function with given fields: teamID, term, includeDeleted +func (_m *ChannelStore) SearchInTeam(teamID string, term string, includeDeleted bool) (*model.ChannelList, error) { + ret := _m.Called(teamID, term, includeDeleted) var r0 *model.ChannelList if rf, ok := ret.Get(0).(func(string, string, bool) *model.ChannelList); ok { - r0 = rf(teamId, term, includeDeleted) + r0 = rf(teamID, term, includeDeleted) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelList) @@ -1707,7 +1707,7 @@ func (_m *ChannelStore) SearchInTeam(teamId string, term string, includeDeleted var r1 error if rf, ok := ret.Get(1).(func(string, string, bool) error); ok { - r1 = rf(teamId, term, includeDeleted) + r1 = rf(teamID, term, includeDeleted) } else { r1 = ret.Error(1) } @@ -1715,13 +1715,13 @@ func (_m *ChannelStore) SearchInTeam(teamId string, term string, includeDeleted return r0, r1 } -// SearchMore provides a mock function with given fields: userId, teamId, term -func (_m *ChannelStore) SearchMore(userId string, teamId string, term string) (*model.ChannelList, error) { - ret := _m.Called(userId, teamId, term) +// SearchMore provides a mock function with given fields: userId, teamID, term +func (_m *ChannelStore) SearchMore(userId string, teamID string, term string) (*model.ChannelList, error) { + ret := _m.Called(userId, teamID, term) var r0 *model.ChannelList if rf, ok := ret.Get(0).(func(string, string, string) *model.ChannelList); ok { - r0 = rf(userId, teamId, term) + r0 = rf(userId, teamID, term) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelList) @@ -1730,7 +1730,7 @@ func (_m *ChannelStore) SearchMore(userId string, teamId string, term string) (* var r1 error if rf, ok := ret.Get(1).(func(string, string, string) error); ok { - r1 = rf(userId, teamId, term) + r1 = rf(userId, teamID, term) } else { r1 = ret.Error(1) } @@ -1738,13 +1738,13 @@ func (_m *ChannelStore) SearchMore(userId string, teamId string, term string) (* return r0, r1 } -// SetDeleteAt provides a mock function with given fields: channelId, deleteAt, updateAt -func (_m *ChannelStore) SetDeleteAt(channelId string, deleteAt int64, updateAt int64) error { - ret := _m.Called(channelId, deleteAt, updateAt) +// SetDeleteAt provides a mock function with given fields: channelID, deleteAt, updateAt +func (_m *ChannelStore) SetDeleteAt(channelID string, deleteAt int64, updateAt int64) error { + ret := _m.Called(channelID, deleteAt, updateAt) var r0 error if rf, ok := ret.Get(0).(func(string, int64, int64) error); ok { - r0 = rf(channelId, deleteAt, updateAt) + r0 = rf(channelID, deleteAt, updateAt) } else { r0 = ret.Error(0) } @@ -1881,13 +1881,13 @@ func (_m *ChannelStore) UpdateMultipleMembers(members []*model.ChannelMember) ([ return r0, r1 } -// UpdateSidebarCategories provides a mock function with given fields: userId, teamId, categories -func (_m *ChannelStore) UpdateSidebarCategories(userId string, teamId string, categories []*model.SidebarCategoryWithChannels) ([]*model.SidebarCategoryWithChannels, []*model.SidebarCategoryWithChannels, error) { - ret := _m.Called(userId, teamId, categories) +// UpdateSidebarCategories provides a mock function with given fields: userId, teamID, categories +func (_m *ChannelStore) UpdateSidebarCategories(userId string, teamID string, categories []*model.SidebarCategoryWithChannels) ([]*model.SidebarCategoryWithChannels, []*model.SidebarCategoryWithChannels, error) { + ret := _m.Called(userId, teamID, categories) var r0 []*model.SidebarCategoryWithChannels if rf, ok := ret.Get(0).(func(string, string, []*model.SidebarCategoryWithChannels) []*model.SidebarCategoryWithChannels); ok { - r0 = rf(userId, teamId, categories) + r0 = rf(userId, teamID, categories) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.SidebarCategoryWithChannels) @@ -1896,7 +1896,7 @@ func (_m *ChannelStore) UpdateSidebarCategories(userId string, teamId string, ca var r1 []*model.SidebarCategoryWithChannels if rf, ok := ret.Get(1).(func(string, string, []*model.SidebarCategoryWithChannels) []*model.SidebarCategoryWithChannels); ok { - r1 = rf(userId, teamId, categories) + r1 = rf(userId, teamID, categories) } else { if ret.Get(1) != nil { r1 = ret.Get(1).([]*model.SidebarCategoryWithChannels) @@ -1905,7 +1905,7 @@ func (_m *ChannelStore) UpdateSidebarCategories(userId string, teamId string, ca var r2 error if rf, ok := ret.Get(2).(func(string, string, []*model.SidebarCategoryWithChannels) error); ok { - r2 = rf(userId, teamId, categories) + r2 = rf(userId, teamID, categories) } else { r2 = ret.Error(2) } @@ -1913,13 +1913,13 @@ func (_m *ChannelStore) UpdateSidebarCategories(userId string, teamId string, ca return r0, r1, r2 } -// UpdateSidebarCategoryOrder provides a mock function with given fields: userId, teamId, categoryOrder -func (_m *ChannelStore) UpdateSidebarCategoryOrder(userId string, teamId string, categoryOrder []string) error { - ret := _m.Called(userId, teamId, categoryOrder) +// UpdateSidebarCategoryOrder provides a mock function with given fields: userId, teamID, categoryOrder +func (_m *ChannelStore) UpdateSidebarCategoryOrder(userId string, teamID string, categoryOrder []string) error { + ret := _m.Called(userId, teamID, categoryOrder) var r0 error if rf, ok := ret.Get(0).(func(string, string, []string) error); ok { - r0 = rf(userId, teamId, categoryOrder) + r0 = rf(userId, teamID, categoryOrder) } else { r0 = ret.Error(0) } @@ -1927,13 +1927,13 @@ func (_m *ChannelStore) UpdateSidebarCategoryOrder(userId string, teamId string, return r0 } -// UpdateSidebarChannelCategoryOnMove provides a mock function with given fields: channel, newTeamId -func (_m *ChannelStore) UpdateSidebarChannelCategoryOnMove(channel *model.Channel, newTeamId string) error { - ret := _m.Called(channel, newTeamId) +// UpdateSidebarChannelCategoryOnMove provides a mock function with given fields: channel, newTeamID +func (_m *ChannelStore) UpdateSidebarChannelCategoryOnMove(channel *model.Channel, newTeamID string) error { + ret := _m.Called(channel, newTeamID) var r0 error if rf, ok := ret.Get(0).(func(*model.Channel, string) error); ok { - r0 = rf(channel, newTeamId) + r0 = rf(channel, newTeamID) } else { r0 = ret.Error(0) } diff --git a/store/storetest/mocks/CommandStore.go b/store/storetest/mocks/CommandStore.go index b17f9f2571..577ddd7589 100644 --- a/store/storetest/mocks/CommandStore.go +++ b/store/storetest/mocks/CommandStore.go @@ -14,20 +14,20 @@ type CommandStore struct { mock.Mock } -// AnalyticsCommandCount provides a mock function with given fields: teamId -func (_m *CommandStore) AnalyticsCommandCount(teamId string) (int64, error) { - ret := _m.Called(teamId) +// AnalyticsCommandCount provides a mock function with given fields: teamID +func (_m *CommandStore) AnalyticsCommandCount(teamID string) (int64, error) { + ret := _m.Called(teamID) var r0 int64 if rf, ok := ret.Get(0).(func(string) int64); ok { - r0 = rf(teamId) + r0 = rf(teamID) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(teamId) + r1 = rf(teamID) } else { r1 = ret.Error(1) } @@ -35,13 +35,13 @@ func (_m *CommandStore) AnalyticsCommandCount(teamId string) (int64, error) { return r0, r1 } -// Delete provides a mock function with given fields: commandId, time -func (_m *CommandStore) Delete(commandId string, time int64) error { - ret := _m.Called(commandId, time) +// Delete provides a mock function with given fields: commandID, time +func (_m *CommandStore) Delete(commandID string, time int64) error { + ret := _m.Called(commandID, time) var r0 error if rf, ok := ret.Get(0).(func(string, int64) error); ok { - r0 = rf(commandId, time) + r0 = rf(commandID, time) } else { r0 = ret.Error(0) } @@ -72,13 +72,13 @@ func (_m *CommandStore) Get(id string) (*model.Command, error) { return r0, r1 } -// GetByTeam provides a mock function with given fields: teamId -func (_m *CommandStore) GetByTeam(teamId string) ([]*model.Command, error) { - ret := _m.Called(teamId) +// GetByTeam provides a mock function with given fields: teamID +func (_m *CommandStore) GetByTeam(teamID string) ([]*model.Command, error) { + ret := _m.Called(teamID) var r0 []*model.Command if rf, ok := ret.Get(0).(func(string) []*model.Command); ok { - r0 = rf(teamId) + r0 = rf(teamID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.Command) @@ -87,7 +87,7 @@ func (_m *CommandStore) GetByTeam(teamId string) ([]*model.Command, error) { var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(teamId) + r1 = rf(teamID) } else { r1 = ret.Error(1) } @@ -95,13 +95,13 @@ func (_m *CommandStore) GetByTeam(teamId string) ([]*model.Command, error) { return r0, r1 } -// GetByTrigger provides a mock function with given fields: teamId, trigger -func (_m *CommandStore) GetByTrigger(teamId string, trigger string) (*model.Command, error) { - ret := _m.Called(teamId, trigger) +// GetByTrigger provides a mock function with given fields: teamID, trigger +func (_m *CommandStore) GetByTrigger(teamID string, trigger string) (*model.Command, error) { + ret := _m.Called(teamID, trigger) var r0 *model.Command if rf, ok := ret.Get(0).(func(string, string) *model.Command); ok { - r0 = rf(teamId, trigger) + r0 = rf(teamID, trigger) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.Command) @@ -110,7 +110,7 @@ func (_m *CommandStore) GetByTrigger(teamId string, trigger string) (*model.Comm var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(teamId, trigger) + r1 = rf(teamID, trigger) } else { r1 = ret.Error(1) } @@ -118,13 +118,13 @@ func (_m *CommandStore) GetByTrigger(teamId string, trigger string) (*model.Comm return r0, r1 } -// PermanentDeleteByTeam provides a mock function with given fields: teamId -func (_m *CommandStore) PermanentDeleteByTeam(teamId string) error { - ret := _m.Called(teamId) +// PermanentDeleteByTeam provides a mock function with given fields: teamID +func (_m *CommandStore) PermanentDeleteByTeam(teamID string) error { + ret := _m.Called(teamID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(teamId) + r0 = rf(teamID) } else { r0 = ret.Error(0) } diff --git a/store/storetest/mocks/FileInfoStore.go b/store/storetest/mocks/FileInfoStore.go index 6e566007ca..7fce35846f 100644 --- a/store/storetest/mocks/FileInfoStore.go +++ b/store/storetest/mocks/FileInfoStore.go @@ -14,13 +14,13 @@ type FileInfoStore struct { mock.Mock } -// AttachToPost provides a mock function with given fields: fileId, postId, creatorId -func (_m *FileInfoStore) AttachToPost(fileId string, postId string, creatorId string) error { - ret := _m.Called(fileId, postId, creatorId) +// AttachToPost provides a mock function with given fields: fileID, postID, creatorId +func (_m *FileInfoStore) AttachToPost(fileID string, postID string, creatorId string) error { + ret := _m.Called(fileID, postID, creatorId) var r0 error if rf, ok := ret.Get(0).(func(string, string, string) error); ok { - r0 = rf(fileId, postId, creatorId) + r0 = rf(fileID, postID, creatorId) } else { r0 = ret.Error(0) } @@ -33,20 +33,20 @@ func (_m *FileInfoStore) ClearCaches() { _m.Called() } -// DeleteForPost provides a mock function with given fields: postId -func (_m *FileInfoStore) DeleteForPost(postId string) (string, error) { - ret := _m.Called(postId) +// DeleteForPost provides a mock function with given fields: postID +func (_m *FileInfoStore) DeleteForPost(postID string) (string, error) { + ret := _m.Called(postID) var r0 string if rf, ok := ret.Get(0).(func(string) string); ok { - r0 = rf(postId) + r0 = rf(postID) } else { r0 = ret.Get(0).(string) } var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(postId) + r1 = rf(postID) } else { r1 = ret.Error(1) } @@ -123,13 +123,13 @@ func (_m *FileInfoStore) GetByPath(path string) (*model.FileInfo, error) { return r0, r1 } -// GetForPost provides a mock function with given fields: postId, readFromMaster, includeDeleted, allowFromCache -func (_m *FileInfoStore) GetForPost(postId string, readFromMaster bool, includeDeleted bool, allowFromCache bool) ([]*model.FileInfo, error) { - ret := _m.Called(postId, readFromMaster, includeDeleted, allowFromCache) +// GetForPost provides a mock function with given fields: postID, readFromMaster, includeDeleted, allowFromCache +func (_m *FileInfoStore) GetForPost(postID string, readFromMaster bool, includeDeleted bool, allowFromCache bool) ([]*model.FileInfo, error) { + ret := _m.Called(postID, readFromMaster, includeDeleted, allowFromCache) var r0 []*model.FileInfo if rf, ok := ret.Get(0).(func(string, bool, bool, bool) []*model.FileInfo); ok { - r0 = rf(postId, readFromMaster, includeDeleted, allowFromCache) + r0 = rf(postID, readFromMaster, includeDeleted, allowFromCache) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.FileInfo) @@ -138,7 +138,7 @@ func (_m *FileInfoStore) GetForPost(postId string, readFromMaster bool, includeD var r1 error if rf, ok := ret.Get(1).(func(string, bool, bool, bool) error); ok { - r1 = rf(postId, readFromMaster, includeDeleted, allowFromCache) + r1 = rf(postID, readFromMaster, includeDeleted, allowFromCache) } else { r1 = ret.Error(1) } @@ -192,18 +192,18 @@ func (_m *FileInfoStore) GetWithOptions(page int, perPage int, opt *model.GetFil return r0, r1 } -// InvalidateFileInfosForPostCache provides a mock function with given fields: postId, deleted -func (_m *FileInfoStore) InvalidateFileInfosForPostCache(postId string, deleted bool) { - _m.Called(postId, deleted) +// InvalidateFileInfosForPostCache provides a mock function with given fields: postID, deleted +func (_m *FileInfoStore) InvalidateFileInfosForPostCache(postID string, deleted bool) { + _m.Called(postID, deleted) } -// PermanentDelete provides a mock function with given fields: fileId -func (_m *FileInfoStore) PermanentDelete(fileId string) error { - ret := _m.Called(fileId) +// PermanentDelete provides a mock function with given fields: fileID +func (_m *FileInfoStore) PermanentDelete(fileID string) error { + ret := _m.Called(fileID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(fileId) + r0 = rf(fileID) } else { r0 = ret.Error(0) } @@ -276,13 +276,13 @@ func (_m *FileInfoStore) Save(info *model.FileInfo) (*model.FileInfo, error) { return r0, r1 } -// Search provides a mock function with given fields: paramsList, userId, teamId, page, perPage -func (_m *FileInfoStore) Search(paramsList []*model.SearchParams, userId string, teamId string, page int, perPage int) (*model.FileInfoList, error) { - ret := _m.Called(paramsList, userId, teamId, page, perPage) +// Search provides a mock function with given fields: paramsList, userId, teamID, page, perPage +func (_m *FileInfoStore) Search(paramsList []*model.SearchParams, userId string, teamID string, page int, perPage int) (*model.FileInfoList, error) { + ret := _m.Called(paramsList, userId, teamID, page, perPage) var r0 *model.FileInfoList if rf, ok := ret.Get(0).(func([]*model.SearchParams, string, string, int, int) *model.FileInfoList); ok { - r0 = rf(paramsList, userId, teamId, page, perPage) + r0 = rf(paramsList, userId, teamID, page, perPage) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.FileInfoList) @@ -291,7 +291,7 @@ func (_m *FileInfoStore) Search(paramsList []*model.SearchParams, userId string, var r1 error if rf, ok := ret.Get(1).(func([]*model.SearchParams, string, string, int, int) error); ok { - r1 = rf(paramsList, userId, teamId, page, perPage) + r1 = rf(paramsList, userId, teamID, page, perPage) } else { r1 = ret.Error(1) } @@ -299,13 +299,13 @@ func (_m *FileInfoStore) Search(paramsList []*model.SearchParams, userId string, return r0, r1 } -// SetContent provides a mock function with given fields: fileId, content -func (_m *FileInfoStore) SetContent(fileId string, content string) error { - ret := _m.Called(fileId, content) +// SetContent provides a mock function with given fields: fileID, content +func (_m *FileInfoStore) SetContent(fileID string, content string) error { + ret := _m.Called(fileID, content) var r0 error if rf, ok := ret.Get(0).(func(string, string) error); ok { - r0 = rf(fileId, content) + r0 = rf(fileID, content) } else { r0 = ret.Error(0) } diff --git a/store/storetest/mocks/GroupStore.go b/store/storetest/mocks/GroupStore.go index db3790c7de..707c4a6aa5 100644 --- a/store/storetest/mocks/GroupStore.go +++ b/store/storetest/mocks/GroupStore.go @@ -127,20 +127,20 @@ func (_m *GroupStore) CountChannelMembersMinusGroupMembers(channelID string, gro return r0, r1 } -// CountGroupsByChannel provides a mock function with given fields: channelId, opts -func (_m *GroupStore) CountGroupsByChannel(channelId string, opts model.GroupSearchOpts) (int64, error) { - ret := _m.Called(channelId, opts) +// CountGroupsByChannel provides a mock function with given fields: channelID, opts +func (_m *GroupStore) CountGroupsByChannel(channelID string, opts model.GroupSearchOpts) (int64, error) { + ret := _m.Called(channelID, opts) var r0 int64 if rf, ok := ret.Get(0).(func(string, model.GroupSearchOpts) int64); ok { - r0 = rf(channelId, opts) + r0 = rf(channelID, opts) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string, model.GroupSearchOpts) error); ok { - r1 = rf(channelId, opts) + r1 = rf(channelID, opts) } else { r1 = ret.Error(1) } @@ -148,20 +148,20 @@ func (_m *GroupStore) CountGroupsByChannel(channelId string, opts model.GroupSea return r0, r1 } -// CountGroupsByTeam provides a mock function with given fields: teamId, opts -func (_m *GroupStore) CountGroupsByTeam(teamId string, opts model.GroupSearchOpts) (int64, error) { - ret := _m.Called(teamId, opts) +// CountGroupsByTeam provides a mock function with given fields: teamID, opts +func (_m *GroupStore) CountGroupsByTeam(teamID string, opts model.GroupSearchOpts) (int64, error) { + ret := _m.Called(teamID, opts) var r0 int64 if rf, ok := ret.Get(0).(func(string, model.GroupSearchOpts) int64); ok { - r0 = rf(teamId, opts) + r0 = rf(teamID, opts) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string, model.GroupSearchOpts) error); ok { - r1 = rf(teamId, opts) + r1 = rf(teamID, opts) } else { r1 = ret.Error(1) } @@ -533,13 +533,13 @@ func (_m *GroupStore) GetGroups(page int, perPage int, opts model.GroupSearchOpt return r0, r1 } -// GetGroupsAssociatedToChannelsByTeam provides a mock function with given fields: teamId, opts -func (_m *GroupStore) GetGroupsAssociatedToChannelsByTeam(teamId string, opts model.GroupSearchOpts) (map[string][]*model.GroupWithSchemeAdmin, error) { - ret := _m.Called(teamId, opts) +// GetGroupsAssociatedToChannelsByTeam provides a mock function with given fields: teamID, opts +func (_m *GroupStore) GetGroupsAssociatedToChannelsByTeam(teamID string, opts model.GroupSearchOpts) (map[string][]*model.GroupWithSchemeAdmin, error) { + ret := _m.Called(teamID, opts) var r0 map[string][]*model.GroupWithSchemeAdmin if rf, ok := ret.Get(0).(func(string, model.GroupSearchOpts) map[string][]*model.GroupWithSchemeAdmin); ok { - r0 = rf(teamId, opts) + r0 = rf(teamID, opts) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(map[string][]*model.GroupWithSchemeAdmin) @@ -548,7 +548,7 @@ func (_m *GroupStore) GetGroupsAssociatedToChannelsByTeam(teamId string, opts mo var r1 error if rf, ok := ret.Get(1).(func(string, model.GroupSearchOpts) error); ok { - r1 = rf(teamId, opts) + r1 = rf(teamID, opts) } else { r1 = ret.Error(1) } @@ -556,13 +556,13 @@ func (_m *GroupStore) GetGroupsAssociatedToChannelsByTeam(teamId string, opts mo return r0, r1 } -// GetGroupsByChannel provides a mock function with given fields: channelId, opts -func (_m *GroupStore) GetGroupsByChannel(channelId string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) { - ret := _m.Called(channelId, opts) +// GetGroupsByChannel provides a mock function with given fields: channelID, opts +func (_m *GroupStore) GetGroupsByChannel(channelID string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) { + ret := _m.Called(channelID, opts) var r0 []*model.GroupWithSchemeAdmin if rf, ok := ret.Get(0).(func(string, model.GroupSearchOpts) []*model.GroupWithSchemeAdmin); ok { - r0 = rf(channelId, opts) + r0 = rf(channelID, opts) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.GroupWithSchemeAdmin) @@ -571,7 +571,7 @@ func (_m *GroupStore) GetGroupsByChannel(channelId string, opts model.GroupSearc var r1 error if rf, ok := ret.Get(1).(func(string, model.GroupSearchOpts) error); ok { - r1 = rf(channelId, opts) + r1 = rf(channelID, opts) } else { r1 = ret.Error(1) } @@ -579,13 +579,13 @@ func (_m *GroupStore) GetGroupsByChannel(channelId string, opts model.GroupSearc return r0, r1 } -// GetGroupsByTeam provides a mock function with given fields: teamId, opts -func (_m *GroupStore) GetGroupsByTeam(teamId string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) { - ret := _m.Called(teamId, opts) +// GetGroupsByTeam provides a mock function with given fields: teamID, opts +func (_m *GroupStore) GetGroupsByTeam(teamID string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) { + ret := _m.Called(teamID, opts) var r0 []*model.GroupWithSchemeAdmin if rf, ok := ret.Get(0).(func(string, model.GroupSearchOpts) []*model.GroupWithSchemeAdmin); ok { - r0 = rf(teamId, opts) + r0 = rf(teamID, opts) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.GroupWithSchemeAdmin) @@ -594,7 +594,7 @@ func (_m *GroupStore) GetGroupsByTeam(teamId string, opts model.GroupSearchOpts) var r1 error if rf, ok := ret.Get(1).(func(string, model.GroupSearchOpts) error); ok { - r1 = rf(teamId, opts) + r1 = rf(teamID, opts) } else { r1 = ret.Error(1) } diff --git a/store/storetest/mocks/PluginStore.go b/store/storetest/mocks/PluginStore.go index 14c564d687..8641a88a58 100644 --- a/store/storetest/mocks/PluginStore.go +++ b/store/storetest/mocks/PluginStore.go @@ -56,13 +56,13 @@ func (_m *PluginStore) CompareAndSet(keyVal *model.PluginKeyValue, oldValue []by return r0, r1 } -// Delete provides a mock function with given fields: pluginId, key -func (_m *PluginStore) Delete(pluginId string, key string) error { - ret := _m.Called(pluginId, key) +// Delete provides a mock function with given fields: pluginID, key +func (_m *PluginStore) Delete(pluginID string, key string) error { + ret := _m.Called(pluginID, key) var r0 error if rf, ok := ret.Get(0).(func(string, string) error); ok { - r0 = rf(pluginId, key) + r0 = rf(pluginID, key) } else { r0 = ret.Error(0) } @@ -84,13 +84,13 @@ func (_m *PluginStore) DeleteAllExpired() error { return r0 } -// DeleteAllForPlugin provides a mock function with given fields: PluginId -func (_m *PluginStore) DeleteAllForPlugin(PluginId string) error { - ret := _m.Called(PluginId) +// DeleteAllForPlugin provides a mock function with given fields: PluginID +func (_m *PluginStore) DeleteAllForPlugin(PluginID string) error { + ret := _m.Called(PluginID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(PluginId) + r0 = rf(PluginID) } else { r0 = ret.Error(0) } @@ -98,13 +98,13 @@ func (_m *PluginStore) DeleteAllForPlugin(PluginId string) error { return r0 } -// Get provides a mock function with given fields: pluginId, key -func (_m *PluginStore) Get(pluginId string, key string) (*model.PluginKeyValue, error) { - ret := _m.Called(pluginId, key) +// Get provides a mock function with given fields: pluginID, key +func (_m *PluginStore) Get(pluginID string, key string) (*model.PluginKeyValue, error) { + ret := _m.Called(pluginID, key) var r0 *model.PluginKeyValue if rf, ok := ret.Get(0).(func(string, string) *model.PluginKeyValue); ok { - r0 = rf(pluginId, key) + r0 = rf(pluginID, key) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.PluginKeyValue) @@ -113,7 +113,7 @@ func (_m *PluginStore) Get(pluginId string, key string) (*model.PluginKeyValue, var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(pluginId, key) + r1 = rf(pluginID, key) } else { r1 = ret.Error(1) } @@ -121,13 +121,13 @@ func (_m *PluginStore) Get(pluginId string, key string) (*model.PluginKeyValue, return r0, r1 } -// List provides a mock function with given fields: pluginId, page, perPage -func (_m *PluginStore) List(pluginId string, page int, perPage int) ([]string, error) { - ret := _m.Called(pluginId, page, perPage) +// List provides a mock function with given fields: pluginID, page, perPage +func (_m *PluginStore) List(pluginID string, page int, perPage int) ([]string, error) { + ret := _m.Called(pluginID, page, perPage) var r0 []string if rf, ok := ret.Get(0).(func(string, int, int) []string); ok { - r0 = rf(pluginId, page, perPage) + r0 = rf(pluginID, page, perPage) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]string) @@ -136,7 +136,7 @@ func (_m *PluginStore) List(pluginId string, page int, perPage int) ([]string, e var r1 error if rf, ok := ret.Get(1).(func(string, int, int) error); ok { - r1 = rf(pluginId, page, perPage) + r1 = rf(pluginID, page, perPage) } else { r1 = ret.Error(1) } @@ -167,20 +167,20 @@ func (_m *PluginStore) SaveOrUpdate(keyVal *model.PluginKeyValue) (*model.Plugin return r0, r1 } -// SetWithOptions provides a mock function with given fields: pluginId, key, value, options -func (_m *PluginStore) SetWithOptions(pluginId string, key string, value []byte, options model.PluginKVSetOptions) (bool, error) { - ret := _m.Called(pluginId, key, value, options) +// SetWithOptions provides a mock function with given fields: pluginID, key, value, options +func (_m *PluginStore) SetWithOptions(pluginID string, key string, value []byte, options model.PluginKVSetOptions) (bool, error) { + ret := _m.Called(pluginID, key, value, options) var r0 bool if rf, ok := ret.Get(0).(func(string, string, []byte, model.PluginKVSetOptions) bool); ok { - r0 = rf(pluginId, key, value, options) + r0 = rf(pluginID, key, value, options) } else { r0 = ret.Get(0).(bool) } var r1 error if rf, ok := ret.Get(1).(func(string, string, []byte, model.PluginKVSetOptions) error); ok { - r1 = rf(pluginId, key, value, options) + r1 = rf(pluginID, key, value, options) } else { r1 = ret.Error(1) } diff --git a/store/storetest/mocks/PostStore.go b/store/storetest/mocks/PostStore.go index ac451738e0..47257ef37e 100644 --- a/store/storetest/mocks/PostStore.go +++ b/store/storetest/mocks/PostStore.go @@ -14,20 +14,20 @@ type PostStore struct { mock.Mock } -// AnalyticsPostCount provides a mock function with given fields: teamId, mustHaveFile, mustHaveHashtag -func (_m *PostStore) AnalyticsPostCount(teamId string, mustHaveFile bool, mustHaveHashtag bool) (int64, error) { - ret := _m.Called(teamId, mustHaveFile, mustHaveHashtag) +// AnalyticsPostCount provides a mock function with given fields: teamID, mustHaveFile, mustHaveHashtag +func (_m *PostStore) AnalyticsPostCount(teamID string, mustHaveFile bool, mustHaveHashtag bool) (int64, error) { + ret := _m.Called(teamID, mustHaveFile, mustHaveHashtag) var r0 int64 if rf, ok := ret.Get(0).(func(string, bool, bool) int64); ok { - r0 = rf(teamId, mustHaveFile, mustHaveHashtag) + r0 = rf(teamID, mustHaveFile, mustHaveHashtag) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string, bool, bool) error); ok { - r1 = rf(teamId, mustHaveFile, mustHaveHashtag) + r1 = rf(teamID, mustHaveFile, mustHaveHashtag) } else { r1 = ret.Error(1) } @@ -58,13 +58,13 @@ func (_m *PostStore) AnalyticsPostCountsByDay(options *model.AnalyticsPostCounts return r0, r1 } -// AnalyticsUserCountsWithPostsByDay provides a mock function with given fields: teamId -func (_m *PostStore) AnalyticsUserCountsWithPostsByDay(teamId string) (model.AnalyticsRows, error) { - ret := _m.Called(teamId) +// AnalyticsUserCountsWithPostsByDay provides a mock function with given fields: teamID +func (_m *PostStore) AnalyticsUserCountsWithPostsByDay(teamID string) (model.AnalyticsRows, error) { + ret := _m.Called(teamID) var r0 model.AnalyticsRows if rf, ok := ret.Get(0).(func(string) model.AnalyticsRows); ok { - r0 = rf(teamId) + r0 = rf(teamID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(model.AnalyticsRows) @@ -73,7 +73,7 @@ func (_m *PostStore) AnalyticsUserCountsWithPostsByDay(teamId string) (model.Ana var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(teamId) + r1 = rf(teamID) } else { r1 = ret.Error(1) } @@ -86,13 +86,13 @@ func (_m *PostStore) ClearCaches() { _m.Called() } -// Delete provides a mock function with given fields: postId, time, deleteByID -func (_m *PostStore) Delete(postId string, time int64, deleteByID string) error { - ret := _m.Called(postId, time, deleteByID) +// Delete provides a mock function with given fields: postID, time, deleteByID +func (_m *PostStore) Delete(postID string, time int64, deleteByID string) error { + ret := _m.Called(postID, time, deleteByID) var r0 error if rf, ok := ret.Get(0).(func(string, int64, string) error); ok { - r0 = rf(postId, time, deleteByID) + r0 = rf(postID, time, deleteByID) } else { r0 = ret.Error(0) } @@ -123,13 +123,13 @@ func (_m *PostStore) Get(id string, skipFetchThreads bool, collapsedThreads bool return r0, r1 } -// GetDirectPostParentsForExportAfter provides a mock function with given fields: limit, afterId -func (_m *PostStore) GetDirectPostParentsForExportAfter(limit int, afterId string) ([]*model.DirectPostForExport, error) { - ret := _m.Called(limit, afterId) +// GetDirectPostParentsForExportAfter provides a mock function with given fields: limit, afterID +func (_m *PostStore) GetDirectPostParentsForExportAfter(limit int, afterID string) ([]*model.DirectPostForExport, error) { + ret := _m.Called(limit, afterID) var r0 []*model.DirectPostForExport if rf, ok := ret.Get(0).(func(int, string) []*model.DirectPostForExport); ok { - r0 = rf(limit, afterId) + r0 = rf(limit, afterID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.DirectPostForExport) @@ -138,7 +138,7 @@ func (_m *PostStore) GetDirectPostParentsForExportAfter(limit int, afterId strin var r1 error if rf, ok := ret.Get(1).(func(int, string) error); ok { - r1 = rf(limit, afterId) + r1 = rf(limit, afterID) } else { r1 = ret.Error(1) } @@ -146,13 +146,13 @@ func (_m *PostStore) GetDirectPostParentsForExportAfter(limit int, afterId strin return r0, r1 } -// GetEtag provides a mock function with given fields: channelId, allowFromCache, collapsedThreads -func (_m *PostStore) GetEtag(channelId string, allowFromCache bool, collapsedThreads bool) string { - ret := _m.Called(channelId, allowFromCache, collapsedThreads) +// GetEtag provides a mock function with given fields: channelID, allowFromCache, collapsedThreads +func (_m *PostStore) GetEtag(channelID string, allowFromCache bool, collapsedThreads bool) string { + ret := _m.Called(channelID, allowFromCache, collapsedThreads) var r0 string if rf, ok := ret.Get(0).(func(string, bool, bool) string); ok { - r0 = rf(channelId, allowFromCache, collapsedThreads) + r0 = rf(channelID, allowFromCache, collapsedThreads) } else { r0 = ret.Get(0).(string) } @@ -183,13 +183,13 @@ func (_m *PostStore) GetFlaggedPosts(userId string, offset int, limit int) (*mod return r0, r1 } -// GetFlaggedPostsForChannel provides a mock function with given fields: userId, channelId, offset, limit -func (_m *PostStore) GetFlaggedPostsForChannel(userId string, channelId string, offset int, limit int) (*model.PostList, error) { - ret := _m.Called(userId, channelId, offset, limit) +// GetFlaggedPostsForChannel provides a mock function with given fields: userId, channelID, offset, limit +func (_m *PostStore) GetFlaggedPostsForChannel(userId string, channelID string, offset int, limit int) (*model.PostList, error) { + ret := _m.Called(userId, channelID, offset, limit) var r0 *model.PostList if rf, ok := ret.Get(0).(func(string, string, int, int) *model.PostList); ok { - r0 = rf(userId, channelId, offset, limit) + r0 = rf(userId, channelID, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.PostList) @@ -198,7 +198,7 @@ func (_m *PostStore) GetFlaggedPostsForChannel(userId string, channelId string, var r1 error if rf, ok := ret.Get(1).(func(string, string, int, int) error); ok { - r1 = rf(userId, channelId, offset, limit) + r1 = rf(userId, channelID, offset, limit) } else { r1 = ret.Error(1) } @@ -206,13 +206,13 @@ func (_m *PostStore) GetFlaggedPostsForChannel(userId string, channelId string, return r0, r1 } -// GetFlaggedPostsForTeam provides a mock function with given fields: userId, teamId, offset, limit -func (_m *PostStore) GetFlaggedPostsForTeam(userId string, teamId string, offset int, limit int) (*model.PostList, error) { - ret := _m.Called(userId, teamId, offset, limit) +// GetFlaggedPostsForTeam provides a mock function with given fields: userId, teamID, offset, limit +func (_m *PostStore) GetFlaggedPostsForTeam(userId string, teamID string, offset int, limit int) (*model.PostList, error) { + ret := _m.Called(userId, teamID, offset, limit) var r0 *model.PostList if rf, ok := ret.Get(0).(func(string, string, int, int) *model.PostList); ok { - r0 = rf(userId, teamId, offset, limit) + r0 = rf(userId, teamID, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.PostList) @@ -221,7 +221,7 @@ func (_m *PostStore) GetFlaggedPostsForTeam(userId string, teamId string, offset var r1 error if rf, ok := ret.Get(1).(func(string, string, int, int) error); ok { - r1 = rf(userId, teamId, offset, limit) + r1 = rf(userId, teamID, offset, limit) } else { r1 = ret.Error(1) } @@ -287,13 +287,13 @@ func (_m *PostStore) GetOldestEntityCreationTime() (int64, error) { return r0, r1 } -// GetParentsForExportAfter provides a mock function with given fields: limit, afterId -func (_m *PostStore) GetParentsForExportAfter(limit int, afterId string) ([]*model.PostForExport, error) { - ret := _m.Called(limit, afterId) +// GetParentsForExportAfter provides a mock function with given fields: limit, afterID +func (_m *PostStore) GetParentsForExportAfter(limit int, afterID string) ([]*model.PostForExport, error) { + ret := _m.Called(limit, afterID) var r0 []*model.PostForExport if rf, ok := ret.Get(0).(func(int, string) []*model.PostForExport); ok { - r0 = rf(limit, afterId) + r0 = rf(limit, afterID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.PostForExport) @@ -302,7 +302,7 @@ func (_m *PostStore) GetParentsForExportAfter(limit int, afterId string) ([]*mod var r1 error if rf, ok := ret.Get(1).(func(int, string) error); ok { - r1 = rf(limit, afterId) + r1 = rf(limit, afterID) } else { r1 = ret.Error(1) } @@ -310,13 +310,13 @@ func (_m *PostStore) GetParentsForExportAfter(limit int, afterId string) ([]*mod return r0, r1 } -// GetPostAfterTime provides a mock function with given fields: channelId, time -func (_m *PostStore) GetPostAfterTime(channelId string, time int64) (*model.Post, error) { - ret := _m.Called(channelId, time) +// GetPostAfterTime provides a mock function with given fields: channelID, time +func (_m *PostStore) GetPostAfterTime(channelID string, time int64) (*model.Post, error) { + ret := _m.Called(channelID, time) var r0 *model.Post if rf, ok := ret.Get(0).(func(string, int64) *model.Post); ok { - r0 = rf(channelId, time) + r0 = rf(channelID, time) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.Post) @@ -325,7 +325,7 @@ func (_m *PostStore) GetPostAfterTime(channelId string, time int64) (*model.Post var r1 error if rf, ok := ret.Get(1).(func(string, int64) error); ok { - r1 = rf(channelId, time) + r1 = rf(channelID, time) } else { r1 = ret.Error(1) } @@ -333,20 +333,20 @@ func (_m *PostStore) GetPostAfterTime(channelId string, time int64) (*model.Post return r0, r1 } -// GetPostIdAfterTime provides a mock function with given fields: channelId, time -func (_m *PostStore) GetPostIdAfterTime(channelId string, time int64) (string, error) { - ret := _m.Called(channelId, time) +// GetPostIdAfterTime provides a mock function with given fields: channelID, time +func (_m *PostStore) GetPostIdAfterTime(channelID string, time int64) (string, error) { + ret := _m.Called(channelID, time) var r0 string if rf, ok := ret.Get(0).(func(string, int64) string); ok { - r0 = rf(channelId, time) + r0 = rf(channelID, time) } else { r0 = ret.Get(0).(string) } var r1 error if rf, ok := ret.Get(1).(func(string, int64) error); ok { - r1 = rf(channelId, time) + r1 = rf(channelID, time) } else { r1 = ret.Error(1) } @@ -354,20 +354,20 @@ func (_m *PostStore) GetPostIdAfterTime(channelId string, time int64) (string, e return r0, r1 } -// GetPostIdBeforeTime provides a mock function with given fields: channelId, time -func (_m *PostStore) GetPostIdBeforeTime(channelId string, time int64) (string, error) { - ret := _m.Called(channelId, time) +// GetPostIdBeforeTime provides a mock function with given fields: channelID, time +func (_m *PostStore) GetPostIdBeforeTime(channelID string, time int64) (string, error) { + ret := _m.Called(channelID, time) var r0 string if rf, ok := ret.Get(0).(func(string, int64) string); ok { - r0 = rf(channelId, time) + r0 = rf(channelID, time) } else { r0 = ret.Get(0).(string) } var r1 error if rf, ok := ret.Get(1).(func(string, int64) error); ok { - r1 = rf(channelId, time) + r1 = rf(channelID, time) } else { r1 = ret.Error(1) } @@ -490,13 +490,13 @@ func (_m *PostStore) GetPostsByIds(postIds []string) ([]*model.Post, error) { return r0, r1 } -// GetPostsCreatedAt provides a mock function with given fields: channelId, time -func (_m *PostStore) GetPostsCreatedAt(channelId string, time int64) ([]*model.Post, error) { - ret := _m.Called(channelId, time) +// GetPostsCreatedAt provides a mock function with given fields: channelID, time +func (_m *PostStore) GetPostsCreatedAt(channelID string, time int64) ([]*model.Post, error) { + ret := _m.Called(channelID, time) var r0 []*model.Post if rf, ok := ret.Get(0).(func(string, int64) []*model.Post); ok { - r0 = rf(channelId, time) + r0 = rf(channelID, time) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.Post) @@ -505,7 +505,7 @@ func (_m *PostStore) GetPostsCreatedAt(channelId string, time int64) ([]*model.P var r1 error if rf, ok := ret.Get(1).(func(string, int64) error); ok { - r1 = rf(channelId, time) + r1 = rf(channelID, time) } else { r1 = ret.Error(1) } @@ -536,13 +536,13 @@ func (_m *PostStore) GetPostsSince(options model.GetPostsSinceOptions, allowFrom return r0, r1 } -// GetRepliesForExport provides a mock function with given fields: parentId -func (_m *PostStore) GetRepliesForExport(parentId string) ([]*model.ReplyForExport, error) { - ret := _m.Called(parentId) +// GetRepliesForExport provides a mock function with given fields: parentID +func (_m *PostStore) GetRepliesForExport(parentID string) ([]*model.ReplyForExport, error) { + ret := _m.Called(parentID) var r0 []*model.ReplyForExport if rf, ok := ret.Get(0).(func(string) []*model.ReplyForExport); ok { - r0 = rf(parentId) + r0 = rf(parentID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.ReplyForExport) @@ -551,7 +551,7 @@ func (_m *PostStore) GetRepliesForExport(parentId string) ([]*model.ReplyForExpo var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(parentId) + r1 = rf(parentID) } else { r1 = ret.Error(1) } @@ -582,9 +582,9 @@ func (_m *PostStore) GetSingle(id string) (*model.Post, error) { return r0, r1 } -// InvalidateLastPostTimeCache provides a mock function with given fields: channelId -func (_m *PostStore) InvalidateLastPostTimeCache(channelId string) { - _m.Called(channelId) +// InvalidateLastPostTimeCache provides a mock function with given fields: channelID +func (_m *PostStore) InvalidateLastPostTimeCache(channelID string) { + _m.Called(channelID) } // Overwrite provides a mock function with given fields: post @@ -661,13 +661,13 @@ func (_m *PostStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, er return r0, r1 } -// PermanentDeleteByChannel provides a mock function with given fields: channelId -func (_m *PostStore) PermanentDeleteByChannel(channelId string) error { - ret := _m.Called(channelId) +// PermanentDeleteByChannel provides a mock function with given fields: channelID +func (_m *PostStore) PermanentDeleteByChannel(channelID string) error { + ret := _m.Called(channelID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(channelId) + r0 = rf(channelID) } else { r0 = ret.Error(0) } @@ -742,13 +742,13 @@ func (_m *PostStore) SaveMultiple(posts []*model.Post) ([]*model.Post, int, erro return r0, r1, r2 } -// Search provides a mock function with given fields: teamId, userId, params -func (_m *PostStore) Search(teamId string, userId string, params *model.SearchParams) (*model.PostList, error) { - ret := _m.Called(teamId, userId, params) +// Search provides a mock function with given fields: teamID, userId, params +func (_m *PostStore) Search(teamID string, userId string, params *model.SearchParams) (*model.PostList, error) { + ret := _m.Called(teamID, userId, params) var r0 *model.PostList if rf, ok := ret.Get(0).(func(string, string, *model.SearchParams) *model.PostList); ok { - r0 = rf(teamId, userId, params) + r0 = rf(teamID, userId, params) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.PostList) @@ -757,7 +757,7 @@ func (_m *PostStore) Search(teamId string, userId string, params *model.SearchPa var r1 error if rf, ok := ret.Get(1).(func(string, string, *model.SearchParams) error); ok { - r1 = rf(teamId, userId, params) + r1 = rf(teamID, userId, params) } else { r1 = ret.Error(1) } @@ -765,13 +765,13 @@ func (_m *PostStore) Search(teamId string, userId string, params *model.SearchPa return r0, r1 } -// SearchPostsInTeamForUser provides a mock function with given fields: paramsList, userId, teamId, page, perPage -func (_m *PostStore) SearchPostsInTeamForUser(paramsList []*model.SearchParams, userId string, teamId string, page int, perPage int) (*model.PostSearchResults, error) { - ret := _m.Called(paramsList, userId, teamId, page, perPage) +// SearchPostsInTeamForUser provides a mock function with given fields: paramsList, userId, teamID, page, perPage +func (_m *PostStore) SearchPostsInTeamForUser(paramsList []*model.SearchParams, userId string, teamID string, page int, perPage int) (*model.PostSearchResults, error) { + ret := _m.Called(paramsList, userId, teamID, page, perPage) var r0 *model.PostSearchResults if rf, ok := ret.Get(0).(func([]*model.SearchParams, string, string, int, int) *model.PostSearchResults); ok { - r0 = rf(paramsList, userId, teamId, page, perPage) + r0 = rf(paramsList, userId, teamID, page, perPage) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.PostSearchResults) @@ -780,7 +780,7 @@ func (_m *PostStore) SearchPostsInTeamForUser(paramsList []*model.SearchParams, var r1 error if rf, ok := ret.Get(1).(func([]*model.SearchParams, string, string, int, int) error); ok { - r1 = rf(paramsList, userId, teamId, page, perPage) + r1 = rf(paramsList, userId, teamID, page, perPage) } else { r1 = ret.Error(1) } diff --git a/store/storetest/mocks/ReactionStore.go b/store/storetest/mocks/ReactionStore.go index f27627665d..a50c889489 100644 --- a/store/storetest/mocks/ReactionStore.go +++ b/store/storetest/mocks/ReactionStore.go @@ -74,13 +74,13 @@ func (_m *ReactionStore) DeleteAllWithEmojiName(emojiName string) error { return r0 } -// GetForPost provides a mock function with given fields: postId, allowFromCache -func (_m *ReactionStore) GetForPost(postId string, allowFromCache bool) ([]*model.Reaction, error) { - ret := _m.Called(postId, allowFromCache) +// GetForPost provides a mock function with given fields: postID, allowFromCache +func (_m *ReactionStore) GetForPost(postID string, allowFromCache bool) ([]*model.Reaction, error) { + ret := _m.Called(postID, allowFromCache) var r0 []*model.Reaction if rf, ok := ret.Get(0).(func(string, bool) []*model.Reaction); ok { - r0 = rf(postId, allowFromCache) + r0 = rf(postID, allowFromCache) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.Reaction) @@ -89,7 +89,7 @@ func (_m *ReactionStore) GetForPost(postId string, allowFromCache bool) ([]*mode var r1 error if rf, ok := ret.Get(1).(func(string, bool) error); ok { - r1 = rf(postId, allowFromCache) + r1 = rf(postID, allowFromCache) } else { r1 = ret.Error(1) } diff --git a/store/storetest/mocks/RoleStore.go b/store/storetest/mocks/RoleStore.go index a21e2b48bf..cd4c69684f 100644 --- a/store/storetest/mocks/RoleStore.go +++ b/store/storetest/mocks/RoleStore.go @@ -83,13 +83,13 @@ func (_m *RoleStore) ChannelRolesUnderTeamRole(roleName string) ([]*model.Role, return r0, r1 } -// Delete provides a mock function with given fields: roleId -func (_m *RoleStore) Delete(roleId string) (*model.Role, error) { - ret := _m.Called(roleId) +// Delete provides a mock function with given fields: roleID +func (_m *RoleStore) Delete(roleID string) (*model.Role, error) { + ret := _m.Called(roleID) var r0 *model.Role if rf, ok := ret.Get(0).(func(string) *model.Role); ok { - r0 = rf(roleId) + r0 = rf(roleID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.Role) @@ -98,7 +98,7 @@ func (_m *RoleStore) Delete(roleId string) (*model.Role, error) { var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(roleId) + r1 = rf(roleID) } else { r1 = ret.Error(1) } @@ -106,13 +106,13 @@ func (_m *RoleStore) Delete(roleId string) (*model.Role, error) { return r0, r1 } -// Get provides a mock function with given fields: roleId -func (_m *RoleStore) Get(roleId string) (*model.Role, error) { - ret := _m.Called(roleId) +// Get provides a mock function with given fields: roleID +func (_m *RoleStore) Get(roleID string) (*model.Role, error) { + ret := _m.Called(roleID) var r0 *model.Role if rf, ok := ret.Get(0).(func(string) *model.Role); ok { - r0 = rf(roleId) + r0 = rf(roleID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.Role) @@ -121,7 +121,7 @@ func (_m *RoleStore) Get(roleId string) (*model.Role, error) { var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(roleId) + r1 = rf(roleID) } else { r1 = ret.Error(1) } diff --git a/store/storetest/mocks/SchemeStore.go b/store/storetest/mocks/SchemeStore.go index cec836d737..37e33dbe29 100644 --- a/store/storetest/mocks/SchemeStore.go +++ b/store/storetest/mocks/SchemeStore.go @@ -56,13 +56,13 @@ func (_m *SchemeStore) CountWithoutPermission(scope string, permissionID string, return r0, r1 } -// Delete provides a mock function with given fields: schemeId -func (_m *SchemeStore) Delete(schemeId string) (*model.Scheme, error) { - ret := _m.Called(schemeId) +// Delete provides a mock function with given fields: schemeID +func (_m *SchemeStore) Delete(schemeID string) (*model.Scheme, error) { + ret := _m.Called(schemeID) var r0 *model.Scheme if rf, ok := ret.Get(0).(func(string) *model.Scheme); ok { - r0 = rf(schemeId) + r0 = rf(schemeID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.Scheme) @@ -71,7 +71,7 @@ func (_m *SchemeStore) Delete(schemeId string) (*model.Scheme, error) { var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(schemeId) + r1 = rf(schemeID) } else { r1 = ret.Error(1) } @@ -79,13 +79,13 @@ func (_m *SchemeStore) Delete(schemeId string) (*model.Scheme, error) { return r0, r1 } -// Get provides a mock function with given fields: schemeId -func (_m *SchemeStore) Get(schemeId string) (*model.Scheme, error) { - ret := _m.Called(schemeId) +// Get provides a mock function with given fields: schemeID +func (_m *SchemeStore) Get(schemeID string) (*model.Scheme, error) { + ret := _m.Called(schemeID) var r0 *model.Scheme if rf, ok := ret.Get(0).(func(string) *model.Scheme); ok { - r0 = rf(schemeId) + r0 = rf(schemeID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.Scheme) @@ -94,7 +94,7 @@ func (_m *SchemeStore) Get(schemeId string) (*model.Scheme, error) { var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(schemeId) + r1 = rf(schemeID) } else { r1 = ret.Error(1) } diff --git a/store/storetest/mocks/SessionStore.go b/store/storetest/mocks/SessionStore.go index e7d2465758..14178228fc 100644 --- a/store/storetest/mocks/SessionStore.go +++ b/store/storetest/mocks/SessionStore.go @@ -40,13 +40,13 @@ func (_m *SessionStore) Cleanup(expiryTime int64, batchSize int64) { _m.Called(expiryTime, batchSize) } -// Get provides a mock function with given fields: sessionIdOrToken -func (_m *SessionStore) Get(sessionIdOrToken string) (*model.Session, error) { - ret := _m.Called(sessionIdOrToken) +// Get provides a mock function with given fields: sessionIDOrToken +func (_m *SessionStore) Get(sessionIDOrToken string) (*model.Session, error) { + ret := _m.Called(sessionIDOrToken) var r0 *model.Session if rf, ok := ret.Get(0).(func(string) *model.Session); ok { - r0 = rf(sessionIdOrToken) + r0 = rf(sessionIDOrToken) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.Session) @@ -55,7 +55,7 @@ func (_m *SessionStore) Get(sessionIdOrToken string) (*model.Session, error) { var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(sessionIdOrToken) + r1 = rf(sessionIDOrToken) } else { r1 = ret.Error(1) } @@ -132,13 +132,13 @@ func (_m *SessionStore) GetSessionsWithActiveDeviceIds(userId string) ([]*model. return r0, r1 } -// PermanentDeleteSessionsByUser provides a mock function with given fields: teamId -func (_m *SessionStore) PermanentDeleteSessionsByUser(teamId string) error { - ret := _m.Called(teamId) +// PermanentDeleteSessionsByUser provides a mock function with given fields: teamID +func (_m *SessionStore) PermanentDeleteSessionsByUser(teamID string) error { + ret := _m.Called(teamID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(teamId) + r0 = rf(teamID) } else { r0 = ret.Error(0) } @@ -146,13 +146,13 @@ func (_m *SessionStore) PermanentDeleteSessionsByUser(teamId string) error { return r0 } -// Remove provides a mock function with given fields: sessionIdOrToken -func (_m *SessionStore) Remove(sessionIdOrToken string) error { - ret := _m.Called(sessionIdOrToken) +// Remove provides a mock function with given fields: sessionIDOrToken +func (_m *SessionStore) Remove(sessionIDOrToken string) error { + ret := _m.Called(sessionIDOrToken) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(sessionIdOrToken) + r0 = rf(sessionIDOrToken) } else { r0 = ret.Error(0) } @@ -197,20 +197,20 @@ func (_m *SessionStore) Save(session *model.Session) (*model.Session, error) { return r0, r1 } -// UpdateDeviceId provides a mock function with given fields: id, deviceId, expiresAt -func (_m *SessionStore) UpdateDeviceId(id string, deviceId string, expiresAt int64) (string, error) { - ret := _m.Called(id, deviceId, expiresAt) +// UpdateDeviceId provides a mock function with given fields: id, deviceID, expiresAt +func (_m *SessionStore) UpdateDeviceId(id string, deviceID string, expiresAt int64) (string, error) { + ret := _m.Called(id, deviceID, expiresAt) var r0 string if rf, ok := ret.Get(0).(func(string, string, int64) string); ok { - r0 = rf(id, deviceId, expiresAt) + r0 = rf(id, deviceID, expiresAt) } else { r0 = ret.Get(0).(string) } var r1 error if rf, ok := ret.Get(1).(func(string, string, int64) error); ok { - r1 = rf(id, deviceId, expiresAt) + r1 = rf(id, deviceID, expiresAt) } else { r1 = ret.Error(1) } @@ -232,13 +232,13 @@ func (_m *SessionStore) UpdateExpiredNotify(sessionid string, notified bool) err return r0 } -// UpdateExpiresAt provides a mock function with given fields: sessionId, time -func (_m *SessionStore) UpdateExpiresAt(sessionId string, time int64) error { - ret := _m.Called(sessionId, time) +// UpdateExpiresAt provides a mock function with given fields: sessionID, time +func (_m *SessionStore) UpdateExpiresAt(sessionID string, time int64) error { + ret := _m.Called(sessionID, time) var r0 error if rf, ok := ret.Get(0).(func(string, int64) error); ok { - r0 = rf(sessionId, time) + r0 = rf(sessionID, time) } else { r0 = ret.Error(0) } @@ -246,13 +246,13 @@ func (_m *SessionStore) UpdateExpiresAt(sessionId string, time int64) error { return r0 } -// UpdateLastActivityAt provides a mock function with given fields: sessionId, time -func (_m *SessionStore) UpdateLastActivityAt(sessionId string, time int64) error { - ret := _m.Called(sessionId, time) +// UpdateLastActivityAt provides a mock function with given fields: sessionID, time +func (_m *SessionStore) UpdateLastActivityAt(sessionID string, time int64) error { + ret := _m.Called(sessionID, time) var r0 error if rf, ok := ret.Get(0).(func(string, int64) error); ok { - r0 = rf(sessionId, time) + r0 = rf(sessionID, time) } else { r0 = ret.Error(0) } diff --git a/store/storetest/mocks/TeamStore.go b/store/storetest/mocks/TeamStore.go index ef6822c530..4fd343db40 100644 --- a/store/storetest/mocks/TeamStore.go +++ b/store/storetest/mocks/TeamStore.go @@ -16,20 +16,20 @@ type TeamStore struct { mock.Mock } -// AnalyticsGetTeamCountForScheme provides a mock function with given fields: schemeId -func (_m *TeamStore) AnalyticsGetTeamCountForScheme(schemeId string) (int64, error) { - ret := _m.Called(schemeId) +// AnalyticsGetTeamCountForScheme provides a mock function with given fields: schemeID +func (_m *TeamStore) AnalyticsGetTeamCountForScheme(schemeID string) (int64, error) { + ret := _m.Called(schemeID) var r0 int64 if rf, ok := ret.Get(0).(func(string) int64); ok { - r0 = rf(schemeId) + r0 = rf(schemeID) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(schemeId) + r1 = rf(schemeID) } else { r1 = ret.Error(1) } @@ -142,20 +142,20 @@ func (_m *TeamStore) Get(id string) (*model.Team, error) { return r0, r1 } -// GetActiveMemberCount provides a mock function with given fields: teamId, restrictions -func (_m *TeamStore) GetActiveMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, error) { - ret := _m.Called(teamId, restrictions) +// GetActiveMemberCount provides a mock function with given fields: teamID, restrictions +func (_m *TeamStore) GetActiveMemberCount(teamID string, restrictions *model.ViewUsersRestrictions) (int64, error) { + ret := _m.Called(teamID, restrictions) var r0 int64 if rf, ok := ret.Get(0).(func(string, *model.ViewUsersRestrictions) int64); ok { - r0 = rf(teamId, restrictions) + r0 = rf(teamID, restrictions) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string, *model.ViewUsersRestrictions) error); ok { - r1 = rf(teamId, restrictions) + r1 = rf(teamID, restrictions) } else { r1 = ret.Error(1) } @@ -186,13 +186,13 @@ func (_m *TeamStore) GetAll() ([]*model.Team, error) { return r0, r1 } -// GetAllForExportAfter provides a mock function with given fields: limit, afterId -func (_m *TeamStore) GetAllForExportAfter(limit int, afterId string) ([]*model.TeamForExport, error) { - ret := _m.Called(limit, afterId) +// GetAllForExportAfter provides a mock function with given fields: limit, afterID +func (_m *TeamStore) GetAllForExportAfter(limit int, afterID string) ([]*model.TeamForExport, error) { + ret := _m.Called(limit, afterID) var r0 []*model.TeamForExport if rf, ok := ret.Get(0).(func(int, string) []*model.TeamForExport); ok { - r0 = rf(limit, afterId) + r0 = rf(limit, afterID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.TeamForExport) @@ -201,7 +201,7 @@ func (_m *TeamStore) GetAllForExportAfter(limit int, afterId string) ([]*model.T var r1 error if rf, ok := ret.Get(1).(func(int, string) error); ok { - r1 = rf(limit, afterId) + r1 = rf(limit, afterID) } else { r1 = ret.Error(1) } @@ -347,13 +347,13 @@ func (_m *TeamStore) GetAllTeamPageListing(offset int, limit int) ([]*model.Team return r0, r1 } -// GetByInviteId provides a mock function with given fields: inviteId -func (_m *TeamStore) GetByInviteId(inviteId string) (*model.Team, error) { - ret := _m.Called(inviteId) +// GetByInviteId provides a mock function with given fields: inviteID +func (_m *TeamStore) GetByInviteId(inviteID string) (*model.Team, error) { + ret := _m.Called(inviteID) var r0 *model.Team if rf, ok := ret.Get(0).(func(string) *model.Team); ok { - r0 = rf(inviteId) + r0 = rf(inviteID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.Team) @@ -362,7 +362,7 @@ func (_m *TeamStore) GetByInviteId(inviteId string) (*model.Team, error) { var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(inviteId) + r1 = rf(inviteID) } else { r1 = ret.Error(1) } @@ -416,13 +416,13 @@ func (_m *TeamStore) GetByNames(name []string) ([]*model.Team, error) { return r0, r1 } -// GetChannelUnreadsForAllTeams provides a mock function with given fields: excludeTeamId, userId -func (_m *TeamStore) GetChannelUnreadsForAllTeams(excludeTeamId string, userId string) ([]*model.ChannelUnread, error) { - ret := _m.Called(excludeTeamId, userId) +// GetChannelUnreadsForAllTeams provides a mock function with given fields: excludeTeamID, userId +func (_m *TeamStore) GetChannelUnreadsForAllTeams(excludeTeamID string, userId string) ([]*model.ChannelUnread, error) { + ret := _m.Called(excludeTeamID, userId) var r0 []*model.ChannelUnread if rf, ok := ret.Get(0).(func(string, string) []*model.ChannelUnread); ok { - r0 = rf(excludeTeamId, userId) + r0 = rf(excludeTeamID, userId) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.ChannelUnread) @@ -431,7 +431,7 @@ func (_m *TeamStore) GetChannelUnreadsForAllTeams(excludeTeamId string, userId s var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(excludeTeamId, userId) + r1 = rf(excludeTeamID, userId) } else { r1 = ret.Error(1) } @@ -439,13 +439,13 @@ func (_m *TeamStore) GetChannelUnreadsForAllTeams(excludeTeamId string, userId s return r0, r1 } -// GetChannelUnreadsForTeam provides a mock function with given fields: teamId, userId -func (_m *TeamStore) GetChannelUnreadsForTeam(teamId string, userId string) ([]*model.ChannelUnread, error) { - ret := _m.Called(teamId, userId) +// GetChannelUnreadsForTeam provides a mock function with given fields: teamID, userId +func (_m *TeamStore) GetChannelUnreadsForTeam(teamID string, userId string) ([]*model.ChannelUnread, error) { + ret := _m.Called(teamID, userId) var r0 []*model.ChannelUnread if rf, ok := ret.Get(0).(func(string, string) []*model.ChannelUnread); ok { - r0 = rf(teamId, userId) + r0 = rf(teamID, userId) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.ChannelUnread) @@ -454,7 +454,7 @@ func (_m *TeamStore) GetChannelUnreadsForTeam(teamId string, userId string) ([]* var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(teamId, userId) + r1 = rf(teamID, userId) } else { r1 = ret.Error(1) } @@ -462,13 +462,13 @@ func (_m *TeamStore) GetChannelUnreadsForTeam(teamId string, userId string) ([]* return r0, r1 } -// GetMember provides a mock function with given fields: teamId, userId -func (_m *TeamStore) GetMember(teamId string, userId string) (*model.TeamMember, error) { - ret := _m.Called(teamId, userId) +// GetMember provides a mock function with given fields: teamID, userId +func (_m *TeamStore) GetMember(teamID string, userId string) (*model.TeamMember, error) { + ret := _m.Called(teamID, userId) var r0 *model.TeamMember if rf, ok := ret.Get(0).(func(string, string) *model.TeamMember); ok { - r0 = rf(teamId, userId) + r0 = rf(teamID, userId) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.TeamMember) @@ -477,7 +477,7 @@ func (_m *TeamStore) GetMember(teamId string, userId string) (*model.TeamMember, var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(teamId, userId) + r1 = rf(teamID, userId) } else { r1 = ret.Error(1) } @@ -485,13 +485,13 @@ func (_m *TeamStore) GetMember(teamId string, userId string) (*model.TeamMember, return r0, r1 } -// GetMembers provides a mock function with given fields: teamId, offset, limit, teamMembersGetOptions -func (_m *TeamStore) GetMembers(teamId string, offset int, limit int, teamMembersGetOptions *model.TeamMembersGetOptions) ([]*model.TeamMember, error) { - ret := _m.Called(teamId, offset, limit, teamMembersGetOptions) +// GetMembers provides a mock function with given fields: teamID, offset, limit, teamMembersGetOptions +func (_m *TeamStore) GetMembers(teamID string, offset int, limit int, teamMembersGetOptions *model.TeamMembersGetOptions) ([]*model.TeamMember, error) { + ret := _m.Called(teamID, offset, limit, teamMembersGetOptions) var r0 []*model.TeamMember if rf, ok := ret.Get(0).(func(string, int, int, *model.TeamMembersGetOptions) []*model.TeamMember); ok { - r0 = rf(teamId, offset, limit, teamMembersGetOptions) + r0 = rf(teamID, offset, limit, teamMembersGetOptions) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.TeamMember) @@ -500,7 +500,7 @@ func (_m *TeamStore) GetMembers(teamId string, offset int, limit int, teamMember var r1 error if rf, ok := ret.Get(1).(func(string, int, int, *model.TeamMembersGetOptions) error); ok { - r1 = rf(teamId, offset, limit, teamMembersGetOptions) + r1 = rf(teamID, offset, limit, teamMembersGetOptions) } else { r1 = ret.Error(1) } @@ -508,13 +508,13 @@ func (_m *TeamStore) GetMembers(teamId string, offset int, limit int, teamMember return r0, r1 } -// GetMembersByIds provides a mock function with given fields: teamId, userIds, restrictions -func (_m *TeamStore) GetMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, error) { - ret := _m.Called(teamId, userIds, restrictions) +// GetMembersByIds provides a mock function with given fields: teamID, userIds, restrictions +func (_m *TeamStore) GetMembersByIds(teamID string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, error) { + ret := _m.Called(teamID, userIds, restrictions) var r0 []*model.TeamMember if rf, ok := ret.Get(0).(func(string, []string, *model.ViewUsersRestrictions) []*model.TeamMember); ok { - r0 = rf(teamId, userIds, restrictions) + r0 = rf(teamID, userIds, restrictions) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.TeamMember) @@ -523,7 +523,7 @@ func (_m *TeamStore) GetMembersByIds(teamId string, userIds []string, restrictio var r1 error if rf, ok := ret.Get(1).(func(string, []string, *model.ViewUsersRestrictions) error); ok { - r1 = rf(teamId, userIds, restrictions) + r1 = rf(teamID, userIds, restrictions) } else { r1 = ret.Error(1) } @@ -554,13 +554,13 @@ func (_m *TeamStore) GetTeamMembersForExport(userId string) ([]*model.TeamMember return r0, r1 } -// GetTeamsByScheme provides a mock function with given fields: schemeId, offset, limit -func (_m *TeamStore) GetTeamsByScheme(schemeId string, offset int, limit int) ([]*model.Team, error) { - ret := _m.Called(schemeId, offset, limit) +// GetTeamsByScheme provides a mock function with given fields: schemeID, offset, limit +func (_m *TeamStore) GetTeamsByScheme(schemeID string, offset int, limit int) ([]*model.Team, error) { + ret := _m.Called(schemeID, offset, limit) var r0 []*model.Team if rf, ok := ret.Get(0).(func(string, int, int) []*model.Team); ok { - r0 = rf(schemeId, offset, limit) + r0 = rf(schemeID, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.Team) @@ -569,7 +569,7 @@ func (_m *TeamStore) GetTeamsByScheme(schemeId string, offset int, limit int) ([ var r1 error if rf, ok := ret.Get(1).(func(string, int, int) error); ok { - r1 = rf(schemeId, offset, limit) + r1 = rf(schemeID, offset, limit) } else { r1 = ret.Error(1) } @@ -646,20 +646,20 @@ func (_m *TeamStore) GetTeamsForUserWithPagination(userId string, page int, perP return r0, r1 } -// GetTotalMemberCount provides a mock function with given fields: teamId, restrictions -func (_m *TeamStore) GetTotalMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, error) { - ret := _m.Called(teamId, restrictions) +// GetTotalMemberCount provides a mock function with given fields: teamID, restrictions +func (_m *TeamStore) GetTotalMemberCount(teamID string, restrictions *model.ViewUsersRestrictions) (int64, error) { + ret := _m.Called(teamID, restrictions) var r0 int64 if rf, ok := ret.Get(0).(func(string, *model.ViewUsersRestrictions) int64); ok { - r0 = rf(teamId, restrictions) + r0 = rf(teamID, restrictions) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string, *model.ViewUsersRestrictions) error); ok { - r1 = rf(teamId, restrictions) + r1 = rf(teamID, restrictions) } else { r1 = ret.Error(1) } @@ -716,13 +716,13 @@ func (_m *TeamStore) InvalidateAllTeamIdsForUser(userId string) { _m.Called(userId) } -// MigrateTeamMembers provides a mock function with given fields: fromTeamId, fromUserId -func (_m *TeamStore) MigrateTeamMembers(fromTeamId string, fromUserId string) (map[string]string, error) { - ret := _m.Called(fromTeamId, fromUserId) +// MigrateTeamMembers provides a mock function with given fields: fromTeamID, fromUserId +func (_m *TeamStore) MigrateTeamMembers(fromTeamID string, fromUserId string) (map[string]string, error) { + ret := _m.Called(fromTeamID, fromUserId) var r0 map[string]string if rf, ok := ret.Get(0).(func(string, string) map[string]string); ok { - r0 = rf(fromTeamId, fromUserId) + r0 = rf(fromTeamID, fromUserId) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(map[string]string) @@ -731,7 +731,7 @@ func (_m *TeamStore) MigrateTeamMembers(fromTeamId string, fromUserId string) (m var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(fromTeamId, fromUserId) + r1 = rf(fromTeamID, fromUserId) } else { r1 = ret.Error(1) } @@ -739,13 +739,13 @@ func (_m *TeamStore) MigrateTeamMembers(fromTeamId string, fromUserId string) (m return r0, r1 } -// PermanentDelete provides a mock function with given fields: teamId -func (_m *TeamStore) PermanentDelete(teamId string) error { - ret := _m.Called(teamId) +// PermanentDelete provides a mock function with given fields: teamID +func (_m *TeamStore) PermanentDelete(teamID string) error { + ret := _m.Called(teamID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(teamId) + r0 = rf(teamID) } else { r0 = ret.Error(0) } @@ -753,13 +753,13 @@ func (_m *TeamStore) PermanentDelete(teamId string) error { return r0 } -// RemoveAllMembersByTeam provides a mock function with given fields: teamId -func (_m *TeamStore) RemoveAllMembersByTeam(teamId string) error { - ret := _m.Called(teamId) +// RemoveAllMembersByTeam provides a mock function with given fields: teamID +func (_m *TeamStore) RemoveAllMembersByTeam(teamID string) error { + ret := _m.Called(teamID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(teamId) + r0 = rf(teamID) } else { r0 = ret.Error(0) } @@ -781,13 +781,13 @@ func (_m *TeamStore) RemoveAllMembersByUser(userId string) error { return r0 } -// RemoveMember provides a mock function with given fields: teamId, userId -func (_m *TeamStore) RemoveMember(teamId string, userId string) error { - ret := _m.Called(teamId, userId) +// RemoveMember provides a mock function with given fields: teamID, userId +func (_m *TeamStore) RemoveMember(teamID string, userId string) error { + ret := _m.Called(teamID, userId) var r0 error if rf, ok := ret.Get(0).(func(string, string) error); ok { - r0 = rf(teamId, userId) + r0 = rf(teamID, userId) } else { r0 = ret.Error(0) } @@ -795,13 +795,13 @@ func (_m *TeamStore) RemoveMember(teamId string, userId string) error { return r0 } -// RemoveMembers provides a mock function with given fields: teamId, userIds -func (_m *TeamStore) RemoveMembers(teamId string, userIds []string) error { - ret := _m.Called(teamId, userIds) +// RemoveMembers provides a mock function with given fields: teamID, userIds +func (_m *TeamStore) RemoveMembers(teamID string, userIds []string) error { + ret := _m.Called(teamID, userIds) var r0 error if rf, ok := ret.Get(0).(func(string, []string) error); ok { - r0 = rf(teamId, userIds) + r0 = rf(teamID, userIds) } else { r0 = ret.Error(0) } @@ -1014,13 +1014,13 @@ func (_m *TeamStore) Update(team *model.Team) (*model.Team, error) { return r0, r1 } -// UpdateLastTeamIconUpdate provides a mock function with given fields: teamId, curTime -func (_m *TeamStore) UpdateLastTeamIconUpdate(teamId string, curTime int64) error { - ret := _m.Called(teamId, curTime) +// UpdateLastTeamIconUpdate provides a mock function with given fields: teamID, curTime +func (_m *TeamStore) UpdateLastTeamIconUpdate(teamID string, curTime int64) error { + ret := _m.Called(teamID, curTime) var r0 error if rf, ok := ret.Get(0).(func(string, int64) error); ok { - r0 = rf(teamId, curTime) + r0 = rf(teamID, curTime) } else { r0 = ret.Error(0) } diff --git a/store/storetest/mocks/ThreadStore.go b/store/storetest/mocks/ThreadStore.go index 0fcd61f703..f747e8ad28 100644 --- a/store/storetest/mocks/ThreadStore.go +++ b/store/storetest/mocks/ThreadStore.go @@ -37,13 +37,13 @@ func (_m *ThreadStore) CollectThreadsWithNewerReplies(userId string, channelIds return r0, r1 } -// CreateMembershipIfNeeded provides a mock function with given fields: userId, postId, following, incrementMentions, updateFollowing -func (_m *ThreadStore) CreateMembershipIfNeeded(userId string, postId string, following bool, incrementMentions bool, updateFollowing bool) error { - ret := _m.Called(userId, postId, following, incrementMentions, updateFollowing) +// CreateMembershipIfNeeded provides a mock function with given fields: userId, postID, following, incrementMentions, updateFollowing +func (_m *ThreadStore) CreateMembershipIfNeeded(userId string, postID string, following bool, incrementMentions bool, updateFollowing bool) error { + ret := _m.Called(userId, postID, following, incrementMentions, updateFollowing) var r0 error if rf, ok := ret.Get(0).(func(string, string, bool, bool, bool) error); ok { - r0 = rf(userId, postId, following, incrementMentions, updateFollowing) + r0 = rf(userId, postID, following, incrementMentions, updateFollowing) } else { r0 = ret.Error(0) } @@ -65,13 +65,13 @@ func (_m *ThreadStore) Delete(postId string) error { return r0 } -// DeleteMembershipForUser provides a mock function with given fields: userId, postId -func (_m *ThreadStore) DeleteMembershipForUser(userId string, postId string) error { - ret := _m.Called(userId, postId) +// DeleteMembershipForUser provides a mock function with given fields: userId, postID +func (_m *ThreadStore) DeleteMembershipForUser(userId string, postID string) error { + ret := _m.Called(userId, postID) var r0 error if rf, ok := ret.Get(0).(func(string, string) error); ok { - r0 = rf(userId, postId) + r0 = rf(userId, postID) } else { r0 = ret.Error(0) } @@ -102,13 +102,13 @@ func (_m *ThreadStore) Get(id string) (*model.Thread, error) { return r0, r1 } -// GetMembershipForUser provides a mock function with given fields: userId, postId -func (_m *ThreadStore) GetMembershipForUser(userId string, postId string) (*model.ThreadMembership, error) { - ret := _m.Called(userId, postId) +// GetMembershipForUser provides a mock function with given fields: userId, postID +func (_m *ThreadStore) GetMembershipForUser(userId string, postID string) (*model.ThreadMembership, error) { + ret := _m.Called(userId, postID) var r0 *model.ThreadMembership if rf, ok := ret.Get(0).(func(string, string) *model.ThreadMembership); ok { - r0 = rf(userId, postId) + r0 = rf(userId, postID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ThreadMembership) @@ -117,7 +117,7 @@ func (_m *ThreadStore) GetMembershipForUser(userId string, postId string) (*mode var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(userId, postId) + r1 = rf(userId, postID) } else { r1 = ret.Error(1) } @@ -125,13 +125,13 @@ func (_m *ThreadStore) GetMembershipForUser(userId string, postId string) (*mode return r0, r1 } -// GetMembershipsForUser provides a mock function with given fields: userId, teamId -func (_m *ThreadStore) GetMembershipsForUser(userId string, teamId string) ([]*model.ThreadMembership, error) { - ret := _m.Called(userId, teamId) +// GetMembershipsForUser provides a mock function with given fields: userId, teamID +func (_m *ThreadStore) GetMembershipsForUser(userId string, teamID string) ([]*model.ThreadMembership, error) { + ret := _m.Called(userId, teamID) var r0 []*model.ThreadMembership if rf, ok := ret.Get(0).(func(string, string) []*model.ThreadMembership); ok { - r0 = rf(userId, teamId) + r0 = rf(userId, teamID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.ThreadMembership) @@ -140,7 +140,7 @@ func (_m *ThreadStore) GetMembershipsForUser(userId string, teamId string) ([]*m var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(userId, teamId) + r1 = rf(userId, teamID) } else { r1 = ret.Error(1) } @@ -240,13 +240,13 @@ func (_m *ThreadStore) GetThreadsForUser(userId string, teamId string, opts mode return r0, r1 } -// MarkAllAsRead provides a mock function with given fields: userId, teamId -func (_m *ThreadStore) MarkAllAsRead(userId string, teamId string) error { - ret := _m.Called(userId, teamId) +// MarkAllAsRead provides a mock function with given fields: userId, teamID +func (_m *ThreadStore) MarkAllAsRead(userId string, teamID string) error { + ret := _m.Called(userId, teamID) var r0 error if rf, ok := ret.Get(0).(func(string, string) error); ok { - r0 = rf(userId, teamId) + r0 = rf(userId, teamID) } else { r0 = ret.Error(0) } @@ -254,13 +254,13 @@ func (_m *ThreadStore) MarkAllAsRead(userId string, teamId string) error { return r0 } -// MarkAsRead provides a mock function with given fields: userId, threadId, timestamp -func (_m *ThreadStore) MarkAsRead(userId string, threadId string, timestamp int64) error { - ret := _m.Called(userId, threadId, timestamp) +// MarkAsRead provides a mock function with given fields: userId, threadID, timestamp +func (_m *ThreadStore) MarkAsRead(userId string, threadID string, timestamp int64) error { + ret := _m.Called(userId, threadID, timestamp) var r0 error if rf, ok := ret.Get(0).(func(string, string, int64) error); ok { - r0 = rf(userId, threadId, timestamp) + r0 = rf(userId, threadID, timestamp) } else { r0 = ret.Error(0) } diff --git a/store/storetest/mocks/UserAccessTokenStore.go b/store/storetest/mocks/UserAccessTokenStore.go index a5bd3777e6..6ff2db6a35 100644 --- a/store/storetest/mocks/UserAccessTokenStore.go +++ b/store/storetest/mocks/UserAccessTokenStore.go @@ -14,13 +14,13 @@ type UserAccessTokenStore struct { mock.Mock } -// Delete provides a mock function with given fields: tokenId -func (_m *UserAccessTokenStore) Delete(tokenId string) error { - ret := _m.Called(tokenId) +// Delete provides a mock function with given fields: tokenID +func (_m *UserAccessTokenStore) Delete(tokenID string) error { + ret := _m.Called(tokenID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(tokenId) + r0 = rf(tokenID) } else { r0 = ret.Error(0) } @@ -42,13 +42,13 @@ func (_m *UserAccessTokenStore) DeleteAllForUser(userId string) error { return r0 } -// Get provides a mock function with given fields: tokenId -func (_m *UserAccessTokenStore) Get(tokenId string) (*model.UserAccessToken, error) { - ret := _m.Called(tokenId) +// Get provides a mock function with given fields: tokenID +func (_m *UserAccessTokenStore) Get(tokenID string) (*model.UserAccessToken, error) { + ret := _m.Called(tokenID) var r0 *model.UserAccessToken if rf, ok := ret.Get(0).(func(string) *model.UserAccessToken); ok { - r0 = rf(tokenId) + r0 = rf(tokenID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.UserAccessToken) @@ -57,7 +57,7 @@ func (_m *UserAccessTokenStore) Get(tokenId string) (*model.UserAccessToken, err var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(tokenId) + r1 = rf(tokenID) } else { r1 = ret.Error(1) } @@ -180,13 +180,13 @@ func (_m *UserAccessTokenStore) Search(term string) ([]*model.UserAccessToken, e return r0, r1 } -// UpdateTokenDisable provides a mock function with given fields: tokenId -func (_m *UserAccessTokenStore) UpdateTokenDisable(tokenId string) error { - ret := _m.Called(tokenId) +// UpdateTokenDisable provides a mock function with given fields: tokenID +func (_m *UserAccessTokenStore) UpdateTokenDisable(tokenID string) error { + ret := _m.Called(tokenID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(tokenId) + r0 = rf(tokenID) } else { r0 = ret.Error(0) } @@ -194,13 +194,13 @@ func (_m *UserAccessTokenStore) UpdateTokenDisable(tokenId string) error { return r0 } -// UpdateTokenEnable provides a mock function with given fields: tokenId -func (_m *UserAccessTokenStore) UpdateTokenEnable(tokenId string) error { - ret := _m.Called(tokenId) +// UpdateTokenEnable provides a mock function with given fields: tokenID +func (_m *UserAccessTokenStore) UpdateTokenEnable(tokenID string) error { + ret := _m.Called(tokenID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(tokenId) + r0 = rf(tokenID) } else { r0 = ret.Error(0) } diff --git a/store/storetest/mocks/UserStore.go b/store/storetest/mocks/UserStore.go index b2ff8d0104..dd882b4df9 100644 --- a/store/storetest/mocks/UserStore.go +++ b/store/storetest/mocks/UserStore.go @@ -144,13 +144,13 @@ func (_m *UserStore) AnalyticsGetSystemAdminCount() (int64, error) { return r0, r1 } -// AutocompleteUsersInChannel provides a mock function with given fields: teamId, channelId, term, options -func (_m *UserStore) AutocompleteUsersInChannel(teamId string, channelId string, term string, options *model.UserSearchOptions) (*model.UserAutocompleteInChannel, error) { - ret := _m.Called(teamId, channelId, term, options) +// AutocompleteUsersInChannel provides a mock function with given fields: teamID, channelID, term, options +func (_m *UserStore) AutocompleteUsersInChannel(teamID string, channelID string, term string, options *model.UserSearchOptions) (*model.UserAutocompleteInChannel, error) { + ret := _m.Called(teamID, channelID, term, options) var r0 *model.UserAutocompleteInChannel if rf, ok := ret.Get(0).(func(string, string, string, *model.UserSearchOptions) *model.UserAutocompleteInChannel); ok { - r0 = rf(teamId, channelId, term, options) + r0 = rf(teamID, channelID, term, options) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.UserAutocompleteInChannel) @@ -159,7 +159,7 @@ func (_m *UserStore) AutocompleteUsersInChannel(teamId string, channelId string, var r1 error if rf, ok := ret.Get(1).(func(string, string, string, *model.UserSearchOptions) error); ok { - r1 = rf(teamId, channelId, term, options) + r1 = rf(teamID, channelID, term, options) } else { r1 = ret.Error(1) } @@ -299,13 +299,13 @@ func (_m *UserStore) GetAll() ([]*model.User, error) { return r0, r1 } -// GetAllAfter provides a mock function with given fields: limit, afterId -func (_m *UserStore) GetAllAfter(limit int, afterId string) ([]*model.User, error) { - ret := _m.Called(limit, afterId) +// GetAllAfter provides a mock function with given fields: limit, afterID +func (_m *UserStore) GetAllAfter(limit int, afterID string) ([]*model.User, error) { + ret := _m.Called(limit, afterID) var r0 []*model.User if rf, ok := ret.Get(0).(func(int, string) []*model.User); ok { - r0 = rf(limit, afterId) + r0 = rf(limit, afterID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.User) @@ -314,7 +314,7 @@ func (_m *UserStore) GetAllAfter(limit int, afterId string) ([]*model.User, erro var r1 error if rf, ok := ret.Get(1).(func(int, string) error); ok { - r1 = rf(limit, afterId) + r1 = rf(limit, afterID) } else { r1 = ret.Error(1) } @@ -414,20 +414,20 @@ func (_m *UserStore) GetAllUsingAuthService(authService string) ([]*model.User, return r0, r1 } -// GetAnyUnreadPostCountForChannel provides a mock function with given fields: userId, channelId -func (_m *UserStore) GetAnyUnreadPostCountForChannel(userId string, channelId string) (int64, error) { - ret := _m.Called(userId, channelId) +// GetAnyUnreadPostCountForChannel provides a mock function with given fields: userId, channelID +func (_m *UserStore) GetAnyUnreadPostCountForChannel(userId string, channelID string) (int64, error) { + ret := _m.Called(userId, channelID) var r0 int64 if rf, ok := ret.Get(0).(func(string, string) int64); ok { - r0 = rf(userId, channelId) + r0 = rf(userId, channelID) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(userId, channelId) + r1 = rf(userId, channelID) } else { r1 = ret.Error(1) } @@ -541,13 +541,13 @@ func (_m *UserStore) GetEtagForAllProfiles() string { return r0 } -// GetEtagForProfiles provides a mock function with given fields: teamId -func (_m *UserStore) GetEtagForProfiles(teamId string) string { - ret := _m.Called(teamId) +// GetEtagForProfiles provides a mock function with given fields: teamID +func (_m *UserStore) GetEtagForProfiles(teamID string) string { + ret := _m.Called(teamID) var r0 string if rf, ok := ret.Get(0).(func(string) string); ok { - r0 = rf(teamId) + r0 = rf(teamID) } else { r0 = ret.Get(0).(string) } @@ -555,13 +555,13 @@ func (_m *UserStore) GetEtagForProfiles(teamId string) string { return r0 } -// GetEtagForProfilesNotInTeam provides a mock function with given fields: teamId -func (_m *UserStore) GetEtagForProfilesNotInTeam(teamId string) string { - ret := _m.Called(teamId) +// GetEtagForProfilesNotInTeam provides a mock function with given fields: teamID +func (_m *UserStore) GetEtagForProfilesNotInTeam(teamID string) string { + ret := _m.Called(teamID) var r0 string if rf, ok := ret.Get(0).(func(string) string); ok { - r0 = rf(teamId) + r0 = rf(teamID) } else { r0 = ret.Get(0).(string) } @@ -569,13 +569,13 @@ func (_m *UserStore) GetEtagForProfilesNotInTeam(teamId string) string { return r0 } -// GetForLogin provides a mock function with given fields: loginId, allowSignInWithUsername, allowSignInWithEmail -func (_m *UserStore) GetForLogin(loginId string, allowSignInWithUsername bool, allowSignInWithEmail bool) (*model.User, error) { - ret := _m.Called(loginId, allowSignInWithUsername, allowSignInWithEmail) +// GetForLogin provides a mock function with given fields: loginID, allowSignInWithUsername, allowSignInWithEmail +func (_m *UserStore) GetForLogin(loginID string, allowSignInWithUsername bool, allowSignInWithEmail bool) (*model.User, error) { + ret := _m.Called(loginID, allowSignInWithUsername, allowSignInWithEmail) var r0 *model.User if rf, ok := ret.Get(0).(func(string, bool, bool) *model.User); ok { - r0 = rf(loginId, allowSignInWithUsername, allowSignInWithEmail) + r0 = rf(loginID, allowSignInWithUsername, allowSignInWithEmail) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.User) @@ -584,7 +584,7 @@ func (_m *UserStore) GetForLogin(loginId string, allowSignInWithUsername bool, a var r1 error if rf, ok := ret.Get(1).(func(string, bool, bool) error); ok { - r1 = rf(loginId, allowSignInWithUsername, allowSignInWithEmail) + r1 = rf(loginID, allowSignInWithUsername, allowSignInWithEmail) } else { r1 = ret.Error(1) } @@ -638,13 +638,13 @@ func (_m *UserStore) GetMany(ctx context.Context, ids []string) ([]*model.User, return r0, r1 } -// GetNewUsersForTeam provides a mock function with given fields: teamId, offset, limit, viewRestrictions -func (_m *UserStore) GetNewUsersForTeam(teamId string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { - ret := _m.Called(teamId, offset, limit, viewRestrictions) +// GetNewUsersForTeam provides a mock function with given fields: teamID, offset, limit, viewRestrictions +func (_m *UserStore) GetNewUsersForTeam(teamID string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { + ret := _m.Called(teamID, offset, limit, viewRestrictions) var r0 []*model.User if rf, ok := ret.Get(0).(func(string, int, int, *model.ViewUsersRestrictions) []*model.User); ok { - r0 = rf(teamId, offset, limit, viewRestrictions) + r0 = rf(teamID, offset, limit, viewRestrictions) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.User) @@ -653,7 +653,7 @@ func (_m *UserStore) GetNewUsersForTeam(teamId string, offset int, limit int, vi var r1 error if rf, ok := ret.Get(1).(func(string, int, int, *model.ViewUsersRestrictions) error); ok { - r1 = rf(teamId, offset, limit, viewRestrictions) + r1 = rf(teamID, offset, limit, viewRestrictions) } else { r1 = ret.Error(1) } @@ -822,13 +822,13 @@ func (_m *UserStore) GetProfilesNotInChannel(teamId string, channelId string, gr return r0, r1 } -// GetProfilesNotInTeam provides a mock function with given fields: teamId, groupConstrained, offset, limit, viewRestrictions -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) +// GetProfilesNotInTeam provides a mock function with given fields: teamID, groupConstrained, offset, limit, viewRestrictions +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) var r0 []*model.User if rf, ok := ret.Get(0).(func(string, bool, int, int, *model.ViewUsersRestrictions) []*model.User); ok { - r0 = rf(teamId, groupConstrained, offset, limit, viewRestrictions) + r0 = rf(teamID, groupConstrained, offset, limit, viewRestrictions) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.User) @@ -837,7 +837,7 @@ func (_m *UserStore) GetProfilesNotInTeam(teamId string, groupConstrained bool, var r1 error if rf, ok := ret.Get(1).(func(string, bool, int, int, *model.ViewUsersRestrictions) error); ok { - r1 = rf(teamId, groupConstrained, offset, limit, viewRestrictions) + r1 = rf(teamID, groupConstrained, offset, limit, viewRestrictions) } else { r1 = ret.Error(1) } @@ -868,13 +868,13 @@ func (_m *UserStore) GetProfilesWithoutTeam(options *model.UserGetOptions) ([]*m return r0, r1 } -// GetRecentlyActiveUsersForTeam provides a mock function with given fields: teamId, offset, limit, viewRestrictions -func (_m *UserStore) GetRecentlyActiveUsersForTeam(teamId string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { - ret := _m.Called(teamId, offset, limit, viewRestrictions) +// GetRecentlyActiveUsersForTeam provides a mock function with given fields: teamID, offset, limit, viewRestrictions +func (_m *UserStore) GetRecentlyActiveUsersForTeam(teamID string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { + ret := _m.Called(teamID, offset, limit, viewRestrictions) var r0 []*model.User if rf, ok := ret.Get(0).(func(string, int, int, *model.ViewUsersRestrictions) []*model.User); ok { - r0 = rf(teamId, offset, limit, viewRestrictions) + r0 = rf(teamID, offset, limit, viewRestrictions) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.User) @@ -883,7 +883,7 @@ func (_m *UserStore) GetRecentlyActiveUsersForTeam(teamId string, offset int, li var r1 error if rf, ok := ret.Get(1).(func(string, int, int, *model.ViewUsersRestrictions) error); ok { - r1 = rf(teamId, offset, limit, viewRestrictions) + r1 = rf(teamID, offset, limit, viewRestrictions) } else { r1 = ret.Error(1) } @@ -958,20 +958,20 @@ func (_m *UserStore) GetUnreadCount(userId string) (int64, error) { return r0, r1 } -// GetUnreadCountForChannel provides a mock function with given fields: userId, channelId -func (_m *UserStore) GetUnreadCountForChannel(userId string, channelId string) (int64, error) { - ret := _m.Called(userId, channelId) +// GetUnreadCountForChannel provides a mock function with given fields: userId, channelID +func (_m *UserStore) GetUnreadCountForChannel(userId string, channelID string) (int64, error) { + ret := _m.Called(userId, channelID) var r0 int64 if rf, ok := ret.Get(0).(func(string, string) int64); ok { - r0 = rf(userId, channelId) + r0 = rf(userId, channelID) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(userId, channelId) + r1 = rf(userId, channelID) } else { r1 = ret.Error(1) } @@ -1028,9 +1028,9 @@ func (_m *UserStore) InvalidateProfileCacheForUser(userId string) { _m.Called(userId) } -// InvalidateProfilesInChannelCache provides a mock function with given fields: channelId -func (_m *UserStore) InvalidateProfilesInChannelCache(channelId string) { - _m.Called(channelId) +// InvalidateProfilesInChannelCache provides a mock function with given fields: channelID +func (_m *UserStore) InvalidateProfilesInChannelCache(channelID string) { + _m.Called(channelID) } // InvalidateProfilesInChannelCacheByUser provides a mock function with given fields: userId @@ -1103,13 +1103,13 @@ func (_m *UserStore) Save(user *model.User) (*model.User, error) { return r0, r1 } -// Search provides a mock function with given fields: teamId, term, options -func (_m *UserStore) Search(teamId string, term string, options *model.UserSearchOptions) ([]*model.User, error) { - ret := _m.Called(teamId, term, options) +// Search provides a mock function with given fields: teamID, term, options +func (_m *UserStore) Search(teamID string, term string, options *model.UserSearchOptions) ([]*model.User, error) { + ret := _m.Called(teamID, term, options) var r0 []*model.User if rf, ok := ret.Get(0).(func(string, string, *model.UserSearchOptions) []*model.User); ok { - r0 = rf(teamId, term, options) + r0 = rf(teamID, term, options) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.User) @@ -1118,7 +1118,7 @@ func (_m *UserStore) Search(teamId string, term string, options *model.UserSearc var r1 error if rf, ok := ret.Get(1).(func(string, string, *model.UserSearchOptions) error); ok { - r1 = rf(teamId, term, options) + r1 = rf(teamID, term, options) } else { r1 = ret.Error(1) } @@ -1126,13 +1126,13 @@ func (_m *UserStore) Search(teamId string, term string, options *model.UserSearc return r0, r1 } -// SearchInChannel provides a mock function with given fields: channelId, term, options -func (_m *UserStore) SearchInChannel(channelId string, term string, options *model.UserSearchOptions) ([]*model.User, error) { - ret := _m.Called(channelId, term, options) +// SearchInChannel provides a mock function with given fields: channelID, term, options +func (_m *UserStore) SearchInChannel(channelID string, term string, options *model.UserSearchOptions) ([]*model.User, error) { + ret := _m.Called(channelID, term, options) var r0 []*model.User if rf, ok := ret.Get(0).(func(string, string, *model.UserSearchOptions) []*model.User); ok { - r0 = rf(channelId, term, options) + r0 = rf(channelID, term, options) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.User) @@ -1141,7 +1141,7 @@ func (_m *UserStore) SearchInChannel(channelId string, term string, options *mod var r1 error if rf, ok := ret.Get(1).(func(string, string, *model.UserSearchOptions) error); ok { - r1 = rf(channelId, term, options) + r1 = rf(channelID, term, options) } else { r1 = ret.Error(1) } @@ -1172,13 +1172,13 @@ func (_m *UserStore) SearchInGroup(groupID string, term string, options *model.U return r0, r1 } -// SearchNotInChannel provides a mock function with given fields: teamId, channelId, term, options -func (_m *UserStore) SearchNotInChannel(teamId string, channelId string, term string, options *model.UserSearchOptions) ([]*model.User, error) { - ret := _m.Called(teamId, channelId, term, options) +// SearchNotInChannel provides a mock function with given fields: teamID, channelID, term, options +func (_m *UserStore) SearchNotInChannel(teamID string, channelID string, term string, options *model.UserSearchOptions) ([]*model.User, error) { + ret := _m.Called(teamID, channelID, term, options) var r0 []*model.User if rf, ok := ret.Get(0).(func(string, string, string, *model.UserSearchOptions) []*model.User); ok { - r0 = rf(teamId, channelId, term, options) + r0 = rf(teamID, channelID, term, options) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.User) @@ -1187,7 +1187,7 @@ func (_m *UserStore) SearchNotInChannel(teamId string, channelId string, term st var r1 error if rf, ok := ret.Get(1).(func(string, string, string, *model.UserSearchOptions) error); ok { - r1 = rf(teamId, channelId, term, options) + r1 = rf(teamID, channelID, term, options) } else { r1 = ret.Error(1) } diff --git a/store/storetest/mocks/WebhookStore.go b/store/storetest/mocks/WebhookStore.go index 05efea97d5..f73f5204ab 100644 --- a/store/storetest/mocks/WebhookStore.go +++ b/store/storetest/mocks/WebhookStore.go @@ -14,20 +14,20 @@ type WebhookStore struct { mock.Mock } -// AnalyticsIncomingCount provides a mock function with given fields: teamId -func (_m *WebhookStore) AnalyticsIncomingCount(teamId string) (int64, error) { - ret := _m.Called(teamId) +// AnalyticsIncomingCount provides a mock function with given fields: teamID +func (_m *WebhookStore) AnalyticsIncomingCount(teamID string) (int64, error) { + ret := _m.Called(teamID) var r0 int64 if rf, ok := ret.Get(0).(func(string) int64); ok { - r0 = rf(teamId) + r0 = rf(teamID) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(teamId) + r1 = rf(teamID) } else { r1 = ret.Error(1) } @@ -35,20 +35,20 @@ func (_m *WebhookStore) AnalyticsIncomingCount(teamId string) (int64, error) { return r0, r1 } -// AnalyticsOutgoingCount provides a mock function with given fields: teamId -func (_m *WebhookStore) AnalyticsOutgoingCount(teamId string) (int64, error) { - ret := _m.Called(teamId) +// AnalyticsOutgoingCount provides a mock function with given fields: teamID +func (_m *WebhookStore) AnalyticsOutgoingCount(teamID string) (int64, error) { + ret := _m.Called(teamID) var r0 int64 if rf, ok := ret.Get(0).(func(string) int64); ok { - r0 = rf(teamId) + r0 = rf(teamID) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(teamId) + r1 = rf(teamID) } else { r1 = ret.Error(1) } @@ -61,13 +61,13 @@ func (_m *WebhookStore) ClearCaches() { _m.Called() } -// DeleteIncoming provides a mock function with given fields: webhookId, time -func (_m *WebhookStore) DeleteIncoming(webhookId string, time int64) error { - ret := _m.Called(webhookId, time) +// DeleteIncoming provides a mock function with given fields: webhookID, time +func (_m *WebhookStore) DeleteIncoming(webhookID string, time int64) error { + ret := _m.Called(webhookID, time) var r0 error if rf, ok := ret.Get(0).(func(string, int64) error); ok { - r0 = rf(webhookId, time) + r0 = rf(webhookID, time) } else { r0 = ret.Error(0) } @@ -75,13 +75,13 @@ func (_m *WebhookStore) DeleteIncoming(webhookId string, time int64) error { return r0 } -// DeleteOutgoing provides a mock function with given fields: webhookId, time -func (_m *WebhookStore) DeleteOutgoing(webhookId string, time int64) error { - ret := _m.Called(webhookId, time) +// DeleteOutgoing provides a mock function with given fields: webhookID, time +func (_m *WebhookStore) DeleteOutgoing(webhookID string, time int64) error { + ret := _m.Called(webhookID, time) var r0 error if rf, ok := ret.Get(0).(func(string, int64) error); ok { - r0 = rf(webhookId, time) + r0 = rf(webhookID, time) } else { r0 = ret.Error(0) } @@ -112,13 +112,13 @@ func (_m *WebhookStore) GetIncoming(id string, allowFromCache bool) (*model.Inco return r0, r1 } -// GetIncomingByChannel provides a mock function with given fields: channelId -func (_m *WebhookStore) GetIncomingByChannel(channelId string) ([]*model.IncomingWebhook, error) { - ret := _m.Called(channelId) +// GetIncomingByChannel provides a mock function with given fields: channelID +func (_m *WebhookStore) GetIncomingByChannel(channelID string) ([]*model.IncomingWebhook, error) { + ret := _m.Called(channelID) var r0 []*model.IncomingWebhook if rf, ok := ret.Get(0).(func(string) []*model.IncomingWebhook); ok { - r0 = rf(channelId) + r0 = rf(channelID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.IncomingWebhook) @@ -127,7 +127,7 @@ func (_m *WebhookStore) GetIncomingByChannel(channelId string) ([]*model.Incomin var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(channelId) + r1 = rf(channelID) } else { r1 = ret.Error(1) } @@ -135,13 +135,13 @@ func (_m *WebhookStore) GetIncomingByChannel(channelId string) ([]*model.Incomin return r0, r1 } -// GetIncomingByTeam provides a mock function with given fields: teamId, offset, limit -func (_m *WebhookStore) GetIncomingByTeam(teamId string, offset int, limit int) ([]*model.IncomingWebhook, error) { - ret := _m.Called(teamId, offset, limit) +// GetIncomingByTeam provides a mock function with given fields: teamID, offset, limit +func (_m *WebhookStore) GetIncomingByTeam(teamID string, offset int, limit int) ([]*model.IncomingWebhook, error) { + ret := _m.Called(teamID, offset, limit) var r0 []*model.IncomingWebhook if rf, ok := ret.Get(0).(func(string, int, int) []*model.IncomingWebhook); ok { - r0 = rf(teamId, offset, limit) + r0 = rf(teamID, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.IncomingWebhook) @@ -150,7 +150,7 @@ func (_m *WebhookStore) GetIncomingByTeam(teamId string, offset int, limit int) var r1 error if rf, ok := ret.Get(1).(func(string, int, int) error); ok { - r1 = rf(teamId, offset, limit) + r1 = rf(teamID, offset, limit) } else { r1 = ret.Error(1) } @@ -158,13 +158,13 @@ func (_m *WebhookStore) GetIncomingByTeam(teamId string, offset int, limit int) return r0, r1 } -// GetIncomingByTeamByUser provides a mock function with given fields: teamId, userId, offset, limit -func (_m *WebhookStore) GetIncomingByTeamByUser(teamId string, userId string, offset int, limit int) ([]*model.IncomingWebhook, error) { - ret := _m.Called(teamId, userId, offset, limit) +// GetIncomingByTeamByUser provides a mock function with given fields: teamID, userId, offset, limit +func (_m *WebhookStore) GetIncomingByTeamByUser(teamID string, userId string, offset int, limit int) ([]*model.IncomingWebhook, error) { + ret := _m.Called(teamID, userId, offset, limit) var r0 []*model.IncomingWebhook if rf, ok := ret.Get(0).(func(string, string, int, int) []*model.IncomingWebhook); ok { - r0 = rf(teamId, userId, offset, limit) + r0 = rf(teamID, userId, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.IncomingWebhook) @@ -173,7 +173,7 @@ func (_m *WebhookStore) GetIncomingByTeamByUser(teamId string, userId string, of var r1 error if rf, ok := ret.Get(1).(func(string, string, int, int) error); ok { - r1 = rf(teamId, userId, offset, limit) + r1 = rf(teamID, userId, offset, limit) } else { r1 = ret.Error(1) } @@ -250,13 +250,13 @@ func (_m *WebhookStore) GetOutgoing(id string) (*model.OutgoingWebhook, error) { return r0, r1 } -// GetOutgoingByChannel provides a mock function with given fields: channelId, offset, limit -func (_m *WebhookStore) GetOutgoingByChannel(channelId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { - ret := _m.Called(channelId, offset, limit) +// GetOutgoingByChannel provides a mock function with given fields: channelID, offset, limit +func (_m *WebhookStore) GetOutgoingByChannel(channelID string, offset int, limit int) ([]*model.OutgoingWebhook, error) { + ret := _m.Called(channelID, offset, limit) var r0 []*model.OutgoingWebhook if rf, ok := ret.Get(0).(func(string, int, int) []*model.OutgoingWebhook); ok { - r0 = rf(channelId, offset, limit) + r0 = rf(channelID, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.OutgoingWebhook) @@ -265,7 +265,7 @@ func (_m *WebhookStore) GetOutgoingByChannel(channelId string, offset int, limit var r1 error if rf, ok := ret.Get(1).(func(string, int, int) error); ok { - r1 = rf(channelId, offset, limit) + r1 = rf(channelID, offset, limit) } else { r1 = ret.Error(1) } @@ -273,13 +273,13 @@ func (_m *WebhookStore) GetOutgoingByChannel(channelId string, offset int, limit return r0, r1 } -// GetOutgoingByChannelByUser provides a mock function with given fields: channelId, userId, offset, limit -func (_m *WebhookStore) GetOutgoingByChannelByUser(channelId string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { - ret := _m.Called(channelId, userId, offset, limit) +// GetOutgoingByChannelByUser provides a mock function with given fields: channelID, userId, offset, limit +func (_m *WebhookStore) GetOutgoingByChannelByUser(channelID string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { + ret := _m.Called(channelID, userId, offset, limit) var r0 []*model.OutgoingWebhook if rf, ok := ret.Get(0).(func(string, string, int, int) []*model.OutgoingWebhook); ok { - r0 = rf(channelId, userId, offset, limit) + r0 = rf(channelID, userId, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.OutgoingWebhook) @@ -288,7 +288,7 @@ func (_m *WebhookStore) GetOutgoingByChannelByUser(channelId string, userId stri var r1 error if rf, ok := ret.Get(1).(func(string, string, int, int) error); ok { - r1 = rf(channelId, userId, offset, limit) + r1 = rf(channelID, userId, offset, limit) } else { r1 = ret.Error(1) } @@ -296,13 +296,13 @@ func (_m *WebhookStore) GetOutgoingByChannelByUser(channelId string, userId stri return r0, r1 } -// GetOutgoingByTeam provides a mock function with given fields: teamId, offset, limit -func (_m *WebhookStore) GetOutgoingByTeam(teamId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { - ret := _m.Called(teamId, offset, limit) +// GetOutgoingByTeam provides a mock function with given fields: teamID, offset, limit +func (_m *WebhookStore) GetOutgoingByTeam(teamID string, offset int, limit int) ([]*model.OutgoingWebhook, error) { + ret := _m.Called(teamID, offset, limit) var r0 []*model.OutgoingWebhook if rf, ok := ret.Get(0).(func(string, int, int) []*model.OutgoingWebhook); ok { - r0 = rf(teamId, offset, limit) + r0 = rf(teamID, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.OutgoingWebhook) @@ -311,7 +311,7 @@ func (_m *WebhookStore) GetOutgoingByTeam(teamId string, offset int, limit int) var r1 error if rf, ok := ret.Get(1).(func(string, int, int) error); ok { - r1 = rf(teamId, offset, limit) + r1 = rf(teamID, offset, limit) } else { r1 = ret.Error(1) } @@ -319,13 +319,13 @@ func (_m *WebhookStore) GetOutgoingByTeam(teamId string, offset int, limit int) return r0, r1 } -// GetOutgoingByTeamByUser provides a mock function with given fields: teamId, userId, offset, limit -func (_m *WebhookStore) GetOutgoingByTeamByUser(teamId string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { - ret := _m.Called(teamId, userId, offset, limit) +// GetOutgoingByTeamByUser provides a mock function with given fields: teamID, userId, offset, limit +func (_m *WebhookStore) GetOutgoingByTeamByUser(teamID string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { + ret := _m.Called(teamID, userId, offset, limit) var r0 []*model.OutgoingWebhook if rf, ok := ret.Get(0).(func(string, string, int, int) []*model.OutgoingWebhook); ok { - r0 = rf(teamId, userId, offset, limit) + r0 = rf(teamID, userId, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.OutgoingWebhook) @@ -334,7 +334,7 @@ func (_m *WebhookStore) GetOutgoingByTeamByUser(teamId string, userId string, of var r1 error if rf, ok := ret.Get(1).(func(string, string, int, int) error); ok { - r1 = rf(teamId, userId, offset, limit) + r1 = rf(teamID, userId, offset, limit) } else { r1 = ret.Error(1) } @@ -393,13 +393,13 @@ func (_m *WebhookStore) InvalidateWebhookCache(webhook string) { _m.Called(webhook) } -// PermanentDeleteIncomingByChannel provides a mock function with given fields: channelId -func (_m *WebhookStore) PermanentDeleteIncomingByChannel(channelId string) error { - ret := _m.Called(channelId) +// PermanentDeleteIncomingByChannel provides a mock function with given fields: channelID +func (_m *WebhookStore) PermanentDeleteIncomingByChannel(channelID string) error { + ret := _m.Called(channelID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(channelId) + r0 = rf(channelID) } else { r0 = ret.Error(0) } @@ -421,13 +421,13 @@ func (_m *WebhookStore) PermanentDeleteIncomingByUser(userId string) error { return r0 } -// PermanentDeleteOutgoingByChannel provides a mock function with given fields: channelId -func (_m *WebhookStore) PermanentDeleteOutgoingByChannel(channelId string) error { - ret := _m.Called(channelId) +// PermanentDeleteOutgoingByChannel provides a mock function with given fields: channelID +func (_m *WebhookStore) PermanentDeleteOutgoingByChannel(channelID string) error { + ret := _m.Called(channelID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(channelId) + r0 = rf(channelID) } else { r0 = ret.Error(0) } diff --git a/store/timerlayer/timerlayer.go b/store/timerlayer/timerlayer.go index ef9093f016..99f936d4ff 100644 --- a/store/timerlayer/timerlayer.go +++ b/store/timerlayer/timerlayer.go @@ -488,10 +488,10 @@ func (s *TimerLayerBotStore) Update(bot *model.Bot) (*model.Bot, error) { return result, err } -func (s *TimerLayerChannelStore) AnalyticsDeletedTypeCount(teamId string, channelType string) (int64, error) { +func (s *TimerLayerChannelStore) AnalyticsDeletedTypeCount(teamID string, channelType string) (int64, error) { start := timemodule.Now() - result, err := s.ChannelStore.AnalyticsDeletedTypeCount(teamId, channelType) + result, err := s.ChannelStore.AnalyticsDeletedTypeCount(teamID, channelType) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -504,10 +504,10 @@ func (s *TimerLayerChannelStore) AnalyticsDeletedTypeCount(teamId string, channe return result, err } -func (s *TimerLayerChannelStore) AnalyticsTypeCount(teamId string, channelType string) (int64, error) { +func (s *TimerLayerChannelStore) AnalyticsTypeCount(teamID string, channelType string) (int64, error) { start := timemodule.Now() - result, err := s.ChannelStore.AnalyticsTypeCount(teamId, channelType) + result, err := s.ChannelStore.AnalyticsTypeCount(teamID, channelType) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -520,10 +520,10 @@ func (s *TimerLayerChannelStore) AnalyticsTypeCount(teamId string, channelType s return result, err } -func (s *TimerLayerChannelStore) AutocompleteInTeam(teamId string, term string, includeDeleted bool) (*model.ChannelList, error) { +func (s *TimerLayerChannelStore) AutocompleteInTeam(teamID string, term string, includeDeleted bool) (*model.ChannelList, error) { start := timemodule.Now() - result, err := s.ChannelStore.AutocompleteInTeam(teamId, term, includeDeleted) + result, err := s.ChannelStore.AutocompleteInTeam(teamID, term, includeDeleted) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -536,10 +536,10 @@ func (s *TimerLayerChannelStore) AutocompleteInTeam(teamId string, term string, return result, err } -func (s *TimerLayerChannelStore) AutocompleteInTeamForSearch(teamId string, userId string, term string, includeDeleted bool) (*model.ChannelList, error) { +func (s *TimerLayerChannelStore) AutocompleteInTeamForSearch(teamID string, userId string, term string, includeDeleted bool) (*model.ChannelList, error) { start := timemodule.Now() - result, err := s.ChannelStore.AutocompleteInTeamForSearch(teamId, userId, term, includeDeleted) + result, err := s.ChannelStore.AutocompleteInTeamForSearch(teamID, userId, term, includeDeleted) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -583,10 +583,10 @@ func (s *TimerLayerChannelStore) ClearCaches() { } } -func (s *TimerLayerChannelStore) ClearSidebarOnTeamLeave(userId string, teamId string) error { +func (s *TimerLayerChannelStore) ClearSidebarOnTeamLeave(userId string, teamID string) error { start := timemodule.Now() - err := s.ChannelStore.ClearSidebarOnTeamLeave(userId, teamId) + err := s.ChannelStore.ClearSidebarOnTeamLeave(userId, teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -599,10 +599,10 @@ func (s *TimerLayerChannelStore) ClearSidebarOnTeamLeave(userId string, teamId s return err } -func (s *TimerLayerChannelStore) CountPostsAfter(channelId string, timestamp int64, userId string) (int, error) { +func (s *TimerLayerChannelStore) CountPostsAfter(channelID string, timestamp int64, userId string) (int, error) { start := timemodule.Now() - result, err := s.ChannelStore.CountPostsAfter(channelId, timestamp, userId) + result, err := s.ChannelStore.CountPostsAfter(channelID, timestamp, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -631,10 +631,10 @@ func (s *TimerLayerChannelStore) CreateDirectChannel(userId *model.User, otherUs return result, err } -func (s *TimerLayerChannelStore) CreateInitialSidebarCategories(userId string, teamId string) error { +func (s *TimerLayerChannelStore) CreateInitialSidebarCategories(userId string, teamID string) error { start := timemodule.Now() - err := s.ChannelStore.CreateInitialSidebarCategories(userId, teamId) + err := s.ChannelStore.CreateInitialSidebarCategories(userId, teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -647,10 +647,10 @@ func (s *TimerLayerChannelStore) CreateInitialSidebarCategories(userId string, t return err } -func (s *TimerLayerChannelStore) CreateSidebarCategory(userId string, teamId string, newCategory *model.SidebarCategoryWithChannels) (*model.SidebarCategoryWithChannels, error) { +func (s *TimerLayerChannelStore) CreateSidebarCategory(userId string, teamID string, newCategory *model.SidebarCategoryWithChannels) (*model.SidebarCategoryWithChannels, error) { start := timemodule.Now() - result, err := s.ChannelStore.CreateSidebarCategory(userId, teamId, newCategory) + result, err := s.ChannelStore.CreateSidebarCategory(userId, teamID, newCategory) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -663,10 +663,10 @@ func (s *TimerLayerChannelStore) CreateSidebarCategory(userId string, teamId str return result, err } -func (s *TimerLayerChannelStore) Delete(channelId string, time int64) error { +func (s *TimerLayerChannelStore) Delete(channelID string, time int64) error { start := timemodule.Now() - err := s.ChannelStore.Delete(channelId, time) + err := s.ChannelStore.Delete(channelID, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -679,10 +679,10 @@ func (s *TimerLayerChannelStore) Delete(channelId string, time int64) error { return err } -func (s *TimerLayerChannelStore) DeleteSidebarCategory(categoryId string) error { +func (s *TimerLayerChannelStore) DeleteSidebarCategory(categoryID string) error { start := timemodule.Now() - err := s.ChannelStore.DeleteSidebarCategory(categoryId) + err := s.ChannelStore.DeleteSidebarCategory(categoryID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -727,10 +727,10 @@ func (s *TimerLayerChannelStore) Get(id string, allowFromCache bool) (*model.Cha return result, err } -func (s *TimerLayerChannelStore) GetAll(teamId string) ([]*model.Channel, error) { +func (s *TimerLayerChannelStore) GetAll(teamID string) ([]*model.Channel, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetAll(teamId) + result, err := s.ChannelStore.GetAll(teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -759,10 +759,10 @@ func (s *TimerLayerChannelStore) GetAllChannelMembersForUser(userId string, allo return result, err } -func (s *TimerLayerChannelStore) GetAllChannelMembersNotifyPropsForChannel(channelId string, allowFromCache bool) (map[string]model.StringMap, error) { +func (s *TimerLayerChannelStore) GetAllChannelMembersNotifyPropsForChannel(channelID string, allowFromCache bool) (map[string]model.StringMap, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetAllChannelMembersNotifyPropsForChannel(channelId, allowFromCache) + result, err := s.ChannelStore.GetAllChannelMembersNotifyPropsForChannel(channelID, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -807,10 +807,10 @@ func (s *TimerLayerChannelStore) GetAllChannelsCount(opts store.ChannelSearchOpt return result, err } -func (s *TimerLayerChannelStore) GetAllChannelsForExportAfter(limit int, afterId string) ([]*model.ChannelForExport, error) { +func (s *TimerLayerChannelStore) GetAllChannelsForExportAfter(limit int, afterID string) ([]*model.ChannelForExport, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetAllChannelsForExportAfter(limit, afterId) + result, err := s.ChannelStore.GetAllChannelsForExportAfter(limit, afterID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -823,10 +823,10 @@ func (s *TimerLayerChannelStore) GetAllChannelsForExportAfter(limit int, afterId return result, err } -func (s *TimerLayerChannelStore) GetAllDirectChannelsForExportAfter(limit int, afterId string) ([]*model.DirectChannelForExport, error) { +func (s *TimerLayerChannelStore) GetAllDirectChannelsForExportAfter(limit int, afterID string) ([]*model.DirectChannelForExport, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetAllDirectChannelsForExportAfter(limit, afterId) + result, err := s.ChannelStore.GetAllDirectChannelsForExportAfter(limit, afterID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -887,10 +887,10 @@ func (s *TimerLayerChannelStore) GetByNames(team_id string, names []string, allo return result, err } -func (s *TimerLayerChannelStore) GetChannelCounts(teamId string, userId string) (*model.ChannelCounts, error) { +func (s *TimerLayerChannelStore) GetChannelCounts(teamID string, userId string) (*model.ChannelCounts, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetChannelCounts(teamId, userId) + result, err := s.ChannelStore.GetChannelCounts(teamID, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -903,10 +903,10 @@ func (s *TimerLayerChannelStore) GetChannelCounts(teamId string, userId string) return result, err } -func (s *TimerLayerChannelStore) GetChannelMembersForExport(userId string, teamId string) ([]*model.ChannelMemberForExport, error) { +func (s *TimerLayerChannelStore) GetChannelMembersForExport(userId string, teamID string) ([]*model.ChannelMemberForExport, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetChannelMembersForExport(userId, teamId) + result, err := s.ChannelStore.GetChannelMembersForExport(userId, teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -919,10 +919,10 @@ func (s *TimerLayerChannelStore) GetChannelMembersForExport(userId string, teamI return result, err } -func (s *TimerLayerChannelStore) GetChannelMembersTimezones(channelId string) ([]model.StringMap, error) { +func (s *TimerLayerChannelStore) GetChannelMembersTimezones(channelID string) ([]model.StringMap, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetChannelMembersTimezones(channelId) + result, err := s.ChannelStore.GetChannelMembersTimezones(channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -935,10 +935,10 @@ func (s *TimerLayerChannelStore) GetChannelMembersTimezones(channelId string) ([ return result, err } -func (s *TimerLayerChannelStore) GetChannelUnread(channelId string, userId string) (*model.ChannelUnread, error) { +func (s *TimerLayerChannelStore) GetChannelUnread(channelID string, userId string) (*model.ChannelUnread, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetChannelUnread(channelId, userId) + result, err := s.ChannelStore.GetChannelUnread(channelID, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -951,10 +951,10 @@ func (s *TimerLayerChannelStore) GetChannelUnread(channelId string, userId strin return result, err } -func (s *TimerLayerChannelStore) GetChannels(teamId string, userId string, includeDeleted bool, lastDeleteAt int) (*model.ChannelList, error) { +func (s *TimerLayerChannelStore) GetChannels(teamID string, userId string, includeDeleted bool, lastDeleteAt int) (*model.ChannelList, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetChannels(teamId, userId, includeDeleted, lastDeleteAt) + result, err := s.ChannelStore.GetChannels(teamID, userId, includeDeleted, lastDeleteAt) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -999,10 +999,10 @@ func (s *TimerLayerChannelStore) GetChannelsByIds(channelIds []string, includeDe return result, err } -func (s *TimerLayerChannelStore) GetChannelsByScheme(schemeId string, offset int, limit int) (model.ChannelList, error) { +func (s *TimerLayerChannelStore) GetChannelsByScheme(schemeID string, offset int, limit int) (model.ChannelList, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetChannelsByScheme(schemeId, offset, limit) + result, err := s.ChannelStore.GetChannelsByScheme(schemeID, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1047,10 +1047,10 @@ func (s *TimerLayerChannelStore) GetDeletedByName(team_id string, name string) ( return result, err } -func (s *TimerLayerChannelStore) GetForPost(postId string) (*model.Channel, error) { +func (s *TimerLayerChannelStore) GetForPost(postID string) (*model.Channel, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetForPost(postId) + result, err := s.ChannelStore.GetForPost(postID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1079,10 +1079,10 @@ func (s *TimerLayerChannelStore) GetFromMaster(id string) (*model.Channel, error return result, err } -func (s *TimerLayerChannelStore) GetGuestCount(channelId string, allowFromCache bool) (int64, error) { +func (s *TimerLayerChannelStore) GetGuestCount(channelID string, allowFromCache bool) (int64, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetGuestCount(channelId, allowFromCache) + result, err := s.ChannelStore.GetGuestCount(channelID, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1095,10 +1095,10 @@ func (s *TimerLayerChannelStore) GetGuestCount(channelId string, allowFromCache return result, err } -func (s *TimerLayerChannelStore) GetMember(channelId string, userId string) (*model.ChannelMember, error) { +func (s *TimerLayerChannelStore) GetMember(channelID string, userId string) (*model.ChannelMember, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetMember(channelId, userId) + result, err := s.ChannelStore.GetMember(channelID, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1111,10 +1111,10 @@ func (s *TimerLayerChannelStore) GetMember(channelId string, userId string) (*mo return result, err } -func (s *TimerLayerChannelStore) GetMemberCount(channelId string, allowFromCache bool) (int64, error) { +func (s *TimerLayerChannelStore) GetMemberCount(channelID string, allowFromCache bool) (int64, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetMemberCount(channelId, allowFromCache) + result, err := s.ChannelStore.GetMemberCount(channelID, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1127,10 +1127,10 @@ func (s *TimerLayerChannelStore) GetMemberCount(channelId string, allowFromCache return result, err } -func (s *TimerLayerChannelStore) GetMemberCountFromCache(channelId string) int64 { +func (s *TimerLayerChannelStore) GetMemberCountFromCache(channelID string) int64 { start := timemodule.Now() - result := s.ChannelStore.GetMemberCountFromCache(channelId) + result := s.ChannelStore.GetMemberCountFromCache(channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1159,10 +1159,10 @@ func (s *TimerLayerChannelStore) GetMemberCountsByGroup(channelID string, includ return result, err } -func (s *TimerLayerChannelStore) GetMemberForPost(postId string, userId string) (*model.ChannelMember, error) { +func (s *TimerLayerChannelStore) GetMemberForPost(postID string, userId string) (*model.ChannelMember, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetMemberForPost(postId, userId) + result, err := s.ChannelStore.GetMemberForPost(postID, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1175,10 +1175,10 @@ func (s *TimerLayerChannelStore) GetMemberForPost(postId string, userId string) return result, err } -func (s *TimerLayerChannelStore) GetMembers(channelId string, offset int, limit int) (*model.ChannelMembers, error) { +func (s *TimerLayerChannelStore) GetMembers(channelID string, offset int, limit int) (*model.ChannelMembers, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetMembers(channelId, offset, limit) + result, err := s.ChannelStore.GetMembers(channelID, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1207,10 +1207,10 @@ func (s *TimerLayerChannelStore) GetMembersByChannelIds(channelIds []string, use return result, err } -func (s *TimerLayerChannelStore) GetMembersByIds(channelId string, userIds []string) (*model.ChannelMembers, error) { +func (s *TimerLayerChannelStore) GetMembersByIds(channelID string, userIds []string) (*model.ChannelMembers, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetMembersByIds(channelId, userIds) + result, err := s.ChannelStore.GetMembersByIds(channelID, userIds) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1223,10 +1223,10 @@ func (s *TimerLayerChannelStore) GetMembersByIds(channelId string, userIds []str return result, err } -func (s *TimerLayerChannelStore) GetMembersForUser(teamId string, userId string) (*model.ChannelMembers, error) { +func (s *TimerLayerChannelStore) GetMembersForUser(teamID string, userId string) (*model.ChannelMembers, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetMembersForUser(teamId, userId) + result, err := s.ChannelStore.GetMembersForUser(teamID, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1239,10 +1239,10 @@ func (s *TimerLayerChannelStore) GetMembersForUser(teamId string, userId string) return result, err } -func (s *TimerLayerChannelStore) GetMembersForUserWithPagination(teamId string, userId string, page int, perPage int) (*model.ChannelMembers, error) { +func (s *TimerLayerChannelStore) GetMembersForUserWithPagination(teamID string, userId string, page int, perPage int) (*model.ChannelMembers, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetMembersForUserWithPagination(teamId, userId, page, perPage) + result, err := s.ChannelStore.GetMembersForUserWithPagination(teamID, userId, page, perPage) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1255,10 +1255,10 @@ func (s *TimerLayerChannelStore) GetMembersForUserWithPagination(teamId string, return result, err } -func (s *TimerLayerChannelStore) GetMoreChannels(teamId string, userId string, offset int, limit int) (*model.ChannelList, error) { +func (s *TimerLayerChannelStore) GetMoreChannels(teamID string, userId string, offset int, limit int) (*model.ChannelList, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetMoreChannels(teamId, userId, offset, limit) + result, err := s.ChannelStore.GetMoreChannels(teamID, userId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1271,10 +1271,10 @@ func (s *TimerLayerChannelStore) GetMoreChannels(teamId string, userId string, o return result, err } -func (s *TimerLayerChannelStore) GetPinnedPostCount(channelId string, allowFromCache bool) (int64, error) { +func (s *TimerLayerChannelStore) GetPinnedPostCount(channelID string, allowFromCache bool) (int64, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetPinnedPostCount(channelId, allowFromCache) + result, err := s.ChannelStore.GetPinnedPostCount(channelID, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1287,10 +1287,10 @@ func (s *TimerLayerChannelStore) GetPinnedPostCount(channelId string, allowFromC return result, err } -func (s *TimerLayerChannelStore) GetPinnedPosts(channelId string) (*model.PostList, error) { +func (s *TimerLayerChannelStore) GetPinnedPosts(channelID string) (*model.PostList, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetPinnedPosts(channelId) + result, err := s.ChannelStore.GetPinnedPosts(channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1303,10 +1303,10 @@ func (s *TimerLayerChannelStore) GetPinnedPosts(channelId string) (*model.PostLi return result, err } -func (s *TimerLayerChannelStore) GetPrivateChannelsForTeam(teamId string, offset int, limit int) (*model.ChannelList, error) { +func (s *TimerLayerChannelStore) GetPrivateChannelsForTeam(teamID string, offset int, limit int) (*model.ChannelList, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetPrivateChannelsForTeam(teamId, offset, limit) + result, err := s.ChannelStore.GetPrivateChannelsForTeam(teamID, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1319,10 +1319,10 @@ func (s *TimerLayerChannelStore) GetPrivateChannelsForTeam(teamId string, offset return result, err } -func (s *TimerLayerChannelStore) GetPublicChannelsByIdsForTeam(teamId string, channelIds []string) (*model.ChannelList, error) { +func (s *TimerLayerChannelStore) GetPublicChannelsByIdsForTeam(teamID string, channelIds []string) (*model.ChannelList, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetPublicChannelsByIdsForTeam(teamId, channelIds) + result, err := s.ChannelStore.GetPublicChannelsByIdsForTeam(teamID, channelIds) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1335,10 +1335,10 @@ func (s *TimerLayerChannelStore) GetPublicChannelsByIdsForTeam(teamId string, ch return result, err } -func (s *TimerLayerChannelStore) GetPublicChannelsForTeam(teamId string, offset int, limit int) (*model.ChannelList, error) { +func (s *TimerLayerChannelStore) GetPublicChannelsForTeam(teamID string, offset int, limit int) (*model.ChannelList, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetPublicChannelsForTeam(teamId, offset, limit) + result, err := s.ChannelStore.GetPublicChannelsForTeam(teamID, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1351,10 +1351,10 @@ func (s *TimerLayerChannelStore) GetPublicChannelsForTeam(teamId string, offset return result, err } -func (s *TimerLayerChannelStore) GetSidebarCategories(userId string, teamId string) (*model.OrderedSidebarCategories, error) { +func (s *TimerLayerChannelStore) GetSidebarCategories(userId string, teamID string) (*model.OrderedSidebarCategories, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetSidebarCategories(userId, teamId) + result, err := s.ChannelStore.GetSidebarCategories(userId, teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1367,10 +1367,10 @@ func (s *TimerLayerChannelStore) GetSidebarCategories(userId string, teamId stri return result, err } -func (s *TimerLayerChannelStore) GetSidebarCategory(categoryId string) (*model.SidebarCategoryWithChannels, error) { +func (s *TimerLayerChannelStore) GetSidebarCategory(categoryID string) (*model.SidebarCategoryWithChannels, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetSidebarCategory(categoryId) + result, err := s.ChannelStore.GetSidebarCategory(categoryID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1383,10 +1383,10 @@ func (s *TimerLayerChannelStore) GetSidebarCategory(categoryId string) (*model.S return result, err } -func (s *TimerLayerChannelStore) GetSidebarCategoryOrder(userId string, teamId string) ([]string, error) { +func (s *TimerLayerChannelStore) GetSidebarCategoryOrder(userId string, teamID string) ([]string, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetSidebarCategoryOrder(userId, teamId) + result, err := s.ChannelStore.GetSidebarCategoryOrder(userId, teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1399,10 +1399,10 @@ func (s *TimerLayerChannelStore) GetSidebarCategoryOrder(userId string, teamId s return result, err } -func (s *TimerLayerChannelStore) GetTeamChannels(teamId string) (*model.ChannelList, error) { +func (s *TimerLayerChannelStore) GetTeamChannels(teamID string) (*model.ChannelList, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetTeamChannels(teamId) + result, err := s.ChannelStore.GetTeamChannels(teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1431,10 +1431,10 @@ func (s *TimerLayerChannelStore) GroupSyncedChannelCount() (int64, error) { return result, err } -func (s *TimerLayerChannelStore) IncrementMentionCount(channelId string, userId string, updateThreads bool) error { +func (s *TimerLayerChannelStore) IncrementMentionCount(channelID string, userId string, updateThreads bool) error { start := timemodule.Now() - err := s.ChannelStore.IncrementMentionCount(channelId, userId, updateThreads) + err := s.ChannelStore.IncrementMentionCount(channelID, userId, updateThreads) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1462,10 +1462,10 @@ func (s *TimerLayerChannelStore) InvalidateAllChannelMembersForUser(userId strin } } -func (s *TimerLayerChannelStore) InvalidateCacheForChannelMembersNotifyProps(channelId string) { +func (s *TimerLayerChannelStore) InvalidateCacheForChannelMembersNotifyProps(channelID string) { start := timemodule.Now() - s.ChannelStore.InvalidateCacheForChannelMembersNotifyProps(channelId) + s.ChannelStore.InvalidateCacheForChannelMembersNotifyProps(channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1492,10 +1492,10 @@ func (s *TimerLayerChannelStore) InvalidateChannel(id string) { } } -func (s *TimerLayerChannelStore) InvalidateChannelByName(teamId string, name string) { +func (s *TimerLayerChannelStore) InvalidateChannelByName(teamID string, name string) { start := timemodule.Now() - s.ChannelStore.InvalidateChannelByName(teamId, name) + s.ChannelStore.InvalidateChannelByName(teamID, name) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1507,10 +1507,10 @@ func (s *TimerLayerChannelStore) InvalidateChannelByName(teamId string, name str } } -func (s *TimerLayerChannelStore) InvalidateGuestCount(channelId string) { +func (s *TimerLayerChannelStore) InvalidateGuestCount(channelID string) { start := timemodule.Now() - s.ChannelStore.InvalidateGuestCount(channelId) + s.ChannelStore.InvalidateGuestCount(channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1522,10 +1522,10 @@ func (s *TimerLayerChannelStore) InvalidateGuestCount(channelId string) { } } -func (s *TimerLayerChannelStore) InvalidateMemberCount(channelId string) { +func (s *TimerLayerChannelStore) InvalidateMemberCount(channelID string) { start := timemodule.Now() - s.ChannelStore.InvalidateMemberCount(channelId) + s.ChannelStore.InvalidateMemberCount(channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1537,10 +1537,10 @@ func (s *TimerLayerChannelStore) InvalidateMemberCount(channelId string) { } } -func (s *TimerLayerChannelStore) InvalidatePinnedPostCount(channelId string) { +func (s *TimerLayerChannelStore) InvalidatePinnedPostCount(channelID string) { start := timemodule.Now() - s.ChannelStore.InvalidatePinnedPostCount(channelId) + s.ChannelStore.InvalidatePinnedPostCount(channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1552,10 +1552,10 @@ func (s *TimerLayerChannelStore) InvalidatePinnedPostCount(channelId string) { } } -func (s *TimerLayerChannelStore) IsUserInChannelUseCache(userId string, channelId string) bool { +func (s *TimerLayerChannelStore) IsUserInChannelUseCache(userId string, channelID string) bool { start := timemodule.Now() - result := s.ChannelStore.IsUserInChannelUseCache(userId, channelId) + result := s.ChannelStore.IsUserInChannelUseCache(userId, channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1600,10 +1600,10 @@ func (s *TimerLayerChannelStore) MigratePublicChannels() error { return err } -func (s *TimerLayerChannelStore) PermanentDelete(channelId string) error { +func (s *TimerLayerChannelStore) PermanentDelete(channelID string) error { start := timemodule.Now() - err := s.ChannelStore.PermanentDelete(channelId) + err := s.ChannelStore.PermanentDelete(channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1616,10 +1616,10 @@ func (s *TimerLayerChannelStore) PermanentDelete(channelId string) error { return err } -func (s *TimerLayerChannelStore) PermanentDeleteByTeam(teamId string) error { +func (s *TimerLayerChannelStore) PermanentDeleteByTeam(teamID string) error { start := timemodule.Now() - err := s.ChannelStore.PermanentDeleteByTeam(teamId) + err := s.ChannelStore.PermanentDeleteByTeam(teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1632,10 +1632,10 @@ func (s *TimerLayerChannelStore) PermanentDeleteByTeam(teamId string) error { return err } -func (s *TimerLayerChannelStore) PermanentDeleteMembersByChannel(channelId string) error { +func (s *TimerLayerChannelStore) PermanentDeleteMembersByChannel(channelID string) error { start := timemodule.Now() - err := s.ChannelStore.PermanentDeleteMembersByChannel(channelId) + err := s.ChannelStore.PermanentDeleteMembersByChannel(channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1664,10 +1664,10 @@ func (s *TimerLayerChannelStore) PermanentDeleteMembersByUser(userId string) err return err } -func (s *TimerLayerChannelStore) RemoveAllDeactivatedMembers(channelId string) error { +func (s *TimerLayerChannelStore) RemoveAllDeactivatedMembers(channelID string) error { start := timemodule.Now() - err := s.ChannelStore.RemoveAllDeactivatedMembers(channelId) + err := s.ChannelStore.RemoveAllDeactivatedMembers(channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1680,10 +1680,10 @@ func (s *TimerLayerChannelStore) RemoveAllDeactivatedMembers(channelId string) e return err } -func (s *TimerLayerChannelStore) RemoveMember(channelId string, userId string) error { +func (s *TimerLayerChannelStore) RemoveMember(channelID string, userId string) error { start := timemodule.Now() - err := s.ChannelStore.RemoveMember(channelId, userId) + err := s.ChannelStore.RemoveMember(channelID, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1696,10 +1696,10 @@ func (s *TimerLayerChannelStore) RemoveMember(channelId string, userId string) e return err } -func (s *TimerLayerChannelStore) RemoveMembers(channelId string, userIds []string) error { +func (s *TimerLayerChannelStore) RemoveMembers(channelID string, userIds []string) error { start := timemodule.Now() - err := s.ChannelStore.RemoveMembers(channelId, userIds) + err := s.ChannelStore.RemoveMembers(channelID, userIds) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1728,10 +1728,10 @@ func (s *TimerLayerChannelStore) ResetAllChannelSchemes() error { return err } -func (s *TimerLayerChannelStore) Restore(channelId string, time int64) error { +func (s *TimerLayerChannelStore) Restore(channelID string, time int64) error { start := timemodule.Now() - err := s.ChannelStore.Restore(channelId, time) + err := s.ChannelStore.Restore(channelID, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1824,10 +1824,10 @@ func (s *TimerLayerChannelStore) SearchAllChannels(term string, opts store.Chann return result, resultVar1, err } -func (s *TimerLayerChannelStore) SearchArchivedInTeam(teamId string, term string, userId string) (*model.ChannelList, error) { +func (s *TimerLayerChannelStore) SearchArchivedInTeam(teamID string, term string, userId string) (*model.ChannelList, error) { start := timemodule.Now() - result, err := s.ChannelStore.SearchArchivedInTeam(teamId, term, userId) + result, err := s.ChannelStore.SearchArchivedInTeam(teamID, term, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1840,10 +1840,10 @@ func (s *TimerLayerChannelStore) SearchArchivedInTeam(teamId string, term string return result, err } -func (s *TimerLayerChannelStore) SearchForUserInTeam(userId string, teamId string, term string, includeDeleted bool) (*model.ChannelList, error) { +func (s *TimerLayerChannelStore) SearchForUserInTeam(userId string, teamID string, term string, includeDeleted bool) (*model.ChannelList, error) { start := timemodule.Now() - result, err := s.ChannelStore.SearchForUserInTeam(userId, teamId, term, includeDeleted) + result, err := s.ChannelStore.SearchForUserInTeam(userId, teamID, term, includeDeleted) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1872,10 +1872,10 @@ func (s *TimerLayerChannelStore) SearchGroupChannels(userId string, term string) return result, err } -func (s *TimerLayerChannelStore) SearchInTeam(teamId string, term string, includeDeleted bool) (*model.ChannelList, error) { +func (s *TimerLayerChannelStore) SearchInTeam(teamID string, term string, includeDeleted bool) (*model.ChannelList, error) { start := timemodule.Now() - result, err := s.ChannelStore.SearchInTeam(teamId, term, includeDeleted) + result, err := s.ChannelStore.SearchInTeam(teamID, term, includeDeleted) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1888,10 +1888,10 @@ func (s *TimerLayerChannelStore) SearchInTeam(teamId string, term string, includ return result, err } -func (s *TimerLayerChannelStore) SearchMore(userId string, teamId string, term string) (*model.ChannelList, error) { +func (s *TimerLayerChannelStore) SearchMore(userId string, teamID string, term string) (*model.ChannelList, error) { start := timemodule.Now() - result, err := s.ChannelStore.SearchMore(userId, teamId, term) + result, err := s.ChannelStore.SearchMore(userId, teamID, term) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1904,10 +1904,10 @@ func (s *TimerLayerChannelStore) SearchMore(userId string, teamId string, term s return result, err } -func (s *TimerLayerChannelStore) SetDeleteAt(channelId string, deleteAt int64, updateAt int64) error { +func (s *TimerLayerChannelStore) SetDeleteAt(channelID string, deleteAt int64, updateAt int64) error { start := timemodule.Now() - err := s.ChannelStore.SetDeleteAt(channelId, deleteAt, updateAt) + err := s.ChannelStore.SetDeleteAt(channelID, deleteAt, updateAt) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2016,10 +2016,10 @@ func (s *TimerLayerChannelStore) UpdateMultipleMembers(members []*model.ChannelM return result, err } -func (s *TimerLayerChannelStore) UpdateSidebarCategories(userId string, teamId string, categories []*model.SidebarCategoryWithChannels) ([]*model.SidebarCategoryWithChannels, []*model.SidebarCategoryWithChannels, error) { +func (s *TimerLayerChannelStore) UpdateSidebarCategories(userId string, teamID string, categories []*model.SidebarCategoryWithChannels) ([]*model.SidebarCategoryWithChannels, []*model.SidebarCategoryWithChannels, error) { start := timemodule.Now() - result, resultVar1, err := s.ChannelStore.UpdateSidebarCategories(userId, teamId, categories) + result, resultVar1, err := s.ChannelStore.UpdateSidebarCategories(userId, teamID, categories) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2032,10 +2032,10 @@ func (s *TimerLayerChannelStore) UpdateSidebarCategories(userId string, teamId s return result, resultVar1, err } -func (s *TimerLayerChannelStore) UpdateSidebarCategoryOrder(userId string, teamId string, categoryOrder []string) error { +func (s *TimerLayerChannelStore) UpdateSidebarCategoryOrder(userId string, teamID string, categoryOrder []string) error { start := timemodule.Now() - err := s.ChannelStore.UpdateSidebarCategoryOrder(userId, teamId, categoryOrder) + err := s.ChannelStore.UpdateSidebarCategoryOrder(userId, teamID, categoryOrder) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2048,10 +2048,10 @@ func (s *TimerLayerChannelStore) UpdateSidebarCategoryOrder(userId string, teamI return err } -func (s *TimerLayerChannelStore) UpdateSidebarChannelCategoryOnMove(channel *model.Channel, newTeamId string) error { +func (s *TimerLayerChannelStore) UpdateSidebarChannelCategoryOnMove(channel *model.Channel, newTeamID string) error { start := timemodule.Now() - err := s.ChannelStore.UpdateSidebarChannelCategoryOnMove(channel, newTeamId) + err := s.ChannelStore.UpdateSidebarChannelCategoryOnMove(channel, newTeamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2096,10 +2096,10 @@ func (s *TimerLayerChannelStore) UserBelongsToChannels(userId string, channelIds return result, err } -func (s *TimerLayerChannelMemberHistoryStore) GetUsersInChannelDuring(startTime int64, endTime int64, channelId string) ([]*model.ChannelMemberHistoryResult, error) { +func (s *TimerLayerChannelMemberHistoryStore) GetUsersInChannelDuring(startTime int64, endTime int64, channelID string) ([]*model.ChannelMemberHistoryResult, error) { start := timemodule.Now() - result, err := s.ChannelMemberHistoryStore.GetUsersInChannelDuring(startTime, endTime, channelId) + result, err := s.ChannelMemberHistoryStore.GetUsersInChannelDuring(startTime, endTime, channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2112,10 +2112,10 @@ func (s *TimerLayerChannelMemberHistoryStore) GetUsersInChannelDuring(startTime return result, err } -func (s *TimerLayerChannelMemberHistoryStore) LogJoinEvent(userId string, channelId string, joinTime int64) error { +func (s *TimerLayerChannelMemberHistoryStore) LogJoinEvent(userId string, channelID string, joinTime int64) error { start := timemodule.Now() - err := s.ChannelMemberHistoryStore.LogJoinEvent(userId, channelId, joinTime) + err := s.ChannelMemberHistoryStore.LogJoinEvent(userId, channelID, joinTime) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2128,10 +2128,10 @@ func (s *TimerLayerChannelMemberHistoryStore) LogJoinEvent(userId string, channe return err } -func (s *TimerLayerChannelMemberHistoryStore) LogLeaveEvent(userId string, channelId string, leaveTime int64) error { +func (s *TimerLayerChannelMemberHistoryStore) LogLeaveEvent(userId string, channelID string, leaveTime int64) error { start := timemodule.Now() - err := s.ChannelMemberHistoryStore.LogLeaveEvent(userId, channelId, leaveTime) + err := s.ChannelMemberHistoryStore.LogLeaveEvent(userId, channelID, leaveTime) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2256,10 +2256,10 @@ func (s *TimerLayerClusterDiscoveryStore) SetLastPingAt(discovery *model.Cluster return err } -func (s *TimerLayerCommandStore) AnalyticsCommandCount(teamId string) (int64, error) { +func (s *TimerLayerCommandStore) AnalyticsCommandCount(teamID string) (int64, error) { start := timemodule.Now() - result, err := s.CommandStore.AnalyticsCommandCount(teamId) + result, err := s.CommandStore.AnalyticsCommandCount(teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2272,10 +2272,10 @@ func (s *TimerLayerCommandStore) AnalyticsCommandCount(teamId string) (int64, er return result, err } -func (s *TimerLayerCommandStore) Delete(commandId string, time int64) error { +func (s *TimerLayerCommandStore) Delete(commandID string, time int64) error { start := timemodule.Now() - err := s.CommandStore.Delete(commandId, time) + err := s.CommandStore.Delete(commandID, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2304,10 +2304,10 @@ func (s *TimerLayerCommandStore) Get(id string) (*model.Command, error) { return result, err } -func (s *TimerLayerCommandStore) GetByTeam(teamId string) ([]*model.Command, error) { +func (s *TimerLayerCommandStore) GetByTeam(teamID string) ([]*model.Command, error) { start := timemodule.Now() - result, err := s.CommandStore.GetByTeam(teamId) + result, err := s.CommandStore.GetByTeam(teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2320,10 +2320,10 @@ func (s *TimerLayerCommandStore) GetByTeam(teamId string) ([]*model.Command, err return result, err } -func (s *TimerLayerCommandStore) GetByTrigger(teamId string, trigger string) (*model.Command, error) { +func (s *TimerLayerCommandStore) GetByTrigger(teamID string, trigger string) (*model.Command, error) { start := timemodule.Now() - result, err := s.CommandStore.GetByTrigger(teamId, trigger) + result, err := s.CommandStore.GetByTrigger(teamID, trigger) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2336,10 +2336,10 @@ func (s *TimerLayerCommandStore) GetByTrigger(teamId string, trigger string) (*m return result, err } -func (s *TimerLayerCommandStore) PermanentDeleteByTeam(teamId string) error { +func (s *TimerLayerCommandStore) PermanentDeleteByTeam(teamID string) error { start := timemodule.Now() - err := s.CommandStore.PermanentDeleteByTeam(teamId) + err := s.CommandStore.PermanentDeleteByTeam(teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2671,10 +2671,10 @@ func (s *TimerLayerEmojiStore) Search(name string, prefixOnly bool, limit int) ( return result, err } -func (s *TimerLayerFileInfoStore) AttachToPost(fileId string, postId string, creatorId string) error { +func (s *TimerLayerFileInfoStore) AttachToPost(fileID string, postID string, creatorId string) error { start := timemodule.Now() - err := s.FileInfoStore.AttachToPost(fileId, postId, creatorId) + err := s.FileInfoStore.AttachToPost(fileID, postID, creatorId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2702,10 +2702,10 @@ func (s *TimerLayerFileInfoStore) ClearCaches() { } } -func (s *TimerLayerFileInfoStore) DeleteForPost(postId string) (string, error) { +func (s *TimerLayerFileInfoStore) DeleteForPost(postID string) (string, error) { start := timemodule.Now() - result, err := s.FileInfoStore.DeleteForPost(postId) + result, err := s.FileInfoStore.DeleteForPost(postID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2766,10 +2766,10 @@ func (s *TimerLayerFileInfoStore) GetByPath(path string) (*model.FileInfo, error return result, err } -func (s *TimerLayerFileInfoStore) GetForPost(postId string, readFromMaster bool, includeDeleted bool, allowFromCache bool) ([]*model.FileInfo, error) { +func (s *TimerLayerFileInfoStore) GetForPost(postID string, readFromMaster bool, includeDeleted bool, allowFromCache bool) ([]*model.FileInfo, error) { start := timemodule.Now() - result, err := s.FileInfoStore.GetForPost(postId, readFromMaster, includeDeleted, allowFromCache) + result, err := s.FileInfoStore.GetForPost(postID, readFromMaster, includeDeleted, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2814,10 +2814,10 @@ func (s *TimerLayerFileInfoStore) GetWithOptions(page int, perPage int, opt *mod return result, err } -func (s *TimerLayerFileInfoStore) InvalidateFileInfosForPostCache(postId string, deleted bool) { +func (s *TimerLayerFileInfoStore) InvalidateFileInfosForPostCache(postID string, deleted bool) { start := timemodule.Now() - s.FileInfoStore.InvalidateFileInfosForPostCache(postId, deleted) + s.FileInfoStore.InvalidateFileInfosForPostCache(postID, deleted) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2829,10 +2829,10 @@ func (s *TimerLayerFileInfoStore) InvalidateFileInfosForPostCache(postId string, } } -func (s *TimerLayerFileInfoStore) PermanentDelete(fileId string) error { +func (s *TimerLayerFileInfoStore) PermanentDelete(fileID string) error { start := timemodule.Now() - err := s.FileInfoStore.PermanentDelete(fileId) + err := s.FileInfoStore.PermanentDelete(fileID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2893,10 +2893,10 @@ func (s *TimerLayerFileInfoStore) Save(info *model.FileInfo) (*model.FileInfo, e return result, err } -func (s *TimerLayerFileInfoStore) Search(paramsList []*model.SearchParams, userId string, teamId string, page int, perPage int) (*model.FileInfoList, error) { +func (s *TimerLayerFileInfoStore) Search(paramsList []*model.SearchParams, userId string, teamID string, page int, perPage int) (*model.FileInfoList, error) { start := timemodule.Now() - result, err := s.FileInfoStore.Search(paramsList, userId, teamId, page, perPage) + result, err := s.FileInfoStore.Search(paramsList, userId, teamID, page, perPage) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2909,10 +2909,10 @@ func (s *TimerLayerFileInfoStore) Search(paramsList []*model.SearchParams, userI return result, err } -func (s *TimerLayerFileInfoStore) SetContent(fileId string, content string) error { +func (s *TimerLayerFileInfoStore) SetContent(fileID string, content string) error { start := timemodule.Now() - err := s.FileInfoStore.SetContent(fileId, content) + err := s.FileInfoStore.SetContent(fileID, content) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -3021,10 +3021,10 @@ func (s *TimerLayerGroupStore) CountChannelMembersMinusGroupMembers(channelID st return result, err } -func (s *TimerLayerGroupStore) CountGroupsByChannel(channelId string, opts model.GroupSearchOpts) (int64, error) { +func (s *TimerLayerGroupStore) CountGroupsByChannel(channelID string, opts model.GroupSearchOpts) (int64, error) { start := timemodule.Now() - result, err := s.GroupStore.CountGroupsByChannel(channelId, opts) + result, err := s.GroupStore.CountGroupsByChannel(channelID, opts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -3037,10 +3037,10 @@ func (s *TimerLayerGroupStore) CountGroupsByChannel(channelId string, opts model return result, err } -func (s *TimerLayerGroupStore) CountGroupsByTeam(teamId string, opts model.GroupSearchOpts) (int64, error) { +func (s *TimerLayerGroupStore) CountGroupsByTeam(teamID string, opts model.GroupSearchOpts) (int64, error) { start := timemodule.Now() - result, err := s.GroupStore.CountGroupsByTeam(teamId, opts) + result, err := s.GroupStore.CountGroupsByTeam(teamID, opts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -3309,10 +3309,10 @@ func (s *TimerLayerGroupStore) GetGroups(page int, perPage int, opts model.Group return result, err } -func (s *TimerLayerGroupStore) GetGroupsAssociatedToChannelsByTeam(teamId string, opts model.GroupSearchOpts) (map[string][]*model.GroupWithSchemeAdmin, error) { +func (s *TimerLayerGroupStore) GetGroupsAssociatedToChannelsByTeam(teamID string, opts model.GroupSearchOpts) (map[string][]*model.GroupWithSchemeAdmin, error) { start := timemodule.Now() - result, err := s.GroupStore.GetGroupsAssociatedToChannelsByTeam(teamId, opts) + result, err := s.GroupStore.GetGroupsAssociatedToChannelsByTeam(teamID, opts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -3325,10 +3325,10 @@ func (s *TimerLayerGroupStore) GetGroupsAssociatedToChannelsByTeam(teamId string return result, err } -func (s *TimerLayerGroupStore) GetGroupsByChannel(channelId string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) { +func (s *TimerLayerGroupStore) GetGroupsByChannel(channelID string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) { start := timemodule.Now() - result, err := s.GroupStore.GetGroupsByChannel(channelId, opts) + result, err := s.GroupStore.GetGroupsByChannel(channelID, opts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -3341,10 +3341,10 @@ func (s *TimerLayerGroupStore) GetGroupsByChannel(channelId string, opts model.G return result, err } -func (s *TimerLayerGroupStore) GetGroupsByTeam(teamId string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) { +func (s *TimerLayerGroupStore) GetGroupsByTeam(teamID string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, error) { start := timemodule.Now() - result, err := s.GroupStore.GetGroupsByTeam(teamId, opts) + result, err := s.GroupStore.GetGroupsByTeam(teamID, opts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4253,10 +4253,10 @@ func (s *TimerLayerPluginStore) CompareAndSet(keyVal *model.PluginKeyValue, oldV return result, err } -func (s *TimerLayerPluginStore) Delete(pluginId string, key string) error { +func (s *TimerLayerPluginStore) Delete(pluginID string, key string) error { start := timemodule.Now() - err := s.PluginStore.Delete(pluginId, key) + err := s.PluginStore.Delete(pluginID, key) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4285,10 +4285,10 @@ func (s *TimerLayerPluginStore) DeleteAllExpired() error { return err } -func (s *TimerLayerPluginStore) DeleteAllForPlugin(PluginId string) error { +func (s *TimerLayerPluginStore) DeleteAllForPlugin(PluginID string) error { start := timemodule.Now() - err := s.PluginStore.DeleteAllForPlugin(PluginId) + err := s.PluginStore.DeleteAllForPlugin(PluginID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4301,10 +4301,10 @@ func (s *TimerLayerPluginStore) DeleteAllForPlugin(PluginId string) error { return err } -func (s *TimerLayerPluginStore) Get(pluginId string, key string) (*model.PluginKeyValue, error) { +func (s *TimerLayerPluginStore) Get(pluginID string, key string) (*model.PluginKeyValue, error) { start := timemodule.Now() - result, err := s.PluginStore.Get(pluginId, key) + result, err := s.PluginStore.Get(pluginID, key) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4317,10 +4317,10 @@ func (s *TimerLayerPluginStore) Get(pluginId string, key string) (*model.PluginK return result, err } -func (s *TimerLayerPluginStore) List(pluginId string, page int, perPage int) ([]string, error) { +func (s *TimerLayerPluginStore) List(pluginID string, page int, perPage int) ([]string, error) { start := timemodule.Now() - result, err := s.PluginStore.List(pluginId, page, perPage) + result, err := s.PluginStore.List(pluginID, page, perPage) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4349,10 +4349,10 @@ func (s *TimerLayerPluginStore) SaveOrUpdate(keyVal *model.PluginKeyValue) (*mod return result, err } -func (s *TimerLayerPluginStore) SetWithOptions(pluginId string, key string, value []byte, options model.PluginKVSetOptions) (bool, error) { +func (s *TimerLayerPluginStore) SetWithOptions(pluginID string, key string, value []byte, options model.PluginKVSetOptions) (bool, error) { start := timemodule.Now() - result, err := s.PluginStore.SetWithOptions(pluginId, key, value, options) + result, err := s.PluginStore.SetWithOptions(pluginID, key, value, options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4365,10 +4365,10 @@ func (s *TimerLayerPluginStore) SetWithOptions(pluginId string, key string, valu return result, err } -func (s *TimerLayerPostStore) AnalyticsPostCount(teamId string, mustHaveFile bool, mustHaveHashtag bool) (int64, error) { +func (s *TimerLayerPostStore) AnalyticsPostCount(teamID string, mustHaveFile bool, mustHaveHashtag bool) (int64, error) { start := timemodule.Now() - result, err := s.PostStore.AnalyticsPostCount(teamId, mustHaveFile, mustHaveHashtag) + result, err := s.PostStore.AnalyticsPostCount(teamID, mustHaveFile, mustHaveHashtag) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4397,10 +4397,10 @@ func (s *TimerLayerPostStore) AnalyticsPostCountsByDay(options *model.AnalyticsP return result, err } -func (s *TimerLayerPostStore) AnalyticsUserCountsWithPostsByDay(teamId string) (model.AnalyticsRows, error) { +func (s *TimerLayerPostStore) AnalyticsUserCountsWithPostsByDay(teamID string) (model.AnalyticsRows, error) { start := timemodule.Now() - result, err := s.PostStore.AnalyticsUserCountsWithPostsByDay(teamId) + result, err := s.PostStore.AnalyticsUserCountsWithPostsByDay(teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4428,10 +4428,10 @@ func (s *TimerLayerPostStore) ClearCaches() { } } -func (s *TimerLayerPostStore) Delete(postId string, time int64, deleteByID string) error { +func (s *TimerLayerPostStore) Delete(postID string, time int64, deleteByID string) error { start := timemodule.Now() - err := s.PostStore.Delete(postId, time, deleteByID) + err := s.PostStore.Delete(postID, time, deleteByID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4460,10 +4460,10 @@ func (s *TimerLayerPostStore) Get(id string, skipFetchThreads bool, collapsedThr return result, err } -func (s *TimerLayerPostStore) GetDirectPostParentsForExportAfter(limit int, afterId string) ([]*model.DirectPostForExport, error) { +func (s *TimerLayerPostStore) GetDirectPostParentsForExportAfter(limit int, afterID string) ([]*model.DirectPostForExport, error) { start := timemodule.Now() - result, err := s.PostStore.GetDirectPostParentsForExportAfter(limit, afterId) + result, err := s.PostStore.GetDirectPostParentsForExportAfter(limit, afterID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4476,10 +4476,10 @@ func (s *TimerLayerPostStore) GetDirectPostParentsForExportAfter(limit int, afte return result, err } -func (s *TimerLayerPostStore) GetEtag(channelId string, allowFromCache bool, collapsedThreads bool) string { +func (s *TimerLayerPostStore) GetEtag(channelID string, allowFromCache bool, collapsedThreads bool) string { start := timemodule.Now() - result := s.PostStore.GetEtag(channelId, allowFromCache, collapsedThreads) + result := s.PostStore.GetEtag(channelID, allowFromCache, collapsedThreads) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4508,10 +4508,10 @@ func (s *TimerLayerPostStore) GetFlaggedPosts(userId string, offset int, limit i return result, err } -func (s *TimerLayerPostStore) GetFlaggedPostsForChannel(userId string, channelId string, offset int, limit int) (*model.PostList, error) { +func (s *TimerLayerPostStore) GetFlaggedPostsForChannel(userId string, channelID string, offset int, limit int) (*model.PostList, error) { start := timemodule.Now() - result, err := s.PostStore.GetFlaggedPostsForChannel(userId, channelId, offset, limit) + result, err := s.PostStore.GetFlaggedPostsForChannel(userId, channelID, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4524,10 +4524,10 @@ func (s *TimerLayerPostStore) GetFlaggedPostsForChannel(userId string, channelId return result, err } -func (s *TimerLayerPostStore) GetFlaggedPostsForTeam(userId string, teamId string, offset int, limit int) (*model.PostList, error) { +func (s *TimerLayerPostStore) GetFlaggedPostsForTeam(userId string, teamID string, offset int, limit int) (*model.PostList, error) { start := timemodule.Now() - result, err := s.PostStore.GetFlaggedPostsForTeam(userId, teamId, offset, limit) + result, err := s.PostStore.GetFlaggedPostsForTeam(userId, teamID, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4588,10 +4588,10 @@ func (s *TimerLayerPostStore) GetOldestEntityCreationTime() (int64, error) { return result, err } -func (s *TimerLayerPostStore) GetParentsForExportAfter(limit int, afterId string) ([]*model.PostForExport, error) { +func (s *TimerLayerPostStore) GetParentsForExportAfter(limit int, afterID string) ([]*model.PostForExport, error) { start := timemodule.Now() - result, err := s.PostStore.GetParentsForExportAfter(limit, afterId) + result, err := s.PostStore.GetParentsForExportAfter(limit, afterID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4604,10 +4604,10 @@ func (s *TimerLayerPostStore) GetParentsForExportAfter(limit int, afterId string return result, err } -func (s *TimerLayerPostStore) GetPostAfterTime(channelId string, time int64) (*model.Post, error) { +func (s *TimerLayerPostStore) GetPostAfterTime(channelID string, time int64) (*model.Post, error) { start := timemodule.Now() - result, err := s.PostStore.GetPostAfterTime(channelId, time) + result, err := s.PostStore.GetPostAfterTime(channelID, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4620,10 +4620,10 @@ func (s *TimerLayerPostStore) GetPostAfterTime(channelId string, time int64) (*m return result, err } -func (s *TimerLayerPostStore) GetPostIdAfterTime(channelId string, time int64) (string, error) { +func (s *TimerLayerPostStore) GetPostIdAfterTime(channelID string, time int64) (string, error) { start := timemodule.Now() - result, err := s.PostStore.GetPostIdAfterTime(channelId, time) + result, err := s.PostStore.GetPostIdAfterTime(channelID, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4636,10 +4636,10 @@ func (s *TimerLayerPostStore) GetPostIdAfterTime(channelId string, time int64) ( return result, err } -func (s *TimerLayerPostStore) GetPostIdBeforeTime(channelId string, time int64) (string, error) { +func (s *TimerLayerPostStore) GetPostIdBeforeTime(channelID string, time int64) (string, error) { start := timemodule.Now() - result, err := s.PostStore.GetPostIdBeforeTime(channelId, time) + result, err := s.PostStore.GetPostIdBeforeTime(channelID, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4732,10 +4732,10 @@ func (s *TimerLayerPostStore) GetPostsByIds(postIds []string) ([]*model.Post, er return result, err } -func (s *TimerLayerPostStore) GetPostsCreatedAt(channelId string, time int64) ([]*model.Post, error) { +func (s *TimerLayerPostStore) GetPostsCreatedAt(channelID string, time int64) ([]*model.Post, error) { start := timemodule.Now() - result, err := s.PostStore.GetPostsCreatedAt(channelId, time) + result, err := s.PostStore.GetPostsCreatedAt(channelID, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4764,10 +4764,10 @@ func (s *TimerLayerPostStore) GetPostsSince(options model.GetPostsSinceOptions, return result, err } -func (s *TimerLayerPostStore) GetRepliesForExport(parentId string) ([]*model.ReplyForExport, error) { +func (s *TimerLayerPostStore) GetRepliesForExport(parentID string) ([]*model.ReplyForExport, error) { start := timemodule.Now() - result, err := s.PostStore.GetRepliesForExport(parentId) + result, err := s.PostStore.GetRepliesForExport(parentID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4796,10 +4796,10 @@ func (s *TimerLayerPostStore) GetSingle(id string) (*model.Post, error) { return result, err } -func (s *TimerLayerPostStore) InvalidateLastPostTimeCache(channelId string) { +func (s *TimerLayerPostStore) InvalidateLastPostTimeCache(channelID string) { start := timemodule.Now() - s.PostStore.InvalidateLastPostTimeCache(channelId) + s.PostStore.InvalidateLastPostTimeCache(channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4859,10 +4859,10 @@ func (s *TimerLayerPostStore) PermanentDeleteBatch(endTime int64, limit int64) ( return result, err } -func (s *TimerLayerPostStore) PermanentDeleteByChannel(channelId string) error { +func (s *TimerLayerPostStore) PermanentDeleteByChannel(channelID string) error { start := timemodule.Now() - err := s.PostStore.PermanentDeleteByChannel(channelId) + err := s.PostStore.PermanentDeleteByChannel(channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4923,10 +4923,10 @@ func (s *TimerLayerPostStore) SaveMultiple(posts []*model.Post) ([]*model.Post, return result, resultVar1, err } -func (s *TimerLayerPostStore) Search(teamId string, userId string, params *model.SearchParams) (*model.PostList, error) { +func (s *TimerLayerPostStore) Search(teamID string, userId string, params *model.SearchParams) (*model.PostList, error) { start := timemodule.Now() - result, err := s.PostStore.Search(teamId, userId, params) + result, err := s.PostStore.Search(teamID, userId, params) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4939,10 +4939,10 @@ func (s *TimerLayerPostStore) Search(teamId string, userId string, params *model return result, err } -func (s *TimerLayerPostStore) SearchPostsInTeamForUser(paramsList []*model.SearchParams, userId string, teamId string, page int, perPage int) (*model.PostSearchResults, error) { +func (s *TimerLayerPostStore) SearchPostsInTeamForUser(paramsList []*model.SearchParams, userId string, teamID string, page int, perPage int) (*model.PostSearchResults, error) { start := timemodule.Now() - result, err := s.PostStore.SearchPostsInTeamForUser(paramsList, userId, teamId, page, perPage) + result, err := s.PostStore.SearchPostsInTeamForUser(paramsList, userId, teamID, page, perPage) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5227,10 +5227,10 @@ func (s *TimerLayerReactionStore) DeleteAllWithEmojiName(emojiName string) error return err } -func (s *TimerLayerReactionStore) GetForPost(postId string, allowFromCache bool) ([]*model.Reaction, error) { +func (s *TimerLayerReactionStore) GetForPost(postID string, allowFromCache bool) ([]*model.Reaction, error) { start := timemodule.Now() - result, err := s.ReactionStore.GetForPost(postId, allowFromCache) + result, err := s.ReactionStore.GetForPost(postID, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5323,10 +5323,10 @@ func (s *TimerLayerRoleStore) ChannelRolesUnderTeamRole(roleName string) ([]*mod return result, err } -func (s *TimerLayerRoleStore) Delete(roleId string) (*model.Role, error) { +func (s *TimerLayerRoleStore) Delete(roleID string) (*model.Role, error) { start := timemodule.Now() - result, err := s.RoleStore.Delete(roleId) + result, err := s.RoleStore.Delete(roleID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5339,10 +5339,10 @@ func (s *TimerLayerRoleStore) Delete(roleId string) (*model.Role, error) { return result, err } -func (s *TimerLayerRoleStore) Get(roleId string) (*model.Role, error) { +func (s *TimerLayerRoleStore) Get(roleID string) (*model.Role, error) { start := timemodule.Now() - result, err := s.RoleStore.Get(roleId) + result, err := s.RoleStore.Get(roleID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5467,10 +5467,10 @@ func (s *TimerLayerSchemeStore) CountWithoutPermission(scope string, permissionI return result, err } -func (s *TimerLayerSchemeStore) Delete(schemeId string) (*model.Scheme, error) { +func (s *TimerLayerSchemeStore) Delete(schemeID string) (*model.Scheme, error) { start := timemodule.Now() - result, err := s.SchemeStore.Delete(schemeId) + result, err := s.SchemeStore.Delete(schemeID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5483,10 +5483,10 @@ func (s *TimerLayerSchemeStore) Delete(schemeId string) (*model.Scheme, error) { return result, err } -func (s *TimerLayerSchemeStore) Get(schemeId string) (*model.Scheme, error) { +func (s *TimerLayerSchemeStore) Get(schemeID string) (*model.Scheme, error) { start := timemodule.Now() - result, err := s.SchemeStore.Get(schemeId) + result, err := s.SchemeStore.Get(schemeID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5594,10 +5594,10 @@ func (s *TimerLayerSessionStore) Cleanup(expiryTime int64, batchSize int64) { } } -func (s *TimerLayerSessionStore) Get(sessionIdOrToken string) (*model.Session, error) { +func (s *TimerLayerSessionStore) Get(sessionIDOrToken string) (*model.Session, error) { start := timemodule.Now() - result, err := s.SessionStore.Get(sessionIdOrToken) + result, err := s.SessionStore.Get(sessionIDOrToken) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5658,10 +5658,10 @@ func (s *TimerLayerSessionStore) GetSessionsWithActiveDeviceIds(userId string) ( return result, err } -func (s *TimerLayerSessionStore) PermanentDeleteSessionsByUser(teamId string) error { +func (s *TimerLayerSessionStore) PermanentDeleteSessionsByUser(teamID string) error { start := timemodule.Now() - err := s.SessionStore.PermanentDeleteSessionsByUser(teamId) + err := s.SessionStore.PermanentDeleteSessionsByUser(teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5674,10 +5674,10 @@ func (s *TimerLayerSessionStore) PermanentDeleteSessionsByUser(teamId string) er return err } -func (s *TimerLayerSessionStore) Remove(sessionIdOrToken string) error { +func (s *TimerLayerSessionStore) Remove(sessionIDOrToken string) error { start := timemodule.Now() - err := s.SessionStore.Remove(sessionIdOrToken) + err := s.SessionStore.Remove(sessionIDOrToken) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5722,10 +5722,10 @@ func (s *TimerLayerSessionStore) Save(session *model.Session) (*model.Session, e return result, err } -func (s *TimerLayerSessionStore) UpdateDeviceId(id string, deviceId string, expiresAt int64) (string, error) { +func (s *TimerLayerSessionStore) UpdateDeviceId(id string, deviceID string, expiresAt int64) (string, error) { start := timemodule.Now() - result, err := s.SessionStore.UpdateDeviceId(id, deviceId, expiresAt) + result, err := s.SessionStore.UpdateDeviceId(id, deviceID, expiresAt) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5754,10 +5754,10 @@ func (s *TimerLayerSessionStore) UpdateExpiredNotify(sessionid string, notified return err } -func (s *TimerLayerSessionStore) UpdateExpiresAt(sessionId string, time int64) error { +func (s *TimerLayerSessionStore) UpdateExpiresAt(sessionID string, time int64) error { start := timemodule.Now() - err := s.SessionStore.UpdateExpiresAt(sessionId, time) + err := s.SessionStore.UpdateExpiresAt(sessionID, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5770,10 +5770,10 @@ func (s *TimerLayerSessionStore) UpdateExpiresAt(sessionId string, time int64) e return err } -func (s *TimerLayerSessionStore) UpdateLastActivityAt(sessionId string, time int64) error { +func (s *TimerLayerSessionStore) UpdateLastActivityAt(sessionID string, time int64) error { start := timemodule.Now() - err := s.SessionStore.UpdateLastActivityAt(sessionId, time) + err := s.SessionStore.UpdateLastActivityAt(sessionID, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6042,10 +6042,10 @@ func (s *TimerLayerSystemStore) Update(system *model.System) error { return err } -func (s *TimerLayerTeamStore) AnalyticsGetTeamCountForScheme(schemeId string) (int64, error) { +func (s *TimerLayerTeamStore) AnalyticsGetTeamCountForScheme(schemeID string) (int64, error) { start := timemodule.Now() - result, err := s.TeamStore.AnalyticsGetTeamCountForScheme(schemeId) + result, err := s.TeamStore.AnalyticsGetTeamCountForScheme(schemeID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6153,10 +6153,10 @@ func (s *TimerLayerTeamStore) Get(id string) (*model.Team, error) { return result, err } -func (s *TimerLayerTeamStore) GetActiveMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, error) { +func (s *TimerLayerTeamStore) GetActiveMemberCount(teamID string, restrictions *model.ViewUsersRestrictions) (int64, error) { start := timemodule.Now() - result, err := s.TeamStore.GetActiveMemberCount(teamId, restrictions) + result, err := s.TeamStore.GetActiveMemberCount(teamID, restrictions) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6185,10 +6185,10 @@ func (s *TimerLayerTeamStore) GetAll() ([]*model.Team, error) { return result, err } -func (s *TimerLayerTeamStore) GetAllForExportAfter(limit int, afterId string) ([]*model.TeamForExport, error) { +func (s *TimerLayerTeamStore) GetAllForExportAfter(limit int, afterID string) ([]*model.TeamForExport, error) { start := timemodule.Now() - result, err := s.TeamStore.GetAllForExportAfter(limit, afterId) + result, err := s.TeamStore.GetAllForExportAfter(limit, afterID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6297,10 +6297,10 @@ func (s *TimerLayerTeamStore) GetAllTeamPageListing(offset int, limit int) ([]*m return result, err } -func (s *TimerLayerTeamStore) GetByInviteId(inviteId string) (*model.Team, error) { +func (s *TimerLayerTeamStore) GetByInviteId(inviteID string) (*model.Team, error) { start := timemodule.Now() - result, err := s.TeamStore.GetByInviteId(inviteId) + result, err := s.TeamStore.GetByInviteId(inviteID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6345,10 +6345,10 @@ func (s *TimerLayerTeamStore) GetByNames(name []string) ([]*model.Team, error) { return result, err } -func (s *TimerLayerTeamStore) GetChannelUnreadsForAllTeams(excludeTeamId string, userId string) ([]*model.ChannelUnread, error) { +func (s *TimerLayerTeamStore) GetChannelUnreadsForAllTeams(excludeTeamID string, userId string) ([]*model.ChannelUnread, error) { start := timemodule.Now() - result, err := s.TeamStore.GetChannelUnreadsForAllTeams(excludeTeamId, userId) + result, err := s.TeamStore.GetChannelUnreadsForAllTeams(excludeTeamID, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6361,10 +6361,10 @@ func (s *TimerLayerTeamStore) GetChannelUnreadsForAllTeams(excludeTeamId string, return result, err } -func (s *TimerLayerTeamStore) GetChannelUnreadsForTeam(teamId string, userId string) ([]*model.ChannelUnread, error) { +func (s *TimerLayerTeamStore) GetChannelUnreadsForTeam(teamID string, userId string) ([]*model.ChannelUnread, error) { start := timemodule.Now() - result, err := s.TeamStore.GetChannelUnreadsForTeam(teamId, userId) + result, err := s.TeamStore.GetChannelUnreadsForTeam(teamID, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6377,10 +6377,10 @@ func (s *TimerLayerTeamStore) GetChannelUnreadsForTeam(teamId string, userId str return result, err } -func (s *TimerLayerTeamStore) GetMember(teamId string, userId string) (*model.TeamMember, error) { +func (s *TimerLayerTeamStore) GetMember(teamID string, userId string) (*model.TeamMember, error) { start := timemodule.Now() - result, err := s.TeamStore.GetMember(teamId, userId) + result, err := s.TeamStore.GetMember(teamID, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6393,10 +6393,10 @@ func (s *TimerLayerTeamStore) GetMember(teamId string, userId string) (*model.Te return result, err } -func (s *TimerLayerTeamStore) GetMembers(teamId string, offset int, limit int, teamMembersGetOptions *model.TeamMembersGetOptions) ([]*model.TeamMember, error) { +func (s *TimerLayerTeamStore) GetMembers(teamID string, offset int, limit int, teamMembersGetOptions *model.TeamMembersGetOptions) ([]*model.TeamMember, error) { start := timemodule.Now() - result, err := s.TeamStore.GetMembers(teamId, offset, limit, teamMembersGetOptions) + result, err := s.TeamStore.GetMembers(teamID, offset, limit, teamMembersGetOptions) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6409,10 +6409,10 @@ func (s *TimerLayerTeamStore) GetMembers(teamId string, offset int, limit int, t return result, err } -func (s *TimerLayerTeamStore) GetMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, error) { +func (s *TimerLayerTeamStore) GetMembersByIds(teamID string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, error) { start := timemodule.Now() - result, err := s.TeamStore.GetMembersByIds(teamId, userIds, restrictions) + result, err := s.TeamStore.GetMembersByIds(teamID, userIds, restrictions) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6441,10 +6441,10 @@ func (s *TimerLayerTeamStore) GetTeamMembersForExport(userId string) ([]*model.T return result, err } -func (s *TimerLayerTeamStore) GetTeamsByScheme(schemeId string, offset int, limit int) ([]*model.Team, error) { +func (s *TimerLayerTeamStore) GetTeamsByScheme(schemeID string, offset int, limit int) ([]*model.Team, error) { start := timemodule.Now() - result, err := s.TeamStore.GetTeamsByScheme(schemeId, offset, limit) + result, err := s.TeamStore.GetTeamsByScheme(schemeID, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6505,10 +6505,10 @@ func (s *TimerLayerTeamStore) GetTeamsForUserWithPagination(userId string, page return result, err } -func (s *TimerLayerTeamStore) GetTotalMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, error) { +func (s *TimerLayerTeamStore) GetTotalMemberCount(teamID string, restrictions *model.ViewUsersRestrictions) (int64, error) { start := timemodule.Now() - result, err := s.TeamStore.GetTotalMemberCount(teamId, restrictions) + result, err := s.TeamStore.GetTotalMemberCount(teamID, restrictions) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6568,10 +6568,10 @@ func (s *TimerLayerTeamStore) InvalidateAllTeamIdsForUser(userId string) { } } -func (s *TimerLayerTeamStore) MigrateTeamMembers(fromTeamId string, fromUserId string) (map[string]string, error) { +func (s *TimerLayerTeamStore) MigrateTeamMembers(fromTeamID string, fromUserId string) (map[string]string, error) { start := timemodule.Now() - result, err := s.TeamStore.MigrateTeamMembers(fromTeamId, fromUserId) + result, err := s.TeamStore.MigrateTeamMembers(fromTeamID, fromUserId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6584,10 +6584,10 @@ func (s *TimerLayerTeamStore) MigrateTeamMembers(fromTeamId string, fromUserId s return result, err } -func (s *TimerLayerTeamStore) PermanentDelete(teamId string) error { +func (s *TimerLayerTeamStore) PermanentDelete(teamID string) error { start := timemodule.Now() - err := s.TeamStore.PermanentDelete(teamId) + err := s.TeamStore.PermanentDelete(teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6600,10 +6600,10 @@ func (s *TimerLayerTeamStore) PermanentDelete(teamId string) error { return err } -func (s *TimerLayerTeamStore) RemoveAllMembersByTeam(teamId string) error { +func (s *TimerLayerTeamStore) RemoveAllMembersByTeam(teamID string) error { start := timemodule.Now() - err := s.TeamStore.RemoveAllMembersByTeam(teamId) + err := s.TeamStore.RemoveAllMembersByTeam(teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6632,10 +6632,10 @@ func (s *TimerLayerTeamStore) RemoveAllMembersByUser(userId string) error { return err } -func (s *TimerLayerTeamStore) RemoveMember(teamId string, userId string) error { +func (s *TimerLayerTeamStore) RemoveMember(teamID string, userId string) error { start := timemodule.Now() - err := s.TeamStore.RemoveMember(teamId, userId) + err := s.TeamStore.RemoveMember(teamID, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6648,10 +6648,10 @@ func (s *TimerLayerTeamStore) RemoveMember(teamId string, userId string) error { return err } -func (s *TimerLayerTeamStore) RemoveMembers(teamId string, userIds []string) error { +func (s *TimerLayerTeamStore) RemoveMembers(teamID string, userIds []string) error { start := timemodule.Now() - err := s.TeamStore.RemoveMembers(teamId, userIds) + err := s.TeamStore.RemoveMembers(teamID, userIds) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6808,10 +6808,10 @@ func (s *TimerLayerTeamStore) Update(team *model.Team) (*model.Team, error) { return result, err } -func (s *TimerLayerTeamStore) UpdateLastTeamIconUpdate(teamId string, curTime int64) error { +func (s *TimerLayerTeamStore) UpdateLastTeamIconUpdate(teamID string, curTime int64) error { start := timemodule.Now() - err := s.TeamStore.UpdateLastTeamIconUpdate(teamId, curTime) + err := s.TeamStore.UpdateLastTeamIconUpdate(teamID, curTime) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6952,10 +6952,10 @@ func (s *TimerLayerThreadStore) CollectThreadsWithNewerReplies(userId string, ch return result, err } -func (s *TimerLayerThreadStore) CreateMembershipIfNeeded(userId string, postId string, following bool, incrementMentions bool, updateFollowing bool) error { +func (s *TimerLayerThreadStore) CreateMembershipIfNeeded(userId string, postID string, following bool, incrementMentions bool, updateFollowing bool) error { start := timemodule.Now() - err := s.ThreadStore.CreateMembershipIfNeeded(userId, postId, following, incrementMentions, updateFollowing) + err := s.ThreadStore.CreateMembershipIfNeeded(userId, postID, following, incrementMentions, updateFollowing) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6984,10 +6984,10 @@ func (s *TimerLayerThreadStore) Delete(postId string) error { return err } -func (s *TimerLayerThreadStore) DeleteMembershipForUser(userId string, postId string) error { +func (s *TimerLayerThreadStore) DeleteMembershipForUser(userId string, postID string) error { start := timemodule.Now() - err := s.ThreadStore.DeleteMembershipForUser(userId, postId) + err := s.ThreadStore.DeleteMembershipForUser(userId, postID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7016,10 +7016,10 @@ func (s *TimerLayerThreadStore) Get(id string) (*model.Thread, error) { return result, err } -func (s *TimerLayerThreadStore) GetMembershipForUser(userId string, postId string) (*model.ThreadMembership, error) { +func (s *TimerLayerThreadStore) GetMembershipForUser(userId string, postID string) (*model.ThreadMembership, error) { start := timemodule.Now() - result, err := s.ThreadStore.GetMembershipForUser(userId, postId) + result, err := s.ThreadStore.GetMembershipForUser(userId, postID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7032,10 +7032,10 @@ func (s *TimerLayerThreadStore) GetMembershipForUser(userId string, postId strin return result, err } -func (s *TimerLayerThreadStore) GetMembershipsForUser(userId string, teamId string) ([]*model.ThreadMembership, error) { +func (s *TimerLayerThreadStore) GetMembershipsForUser(userId string, teamID string) ([]*model.ThreadMembership, error) { start := timemodule.Now() - result, err := s.ThreadStore.GetMembershipsForUser(userId, teamId) + result, err := s.ThreadStore.GetMembershipsForUser(userId, teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7112,10 +7112,10 @@ func (s *TimerLayerThreadStore) GetThreadsForUser(userId string, teamId string, return result, err } -func (s *TimerLayerThreadStore) MarkAllAsRead(userId string, teamId string) error { +func (s *TimerLayerThreadStore) MarkAllAsRead(userId string, teamID string) error { start := timemodule.Now() - err := s.ThreadStore.MarkAllAsRead(userId, teamId) + err := s.ThreadStore.MarkAllAsRead(userId, teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7128,10 +7128,10 @@ func (s *TimerLayerThreadStore) MarkAllAsRead(userId string, teamId string) erro return err } -func (s *TimerLayerThreadStore) MarkAsRead(userId string, threadId string, timestamp int64) error { +func (s *TimerLayerThreadStore) MarkAsRead(userId string, threadID string, timestamp int64) error { start := timemodule.Now() - err := s.ThreadStore.MarkAsRead(userId, threadId, timestamp) + err := s.ThreadStore.MarkAsRead(userId, threadID, timestamp) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7495,10 +7495,10 @@ func (s *TimerLayerUserStore) AnalyticsGetSystemAdminCount() (int64, error) { return result, err } -func (s *TimerLayerUserStore) AutocompleteUsersInChannel(teamId string, channelId string, term string, options *model.UserSearchOptions) (*model.UserAutocompleteInChannel, error) { +func (s *TimerLayerUserStore) AutocompleteUsersInChannel(teamID string, channelID string, term string, options *model.UserSearchOptions) (*model.UserAutocompleteInChannel, error) { start := timemodule.Now() - result, err := s.UserStore.AutocompleteUsersInChannel(teamId, channelId, term, options) + result, err := s.UserStore.AutocompleteUsersInChannel(teamID, channelID, term, options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7622,10 +7622,10 @@ func (s *TimerLayerUserStore) GetAll() ([]*model.User, error) { return result, err } -func (s *TimerLayerUserStore) GetAllAfter(limit int, afterId string) ([]*model.User, error) { +func (s *TimerLayerUserStore) GetAllAfter(limit int, afterID string) ([]*model.User, error) { start := timemodule.Now() - result, err := s.UserStore.GetAllAfter(limit, afterId) + result, err := s.UserStore.GetAllAfter(limit, afterID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7702,10 +7702,10 @@ func (s *TimerLayerUserStore) GetAllUsingAuthService(authService string) ([]*mod return result, err } -func (s *TimerLayerUserStore) GetAnyUnreadPostCountForChannel(userId string, channelId string) (int64, error) { +func (s *TimerLayerUserStore) GetAnyUnreadPostCountForChannel(userId string, channelID string) (int64, error) { start := timemodule.Now() - result, err := s.UserStore.GetAnyUnreadPostCountForChannel(userId, channelId) + result, err := s.UserStore.GetAnyUnreadPostCountForChannel(userId, channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7798,10 +7798,10 @@ func (s *TimerLayerUserStore) GetEtagForAllProfiles() string { return result } -func (s *TimerLayerUserStore) GetEtagForProfiles(teamId string) string { +func (s *TimerLayerUserStore) GetEtagForProfiles(teamID string) string { start := timemodule.Now() - result := s.UserStore.GetEtagForProfiles(teamId) + result := s.UserStore.GetEtagForProfiles(teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7814,10 +7814,10 @@ func (s *TimerLayerUserStore) GetEtagForProfiles(teamId string) string { return result } -func (s *TimerLayerUserStore) GetEtagForProfilesNotInTeam(teamId string) string { +func (s *TimerLayerUserStore) GetEtagForProfilesNotInTeam(teamID string) string { start := timemodule.Now() - result := s.UserStore.GetEtagForProfilesNotInTeam(teamId) + result := s.UserStore.GetEtagForProfilesNotInTeam(teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7830,10 +7830,10 @@ func (s *TimerLayerUserStore) GetEtagForProfilesNotInTeam(teamId string) string return result } -func (s *TimerLayerUserStore) GetForLogin(loginId string, allowSignInWithUsername bool, allowSignInWithEmail bool) (*model.User, error) { +func (s *TimerLayerUserStore) GetForLogin(loginID string, allowSignInWithUsername bool, allowSignInWithEmail bool) (*model.User, error) { start := timemodule.Now() - result, err := s.UserStore.GetForLogin(loginId, allowSignInWithUsername, allowSignInWithEmail) + result, err := s.UserStore.GetForLogin(loginID, allowSignInWithUsername, allowSignInWithEmail) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7878,10 +7878,10 @@ func (s *TimerLayerUserStore) GetMany(ctx context.Context, ids []string) ([]*mod return result, err } -func (s *TimerLayerUserStore) GetNewUsersForTeam(teamId string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { +func (s *TimerLayerUserStore) GetNewUsersForTeam(teamID string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { start := timemodule.Now() - result, err := s.UserStore.GetNewUsersForTeam(teamId, offset, limit, viewRestrictions) + result, err := s.UserStore.GetNewUsersForTeam(teamID, offset, limit, viewRestrictions) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8006,10 +8006,10 @@ func (s *TimerLayerUserStore) GetProfilesNotInChannel(teamId string, channelId s return result, err } -func (s *TimerLayerUserStore) GetProfilesNotInTeam(teamId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { +func (s *TimerLayerUserStore) GetProfilesNotInTeam(teamID string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { start := timemodule.Now() - result, err := s.UserStore.GetProfilesNotInTeam(teamId, groupConstrained, offset, limit, viewRestrictions) + result, err := s.UserStore.GetProfilesNotInTeam(teamID, groupConstrained, offset, limit, viewRestrictions) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8038,10 +8038,10 @@ func (s *TimerLayerUserStore) GetProfilesWithoutTeam(options *model.UserGetOptio return result, err } -func (s *TimerLayerUserStore) GetRecentlyActiveUsersForTeam(teamId string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { +func (s *TimerLayerUserStore) GetRecentlyActiveUsersForTeam(teamID string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { start := timemodule.Now() - result, err := s.UserStore.GetRecentlyActiveUsersForTeam(teamId, offset, limit, viewRestrictions) + result, err := s.UserStore.GetRecentlyActiveUsersForTeam(teamID, offset, limit, viewRestrictions) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8102,10 +8102,10 @@ func (s *TimerLayerUserStore) GetUnreadCount(userId string) (int64, error) { return result, err } -func (s *TimerLayerUserStore) GetUnreadCountForChannel(userId string, channelId string) (int64, error) { +func (s *TimerLayerUserStore) GetUnreadCountForChannel(userId string, channelID string) (int64, error) { start := timemodule.Now() - result, err := s.UserStore.GetUnreadCountForChannel(userId, channelId) + result, err := s.UserStore.GetUnreadCountForChannel(userId, channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8165,10 +8165,10 @@ func (s *TimerLayerUserStore) InvalidateProfileCacheForUser(userId string) { } } -func (s *TimerLayerUserStore) InvalidateProfilesInChannelCache(channelId string) { +func (s *TimerLayerUserStore) InvalidateProfilesInChannelCache(channelID string) { start := timemodule.Now() - s.UserStore.InvalidateProfilesInChannelCache(channelId) + s.UserStore.InvalidateProfilesInChannelCache(channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8259,10 +8259,10 @@ func (s *TimerLayerUserStore) Save(user *model.User) (*model.User, error) { return result, err } -func (s *TimerLayerUserStore) Search(teamId string, term string, options *model.UserSearchOptions) ([]*model.User, error) { +func (s *TimerLayerUserStore) Search(teamID string, term string, options *model.UserSearchOptions) ([]*model.User, error) { start := timemodule.Now() - result, err := s.UserStore.Search(teamId, term, options) + result, err := s.UserStore.Search(teamID, term, options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8275,10 +8275,10 @@ func (s *TimerLayerUserStore) Search(teamId string, term string, options *model. return result, err } -func (s *TimerLayerUserStore) SearchInChannel(channelId string, term string, options *model.UserSearchOptions) ([]*model.User, error) { +func (s *TimerLayerUserStore) SearchInChannel(channelID string, term string, options *model.UserSearchOptions) ([]*model.User, error) { start := timemodule.Now() - result, err := s.UserStore.SearchInChannel(channelId, term, options) + result, err := s.UserStore.SearchInChannel(channelID, term, options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8307,10 +8307,10 @@ func (s *TimerLayerUserStore) SearchInGroup(groupID string, term string, options return result, err } -func (s *TimerLayerUserStore) SearchNotInChannel(teamId string, channelId string, term string, options *model.UserSearchOptions) ([]*model.User, error) { +func (s *TimerLayerUserStore) SearchNotInChannel(teamID string, channelID string, term string, options *model.UserSearchOptions) ([]*model.User, error) { start := timemodule.Now() - result, err := s.UserStore.SearchNotInChannel(teamId, channelId, term, options) + result, err := s.UserStore.SearchNotInChannel(teamID, channelID, term, options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8499,10 +8499,10 @@ func (s *TimerLayerUserStore) VerifyEmail(userId string, email string) (string, return result, err } -func (s *TimerLayerUserAccessTokenStore) Delete(tokenId string) error { +func (s *TimerLayerUserAccessTokenStore) Delete(tokenID string) error { start := timemodule.Now() - err := s.UserAccessTokenStore.Delete(tokenId) + err := s.UserAccessTokenStore.Delete(tokenID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8531,10 +8531,10 @@ func (s *TimerLayerUserAccessTokenStore) DeleteAllForUser(userId string) error { return err } -func (s *TimerLayerUserAccessTokenStore) Get(tokenId string) (*model.UserAccessToken, error) { +func (s *TimerLayerUserAccessTokenStore) Get(tokenID string) (*model.UserAccessToken, error) { start := timemodule.Now() - result, err := s.UserAccessTokenStore.Get(tokenId) + result, err := s.UserAccessTokenStore.Get(tokenID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8627,10 +8627,10 @@ func (s *TimerLayerUserAccessTokenStore) Search(term string) ([]*model.UserAcces return result, err } -func (s *TimerLayerUserAccessTokenStore) UpdateTokenDisable(tokenId string) error { +func (s *TimerLayerUserAccessTokenStore) UpdateTokenDisable(tokenID string) error { start := timemodule.Now() - err := s.UserAccessTokenStore.UpdateTokenDisable(tokenId) + err := s.UserAccessTokenStore.UpdateTokenDisable(tokenID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8643,10 +8643,10 @@ func (s *TimerLayerUserAccessTokenStore) UpdateTokenDisable(tokenId string) erro return err } -func (s *TimerLayerUserAccessTokenStore) UpdateTokenEnable(tokenId string) error { +func (s *TimerLayerUserAccessTokenStore) UpdateTokenEnable(tokenID string) error { start := timemodule.Now() - err := s.UserAccessTokenStore.UpdateTokenEnable(tokenId) + err := s.UserAccessTokenStore.UpdateTokenEnable(tokenID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8707,10 +8707,10 @@ func (s *TimerLayerUserTermsOfServiceStore) Save(userTermsOfService *model.UserT return result, err } -func (s *TimerLayerWebhookStore) AnalyticsIncomingCount(teamId string) (int64, error) { +func (s *TimerLayerWebhookStore) AnalyticsIncomingCount(teamID string) (int64, error) { start := timemodule.Now() - result, err := s.WebhookStore.AnalyticsIncomingCount(teamId) + result, err := s.WebhookStore.AnalyticsIncomingCount(teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8723,10 +8723,10 @@ func (s *TimerLayerWebhookStore) AnalyticsIncomingCount(teamId string) (int64, e return result, err } -func (s *TimerLayerWebhookStore) AnalyticsOutgoingCount(teamId string) (int64, error) { +func (s *TimerLayerWebhookStore) AnalyticsOutgoingCount(teamID string) (int64, error) { start := timemodule.Now() - result, err := s.WebhookStore.AnalyticsOutgoingCount(teamId) + result, err := s.WebhookStore.AnalyticsOutgoingCount(teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8754,10 +8754,10 @@ func (s *TimerLayerWebhookStore) ClearCaches() { } } -func (s *TimerLayerWebhookStore) DeleteIncoming(webhookId string, time int64) error { +func (s *TimerLayerWebhookStore) DeleteIncoming(webhookID string, time int64) error { start := timemodule.Now() - err := s.WebhookStore.DeleteIncoming(webhookId, time) + err := s.WebhookStore.DeleteIncoming(webhookID, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8770,10 +8770,10 @@ func (s *TimerLayerWebhookStore) DeleteIncoming(webhookId string, time int64) er return err } -func (s *TimerLayerWebhookStore) DeleteOutgoing(webhookId string, time int64) error { +func (s *TimerLayerWebhookStore) DeleteOutgoing(webhookID string, time int64) error { start := timemodule.Now() - err := s.WebhookStore.DeleteOutgoing(webhookId, time) + err := s.WebhookStore.DeleteOutgoing(webhookID, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8802,10 +8802,10 @@ func (s *TimerLayerWebhookStore) GetIncoming(id string, allowFromCache bool) (*m return result, err } -func (s *TimerLayerWebhookStore) GetIncomingByChannel(channelId string) ([]*model.IncomingWebhook, error) { +func (s *TimerLayerWebhookStore) GetIncomingByChannel(channelID string) ([]*model.IncomingWebhook, error) { start := timemodule.Now() - result, err := s.WebhookStore.GetIncomingByChannel(channelId) + result, err := s.WebhookStore.GetIncomingByChannel(channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8818,10 +8818,10 @@ func (s *TimerLayerWebhookStore) GetIncomingByChannel(channelId string) ([]*mode return result, err } -func (s *TimerLayerWebhookStore) GetIncomingByTeam(teamId string, offset int, limit int) ([]*model.IncomingWebhook, error) { +func (s *TimerLayerWebhookStore) GetIncomingByTeam(teamID string, offset int, limit int) ([]*model.IncomingWebhook, error) { start := timemodule.Now() - result, err := s.WebhookStore.GetIncomingByTeam(teamId, offset, limit) + result, err := s.WebhookStore.GetIncomingByTeam(teamID, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8834,10 +8834,10 @@ func (s *TimerLayerWebhookStore) GetIncomingByTeam(teamId string, offset int, li return result, err } -func (s *TimerLayerWebhookStore) GetIncomingByTeamByUser(teamId string, userId string, offset int, limit int) ([]*model.IncomingWebhook, error) { +func (s *TimerLayerWebhookStore) GetIncomingByTeamByUser(teamID string, userId string, offset int, limit int) ([]*model.IncomingWebhook, error) { start := timemodule.Now() - result, err := s.WebhookStore.GetIncomingByTeamByUser(teamId, userId, offset, limit) + result, err := s.WebhookStore.GetIncomingByTeamByUser(teamID, userId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8898,10 +8898,10 @@ func (s *TimerLayerWebhookStore) GetOutgoing(id string) (*model.OutgoingWebhook, return result, err } -func (s *TimerLayerWebhookStore) GetOutgoingByChannel(channelId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { +func (s *TimerLayerWebhookStore) GetOutgoingByChannel(channelID string, offset int, limit int) ([]*model.OutgoingWebhook, error) { start := timemodule.Now() - result, err := s.WebhookStore.GetOutgoingByChannel(channelId, offset, limit) + result, err := s.WebhookStore.GetOutgoingByChannel(channelID, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8914,10 +8914,10 @@ func (s *TimerLayerWebhookStore) GetOutgoingByChannel(channelId string, offset i return result, err } -func (s *TimerLayerWebhookStore) GetOutgoingByChannelByUser(channelId string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { +func (s *TimerLayerWebhookStore) GetOutgoingByChannelByUser(channelID string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { start := timemodule.Now() - result, err := s.WebhookStore.GetOutgoingByChannelByUser(channelId, userId, offset, limit) + result, err := s.WebhookStore.GetOutgoingByChannelByUser(channelID, userId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8930,10 +8930,10 @@ func (s *TimerLayerWebhookStore) GetOutgoingByChannelByUser(channelId string, us return result, err } -func (s *TimerLayerWebhookStore) GetOutgoingByTeam(teamId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { +func (s *TimerLayerWebhookStore) GetOutgoingByTeam(teamID string, offset int, limit int) ([]*model.OutgoingWebhook, error) { start := timemodule.Now() - result, err := s.WebhookStore.GetOutgoingByTeam(teamId, offset, limit) + result, err := s.WebhookStore.GetOutgoingByTeam(teamID, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8946,10 +8946,10 @@ func (s *TimerLayerWebhookStore) GetOutgoingByTeam(teamId string, offset int, li return result, err } -func (s *TimerLayerWebhookStore) GetOutgoingByTeamByUser(teamId string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { +func (s *TimerLayerWebhookStore) GetOutgoingByTeamByUser(teamID string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { start := timemodule.Now() - result, err := s.WebhookStore.GetOutgoingByTeamByUser(teamId, userId, offset, limit) + result, err := s.WebhookStore.GetOutgoingByTeamByUser(teamID, userId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -9009,10 +9009,10 @@ func (s *TimerLayerWebhookStore) InvalidateWebhookCache(webhook string) { } } -func (s *TimerLayerWebhookStore) PermanentDeleteIncomingByChannel(channelId string) error { +func (s *TimerLayerWebhookStore) PermanentDeleteIncomingByChannel(channelID string) error { start := timemodule.Now() - err := s.WebhookStore.PermanentDeleteIncomingByChannel(channelId) + err := s.WebhookStore.PermanentDeleteIncomingByChannel(channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -9041,10 +9041,10 @@ func (s *TimerLayerWebhookStore) PermanentDeleteIncomingByUser(userId string) er return err } -func (s *TimerLayerWebhookStore) PermanentDeleteOutgoingByChannel(channelId string) error { +func (s *TimerLayerWebhookStore) PermanentDeleteOutgoingByChannel(channelID string) error { start := timemodule.Now() - err := s.WebhookStore.PermanentDeleteOutgoingByChannel(channelId) + err := s.WebhookStore.PermanentDeleteOutgoingByChannel(channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { diff --git a/utils/api.go b/utils/api.go index 472e1ab067..16caed645c 100644 --- a/utils/api.go +++ b/utils/api.go @@ -115,7 +115,7 @@ func RenderWebError(config *model.Config, w http.ResponseWriter, r *http.Request fmt.Fprintln(w, ``) } -func RenderMobileAuthComplete(w http.ResponseWriter, redirectUrl string) { +func RenderMobileAuthComplete(w http.ResponseWriter, redirectURL string) { RenderMobileMessage(w, `
@@ -123,13 +123,13 @@ func RenderMobileAuthComplete(w http.ResponseWriter, redirectUrl string) {

`+T("api.oauth.auth_complete")+`

`+T("api.oauth.redirecting_back")+`

- + diff --git a/utils/html.go b/utils/html.go index d2aa0cdaa3..74755db197 100644 --- a/utils/html.go +++ b/utils/html.go @@ -89,7 +89,7 @@ type HTMLTemplate struct { Templates *template.Template TemplateName string Props map[string]interface{} - Html map[string]template.HTML + HTML map[string]template.HTML } func NewHTMLTemplate(templates *template.Template, templateName string) *HTMLTemplate { @@ -97,7 +97,7 @@ func NewHTMLTemplate(templates *template.Template, templateName string) *HTMLTem Templates: templates, TemplateName: templateName, Props: make(map[string]interface{}), - Html: make(map[string]template.HTML), + HTML: make(map[string]template.HTML), } } @@ -120,14 +120,14 @@ func (t *HTMLTemplate) RenderToWriter(w io.Writer) error { return nil } -func TranslateAsHtml(t i18n.TranslateFunc, translationID string, args map[string]interface{}) template.HTML { - message := t(translationID, escapeForHtml(args)) +func TranslateAsHTML(t i18n.TranslateFunc, translationID string, args map[string]interface{}) template.HTML { + message := t(translationID, escapeForHTML(args)) message = strings.Replace(message, "[[", "", -1) message = strings.Replace(message, "]]", "", -1) return template.HTML(message) } -func escapeForHtml(arg interface{}) interface{} { +func escapeForHTML(arg interface{}) interface{} { switch typedArg := arg.(type) { case string: return template.HTMLEscapeString(typedArg) @@ -136,7 +136,7 @@ func escapeForHtml(arg interface{}) interface{} { case map[string]interface{}: safeArg := make(map[string]interface{}, len(typedArg)) for key, value := range typedArg { - safeArg[key] = escapeForHtml(value) + safeArg[key] = escapeForHTML(value) } return safeArg default: diff --git a/utils/html_test.go b/utils/html_test.go index e819492f91..53e9c5b353 100644 --- a/utils/html_test.go +++ b/utils/html_test.go @@ -103,7 +103,7 @@ func TestHTMLTemplate_RenderError(t *testing.T) { } func TestTranslateAsHtml(t *testing.T) { - assert.EqualValues(t, "

<i>foo</i>

", TranslateAsHtml(i18n.TranslateFunc(htmlTestTranslationBundle.MustTfunc("en")), "foo.bold", map[string]interface{}{ + assert.EqualValues(t, "

<i>foo</i>

", TranslateAsHTML(i18n.TranslateFunc(htmlTestTranslationBundle.MustTfunc("en")), "foo.bold", map[string]interface{}{ "Foo": "foo", })) } @@ -141,7 +141,7 @@ func TestEscapeForHtml(t *testing.T) { }, } { t.Run(name, func(t *testing.T) { - assert.Equal(t, tc.Expected, escapeForHtml(tc.In)) + assert.Equal(t, tc.Expected, escapeForHTML(tc.In)) }) } } diff --git a/utils/jsonutils/json.go b/utils/jsonutils/json.go index 4651ec873a..9d5e787217 100644 --- a/utils/jsonutils/json.go +++ b/utils/jsonutils/json.go @@ -10,34 +10,34 @@ import ( "github.com/pkg/errors" ) -type HumanizedJsonError struct { +type HumanizedJSONError struct { Err error Line int Character int } -func (e *HumanizedJsonError) Error() string { +func (e *HumanizedJSONError) Error() string { return e.Err.Error() } -// HumanizeJsonError extracts error offsets and annotates the error with useful context -func HumanizeJsonError(err error, data []byte) error { +// HumanizeJSONError extracts error offsets and annotates the error with useful context +func HumanizeJSONError(err error, data []byte) error { if syntaxError, ok := err.(*json.SyntaxError); ok { - return NewHumanizedJsonError(syntaxError, data, syntaxError.Offset) + return NewHumanizedJSONError(syntaxError, data, syntaxError.Offset) } else if unmarshalError, ok := err.(*json.UnmarshalTypeError); ok { - return NewHumanizedJsonError(unmarshalError, data, unmarshalError.Offset) + return NewHumanizedJSONError(unmarshalError, data, unmarshalError.Offset) } else { return err } } -func NewHumanizedJsonError(err error, data []byte, offset int64) *HumanizedJsonError { +func NewHumanizedJSONError(err error, data []byte, offset int64) *HumanizedJSONError { if err == nil { return nil } if offset < 0 || offset > int64(len(data)) { - return &HumanizedJsonError{ + return &HumanizedJSONError{ Err: errors.Wrapf(err, "invalid offset %d", offset), } } @@ -48,7 +48,7 @@ func NewHumanizedJsonError(err error, data []byte, offset int64) *HumanizedJsonE lastLineOffset := bytes.LastIndex(data[:offset], lineSep) character := int(offset) - (lastLineOffset + 1) + 1 - return &HumanizedJsonError{ + return &HumanizedJSONError{ Line: line, Character: character, Err: errors.Wrapf(err, "parsing error at line %d, character %d", line, character), diff --git a/utils/jsonutils/json_test.go b/utils/jsonutils/json_test.go index 22720f23ce..85d1be8a48 100644 --- a/utils/jsonutils/json_test.go +++ b/utils/jsonutils/json_test.go @@ -63,7 +63,7 @@ func TestHumanizeJsonError(t *testing.T) { for _, testCase := range testCases { testCase := testCase t.Run(testCase.Description, func(t *testing.T) { - actual := jsonutils.HumanizeJsonError(testCase.Err, testCase.Data) + actual := jsonutils.HumanizeJSONError(testCase.Err, testCase.Data) if testCase.ExpectedErr == "" { assert.NoError(t, actual) } else { @@ -73,7 +73,7 @@ func TestHumanizeJsonError(t *testing.T) { } } -func TestNewHumanizedJsonError(t *testing.T) { +func TestNewHumanizedJSONError(t *testing.T) { t.Parallel() testCases := []struct { @@ -81,7 +81,7 @@ func TestNewHumanizedJsonError(t *testing.T) { Data []byte Offset int64 Err error - Expected *jsonutils.HumanizedJsonError + Expected *jsonutils.HumanizedJSONError }{ { "nil error", @@ -95,7 +95,7 @@ func TestNewHumanizedJsonError(t *testing.T) { []byte("line 1\nline 2\nline 3"), -1, errors.New("message"), - &jsonutils.HumanizedJsonError{ + &jsonutils.HumanizedJSONError{ Err: errors.Wrap(errors.New("message"), "invalid offset -1"), }, }, @@ -104,7 +104,7 @@ func TestNewHumanizedJsonError(t *testing.T) { []byte("line 1\nline 2\nline 3"), 0, errors.New("message"), - &jsonutils.HumanizedJsonError{ + &jsonutils.HumanizedJSONError{ Err: errors.Wrap(errors.New("message"), "parsing error at line 1, character 1"), Line: 1, Character: 1, @@ -115,7 +115,7 @@ func TestNewHumanizedJsonError(t *testing.T) { []byte("line 1\nline 2\nline 3"), 5, errors.New("message"), - &jsonutils.HumanizedJsonError{ + &jsonutils.HumanizedJSONError{ Err: errors.Wrap(errors.New("message"), "parsing error at line 1, character 6"), Line: 1, Character: 6, @@ -126,7 +126,7 @@ func TestNewHumanizedJsonError(t *testing.T) { []byte("line 1\nline 2\nline 3"), 6, errors.New("message"), - &jsonutils.HumanizedJsonError{ + &jsonutils.HumanizedJSONError{ Err: errors.Wrap(errors.New("message"), "parsing error at line 1, character 7"), Line: 1, Character: 7, @@ -137,7 +137,7 @@ func TestNewHumanizedJsonError(t *testing.T) { []byte("line 1\nline 2\nline 3"), 7, errors.New("message"), - &jsonutils.HumanizedJsonError{ + &jsonutils.HumanizedJSONError{ Err: errors.Wrap(errors.New("message"), "parsing error at line 2, character 1"), Line: 2, Character: 1, @@ -148,7 +148,7 @@ func TestNewHumanizedJsonError(t *testing.T) { []byte("line 1\nline 2\nline 3"), 12, errors.New("message"), - &jsonutils.HumanizedJsonError{ + &jsonutils.HumanizedJSONError{ Err: errors.Wrap(errors.New("message"), "parsing error at line 2, character 6"), Line: 2, Character: 6, @@ -159,7 +159,7 @@ func TestNewHumanizedJsonError(t *testing.T) { []byte("line 1\nline 2\nline 3"), 13, errors.New("message"), - &jsonutils.HumanizedJsonError{ + &jsonutils.HumanizedJSONError{ Err: errors.Wrap(errors.New("message"), "parsing error at line 2, character 7"), Line: 2, Character: 7, @@ -170,7 +170,7 @@ func TestNewHumanizedJsonError(t *testing.T) { []byte("line 1\nline 2\nline 3"), 17, errors.New("message"), - &jsonutils.HumanizedJsonError{ + &jsonutils.HumanizedJSONError{ Err: errors.Wrap(errors.New("message"), "parsing error at line 3, character 4"), Line: 3, Character: 4, @@ -181,7 +181,7 @@ func TestNewHumanizedJsonError(t *testing.T) { []byte("line 1\nline 2\nline 3"), 19, errors.New("message"), - &jsonutils.HumanizedJsonError{ + &jsonutils.HumanizedJSONError{ Err: errors.Wrap(errors.New("message"), "parsing error at line 3, character 6"), Line: 3, Character: 6, @@ -192,7 +192,7 @@ func TestNewHumanizedJsonError(t *testing.T) { []byte("line 1\nline 2\nline 3"), 20, errors.New("message"), - &jsonutils.HumanizedJsonError{ + &jsonutils.HumanizedJSONError{ Err: errors.Wrap(errors.New("message"), "parsing error at line 3, character 7"), Line: 3, Character: 7, @@ -203,7 +203,7 @@ func TestNewHumanizedJsonError(t *testing.T) { []byte("line 1\nline 2\nline 3\n"), 21, errors.New("message"), - &jsonutils.HumanizedJsonError{ + &jsonutils.HumanizedJSONError{ Err: errors.Wrap(errors.New("message"), "parsing error at line 4, character 1"), Line: 4, Character: 1, @@ -214,7 +214,7 @@ func TestNewHumanizedJsonError(t *testing.T) { []byte("line 1\nline 2\nline 3"), 21, errors.New("message"), - &jsonutils.HumanizedJsonError{ + &jsonutils.HumanizedJSONError{ Err: errors.Wrap(errors.New("message"), "invalid offset 21"), }, }, @@ -223,7 +223,7 @@ func TestNewHumanizedJsonError(t *testing.T) { for _, testCase := range testCases { testCase := testCase t.Run(testCase.Description, func(t *testing.T) { - actual := jsonutils.NewHumanizedJsonError(testCase.Err, testCase.Data, testCase.Offset) + actual := jsonutils.NewHumanizedJSONError(testCase.Err, testCase.Data, testCase.Offset) if testCase.Expected != nil && actual.Err != nil { if assert.EqualValues(t, testCase.Expected.Err.Error(), actual.Err.Error()) { actual.Err = testCase.Expected.Err diff --git a/utils/markdown/autolink.go b/utils/markdown/autolink.go index d06ada667e..2eb05d9040 100644 --- a/utils/markdown/autolink.go +++ b/utils/markdown/autolink.go @@ -13,7 +13,7 @@ import ( // Based off of extensions/autolink.c from https://github.com/github/cmark var ( - DefaultUrlSchemes = []string{"http", "https", "ftp", "mailto", "tel"} + DefaultURLSchemes = []string{"http", "https", "ftp", "mailto", "tel"} wwwAutoLinkRegex = regexp.MustCompile(`^www\d{0,3}\.`) ) @@ -111,7 +111,7 @@ func parseURLAutolink(data string, position int) (Range, bool) { func isSchemeAllowed(scheme string) bool { // Note that this doesn't support the custom URL schemes implemented by the client - for _, allowed := range DefaultUrlSchemes { + for _, allowed := range DefaultURLSchemes { if strings.EqualFold(allowed, scheme) { return true } diff --git a/utils/subpath.go b/utils/subpath.go index b6f61ee0de..fa9d84fc2e 100644 --- a/utils/subpath.go +++ b/utils/subpath.go @@ -62,8 +62,8 @@ func UpdateAssetsSubpathInDir(subpath, directory string) error { return errors.Wrapf(err, "failed to resolve symlinks to %s", staticDir) } - rootHtmlPath := filepath.Join(staticDir, "root.html") - oldRootHtml, err := ioutil.ReadFile(rootHtmlPath) + rootHTMLPath := filepath.Join(staticDir, "root.html") + oldRootHTML, err := ioutil.ReadFile(rootHTMLPath) if err != nil { return errors.Wrap(err, "failed to open root.html") } @@ -73,7 +73,7 @@ func UpdateAssetsSubpathInDir(subpath, directory string) error { // Determine if a previous subpath had already been rewritten into the assets. reWebpackPublicPathScript := regexp.MustCompile("window.publicPath='([^']+/)static/'") alreadyRewritten := false - if matches := reWebpackPublicPathScript.FindStringSubmatch(string(oldRootHtml)); matches != nil { + if matches := reWebpackPublicPathScript.FindStringSubmatch(string(oldRootHTML)); matches != nil { oldSubpath = matches[1] alreadyRewritten = true } @@ -83,14 +83,14 @@ func UpdateAssetsSubpathInDir(subpath, directory string) error { mlog.Debug("Rewriting static assets", mlog.String("from_subpath", oldSubpath), mlog.String("to_subpath", subpath)) - newRootHtml := string(oldRootHtml) + newRootHTML := string(oldRootHTML) reCSP := regexp.MustCompile(``) - if results := reCSP.FindAllString(newRootHtml, -1); len(results) == 0 { + if results := reCSP.FindAllString(newRootHTML, -1); len(results) == 0 { return fmt.Errorf("failed to find 'Content-Security-Policy' meta tag to rewrite") } - newRootHtml = reCSP.ReplaceAllLiteralString(newRootHtml, fmt.Sprintf( + newRootHTML = reCSP.ReplaceAllLiteralString(newRootHTML, fmt.Sprintf( ``, GetSubpathScriptHash(subpath), )) @@ -98,22 +98,22 @@ func UpdateAssetsSubpathInDir(subpath, directory string) error { // Rewrite the root.html references to `/static/*` to include the given subpath. // This potentially includes a previously injected inline script that needs to // be updated (and isn't covered by the cases above). - newRootHtml = strings.Replace(newRootHtml, pathToReplace, newPath, -1) + newRootHTML = strings.Replace(newRootHTML, pathToReplace, newPath, -1) if alreadyRewritten && subpath == "/" { // Remove the injected script since no longer required. Note that the rewrite above // will have affected the script, so look for the new subpath, not the old one. oldScript := getSubpathScript(subpath) - newRootHtml = strings.Replace(newRootHtml, fmt.Sprintf("", oldScript), "", 1) + newRootHTML = strings.Replace(newRootHTML, fmt.Sprintf("", oldScript), "", 1) } else if !alreadyRewritten && subpath != "/" { // Otherwise, inject the script to define `window.publicPath`. script := getSubpathScript(subpath) - newRootHtml = strings.Replace(newRootHtml, "", fmt.Sprintf("", script), 1) + newRootHTML = strings.Replace(newRootHTML, "", fmt.Sprintf("", script), 1) } // Write out the updated root.html. - if err = ioutil.WriteFile(rootHtmlPath, []byte(newRootHtml), 0); err != nil { + if err = ioutil.WriteFile(rootHTMLPath, []byte(newRootHTML), 0); err != nil { return errors.Wrapf(err, "failed to update root.html with subpath %s", subpath) } diff --git a/utils/subpath_test.go b/utils/subpath_test.go index e05b6d8a9b..f7b7866f5a 100644 --- a/utils/subpath_test.go +++ b/utils/subpath_test.go @@ -86,78 +86,78 @@ func TestUpdateAssetsSubpath(t *testing.T) { "no changes required, empty subpath provided", baseRootHtml, baseCss, - baseManifestJson, + baseManifestJSON, "", nil, baseRootHtml, baseCss, - baseManifestJson, + baseManifestJSON, }, { "no changes required", baseRootHtml, baseCss, - baseManifestJson, + baseManifestJSON, "/", nil, baseRootHtml, baseCss, - baseManifestJson, + baseManifestJSON, }, { "content security policy not found (missing quotes)", contentSecurityPolicyNotFoundHtml, baseCss, - baseManifestJson, + baseManifestJSON, "/subpath", fmt.Errorf("failed to find 'Content-Security-Policy' meta tag to rewrite"), contentSecurityPolicyNotFoundHtml, baseCss, - baseManifestJson, + baseManifestJSON, }, { "content security policy not found (missing unsafe-eval)", contentSecurityPolicyNotFound2Html, baseCss, - baseManifestJson, + baseManifestJSON, "/subpath", fmt.Errorf("failed to find 'Content-Security-Policy' meta tag to rewrite"), contentSecurityPolicyNotFound2Html, baseCss, - baseManifestJson, + baseManifestJSON, }, { "subpath", baseRootHtml, baseCss, - baseManifestJson, + baseManifestJSON, "/subpath", nil, subpathRootHtml, - subpathCss, + subpathCSS, subpathManifestJson, }, { "new subpath from old", subpathRootHtml, - subpathCss, + subpathCSS, subpathManifestJson, "/nested/subpath", nil, - newSubpathRootHtml, - newSubpathCss, + newSubpathRootHTML, + newSubpathCSS, newSubpathManifestJson, }, { "resetting to /", subpathRootHtml, - subpathCss, - baseManifestJson, + subpathCSS, + baseManifestJSON, "/", nil, baseRootHtml, baseCss, - baseManifestJson, + baseManifestJSON, }, } @@ -278,13 +278,13 @@ const baseCss = `@font-face{font-family:FontAwesome;src:url(/static/files/674f50 const subpathRootHtml = ` Mattermost

Cannot connect to Mattermost

We're having trouble connecting to Mattermost. If refreshing this page (Ctrl+R or Command+R) does not work, please verify that your computer is connected to the internet.


` -const subpathCss = `@font-face{font-family:FontAwesome;src:url(/subpath/static/files/674f50d287a8c48dc19ba404d20fe713.eot);src:url(/subpath/static/files/674f50d287a8c48dc19ba404d20fe713.eot?#iefix&v=4.7.0) format("embedded-opentype"),url(/subpath/static/files/af7ae505a9eed503f8b8e6982036873e.woff2) format("woff2"),url(/subpath/static/files/fee66e712a8a08eef5805a46892932ad.woff) format("woff"),url(/subpath/static/files/b06871f281fee6b241d60582ae9369b9.ttf) format("truetype"),url(/subpath/static/files/677433a0892aaed7b7d2628c313c9775.svg#fontawesomeregular) format("svg");font-weight:400;font-style:normal}` +const subpathCSS = `@font-face{font-family:FontAwesome;src:url(/subpath/static/files/674f50d287a8c48dc19ba404d20fe713.eot);src:url(/subpath/static/files/674f50d287a8c48dc19ba404d20fe713.eot?#iefix&v=4.7.0) format("embedded-opentype"),url(/subpath/static/files/af7ae505a9eed503f8b8e6982036873e.woff2) format("woff2"),url(/subpath/static/files/fee66e712a8a08eef5805a46892932ad.woff) format("woff"),url(/subpath/static/files/b06871f281fee6b241d60582ae9369b9.ttf) format("truetype"),url(/subpath/static/files/677433a0892aaed7b7d2628c313c9775.svg#fontawesomeregular) format("svg");font-weight:400;font-style:normal}` -const newSubpathRootHtml = ` Mattermost

Cannot connect to Mattermost

We're having trouble connecting to Mattermost. If refreshing this page (Ctrl+R or Command+R) does not work, please verify that your computer is connected to the internet.


` +const newSubpathRootHTML = ` Mattermost

Cannot connect to Mattermost

We're having trouble connecting to Mattermost. If refreshing this page (Ctrl+R or Command+R) does not work, please verify that your computer is connected to the internet.


` -const newSubpathCss = `@font-face{font-family:FontAwesome;src:url(/nested/subpath/static/files/674f50d287a8c48dc19ba404d20fe713.eot);src:url(/nested/subpath/static/files/674f50d287a8c48dc19ba404d20fe713.eot?#iefix&v=4.7.0) format("embedded-opentype"),url(/nested/subpath/static/files/af7ae505a9eed503f8b8e6982036873e.woff2) format("woff2"),url(/nested/subpath/static/files/fee66e712a8a08eef5805a46892932ad.woff) format("woff"),url(/nested/subpath/static/files/b06871f281fee6b241d60582ae9369b9.ttf) format("truetype"),url(/nested/subpath/static/files/677433a0892aaed7b7d2628c313c9775.svg#fontawesomeregular) format("svg");font-weight:400;font-style:normal}` +const newSubpathCSS = `@font-face{font-family:FontAwesome;src:url(/nested/subpath/static/files/674f50d287a8c48dc19ba404d20fe713.eot);src:url(/nested/subpath/static/files/674f50d287a8c48dc19ba404d20fe713.eot?#iefix&v=4.7.0) format("embedded-opentype"),url(/nested/subpath/static/files/af7ae505a9eed503f8b8e6982036873e.woff2) format("woff2"),url(/nested/subpath/static/files/fee66e712a8a08eef5805a46892932ad.woff) format("woff"),url(/nested/subpath/static/files/b06871f281fee6b241d60582ae9369b9.ttf) format("truetype"),url(/nested/subpath/static/files/677433a0892aaed7b7d2628c313c9775.svg#fontawesomeregular) format("svg");font-weight:400;font-style:normal}` -const baseManifestJson = `{ +const baseManifestJSON = `{ "icons": [ { "src": "/static/icon_96x96.png", diff --git a/utils/urlencode.go b/utils/urlencode.go index dae3f7e76a..d97f2ab820 100644 --- a/utils/urlencode.go +++ b/utils/urlencode.go @@ -8,7 +8,7 @@ import ( "strings" ) -func UrlEncode(str string) string { +func URLEncode(str string) string { strs := strings.Split(str, " ") for i, s := range strs { diff --git a/utils/urlencode_test.go b/utils/urlencode_test.go index 139fefa513..a87af6fcce 100644 --- a/utils/urlencode_test.go +++ b/utils/urlencode_test.go @@ -12,17 +12,17 @@ import ( func TestUrlEncode(t *testing.T) { toEncode := "testing 1 2 3" - encoded := UrlEncode(toEncode) + encoded := URLEncode(toEncode) require.Equal(t, encoded, "testing%201%202%203") toEncode = "testing123" - encoded = UrlEncode(toEncode) + encoded = URLEncode(toEncode) require.Equal(t, encoded, "testing123") toEncode = "testing$#~123" - encoded = UrlEncode(toEncode) + encoded = URLEncode(toEncode) require.Equal(t, encoded, "testing%24%23~123") } diff --git a/utils/utils.go b/utils/utils.go index fe114ee7a0..3fe9511eeb 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -94,7 +94,7 @@ func StringSliceDiff(a, b []string) []string { return result } -func GetIpAddress(r *http.Request, trustedProxyIPHeader []string) string { +func GetIPAddress(r *http.Request, trustedProxyIPHeader []string) string { address := "" for _, proxyHeader := range trustedProxyIPHeader { @@ -135,7 +135,7 @@ type RequestCache struct { // Fetch JSON data from the notices server // if skip is passed, does a fetch without touching the cache -func GetUrlWithCache(url string, cache *RequestCache, skip bool) ([]byte, error) { +func GetURLWithCache(url string, cache *RequestCache, skip bool) ([]byte, error) { // Build a GET Request, including optional If-None-Match header. req, err := http.NewRequest("GET", url, nil) if err != nil { @@ -198,8 +198,8 @@ func IsValidWebAuthRedirectURL(config *model.Config, redirectURL string) bool { u, err := url.Parse(redirectURL) if err == nil && (u.Scheme == "http" || u.Scheme == "https") { if config.ServiceSettings.SiteURL != nil { - siteUrl := *config.ServiceSettings.SiteURL - return strings.Index(strings.ToLower(redirectURL), strings.ToLower(siteUrl)) == 0 + siteURL := *config.ServiceSettings.SiteURL + return strings.Index(strings.ToLower(redirectURL), strings.ToLower(siteURL)) == 0 } return false } diff --git a/utils/utils_test.go b/utils/utils_test.go index 6bd10106ea..f50ec3afc0 100644 --- a/utils/utils_test.go +++ b/utils/utils_test.go @@ -49,7 +49,7 @@ func TestStringSliceDiff(t *testing.T) { assert.Equal(t, expected, StringSliceDiff(a, b)) } -func TestGetIpAddress(t *testing.T) { +func TestGetIPAddress(t *testing.T) { // Test with a single IP in the X-Forwarded-For httpRequest1 := http.Request{ Header: http.Header{ @@ -59,7 +59,7 @@ func TestGetIpAddress(t *testing.T) { RemoteAddr: "10.2.0.1:12345", } - assert.Equal(t, "10.0.0.1", GetIpAddress(&httpRequest1, []string{"X-Forwarded-For"})) + assert.Equal(t, "10.0.0.1", GetIPAddress(&httpRequest1, []string{"X-Forwarded-For"})) // Test with multiple IPs in the X-Forwarded-For httpRequest2 := http.Request{ @@ -70,7 +70,7 @@ func TestGetIpAddress(t *testing.T) { RemoteAddr: "10.2.0.1:12345", } - assert.Equal(t, "10.0.0.1", GetIpAddress(&httpRequest2, []string{"X-Forwarded-For"})) + assert.Equal(t, "10.0.0.1", GetIPAddress(&httpRequest2, []string{"X-Forwarded-For"})) // Test with an empty X-Forwarded-For httpRequest3 := http.Request{ @@ -81,7 +81,7 @@ func TestGetIpAddress(t *testing.T) { RemoteAddr: "10.2.0.1:12345", } - assert.Equal(t, "10.1.0.1", GetIpAddress(&httpRequest3, []string{"X-Forwarded-For", "X-Real-Ip"})) + assert.Equal(t, "10.1.0.1", GetIPAddress(&httpRequest3, []string{"X-Forwarded-For", "X-Real-Ip"})) // Test without an X-Fowarded-For httpRequest4 := http.Request{ @@ -91,14 +91,14 @@ func TestGetIpAddress(t *testing.T) { RemoteAddr: "10.2.0.1:12345", } - assert.Equal(t, "10.1.0.1", GetIpAddress(&httpRequest4, []string{"X-Forwarded-For", "X-Real-Ip"})) + assert.Equal(t, "10.1.0.1", GetIPAddress(&httpRequest4, []string{"X-Forwarded-For", "X-Real-Ip"})) // Test without any headers httpRequest5 := http.Request{ RemoteAddr: "10.2.0.1:12345", } - assert.Equal(t, "10.2.0.1", GetIpAddress(&httpRequest5, []string{"X-Forwarded-For", "X-Real-Ip"})) + assert.Equal(t, "10.2.0.1", GetIPAddress(&httpRequest5, []string{"X-Forwarded-For", "X-Real-Ip"})) // Test with both headers, but both untrusted httpRequest6 := http.Request{ @@ -109,7 +109,7 @@ func TestGetIpAddress(t *testing.T) { RemoteAddr: "10.2.0.1:12345", } - assert.Equal(t, "10.2.0.1", GetIpAddress(&httpRequest6, nil)) + assert.Equal(t, "10.2.0.1", GetIPAddress(&httpRequest6, nil)) // Test with both headers, but only X-Real-Ip trusted httpRequest7 := http.Request{ @@ -120,7 +120,7 @@ func TestGetIpAddress(t *testing.T) { RemoteAddr: "10.2.0.1:12345", } - assert.Equal(t, "10.1.0.1", GetIpAddress(&httpRequest7, []string{"X-Real-Ip"})) + assert.Equal(t, "10.1.0.1", GetIPAddress(&httpRequest7, []string{"X-Real-Ip"})) // Test with X-Forwarded-For, comma separated, untrusted httpRequest8 := http.Request{ @@ -130,7 +130,7 @@ func TestGetIpAddress(t *testing.T) { RemoteAddr: "10.2.0.1:12345", } - assert.Equal(t, "10.2.0.1", GetIpAddress(&httpRequest8, nil)) + assert.Equal(t, "10.2.0.1", GetIPAddress(&httpRequest8, nil)) // Test with X-Forwarded-For, comma separated, untrusted httpRequest9 := http.Request{ @@ -140,7 +140,7 @@ func TestGetIpAddress(t *testing.T) { RemoteAddr: "10.2.0.1:12345", } - assert.Equal(t, "10.3.0.1", GetIpAddress(&httpRequest9, []string{"X-Forwarded-For"})) + assert.Equal(t, "10.3.0.1", GetIPAddress(&httpRequest9, []string{"X-Forwarded-For"})) // Test with both headers, both allowed, first one in trusted used httpRequest10 := http.Request{ @@ -151,7 +151,7 @@ func TestGetIpAddress(t *testing.T) { RemoteAddr: "10.2.0.1:12345", } - assert.Equal(t, "10.1.0.1", GetIpAddress(&httpRequest10, []string{"X-Real-Ip", "X-Forwarded-For"})) + assert.Equal(t, "10.1.0.1", GetIPAddress(&httpRequest10, []string{"X-Real-Ip", "X-Forwarded-For"})) } func TestRemoveStringFromSlice(t *testing.T) { diff --git a/web/handlers.go b/web/handlers.go index 6e6b42c2a9..87cb269887 100644 --- a/web/handlers.go +++ b/web/handlers.go @@ -111,7 +111,7 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { t, _ := utils.GetTranslationsAndLocale(r) c.App.SetT(t) c.App.SetRequestId(requestID) - c.App.SetIpAddress(utils.GetIpAddress(r, c.App.Config().ServiceSettings.TrustedProxyIPHeader)) + c.App.SetIpAddress(utils.GetIPAddress(r, c.App.Config().ServiceSettings.TrustedProxyIPHeader)) c.App.SetUserAgent(r.UserAgent()) c.App.SetAcceptLanguage(r.Header.Get("Accept-Language")) c.App.SetPath(r.URL.Path) diff --git a/web/web.go b/web/web.go index 269df1f09a..fd788b2c13 100644 --- a/web/web.go +++ b/web/web.go @@ -62,7 +62,7 @@ func CheckClientCompatibility(agentString string) bool { func Handle404(config configservice.ConfigService, w http.ResponseWriter, r *http.Request) { err := model.NewAppError("Handle404", "api.context.404.app_error", nil, "", http.StatusNotFound) - ipAddress := utils.GetIpAddress(r, config.Config().ServiceSettings.TrustedProxyIPHeader) + ipAddress := utils.GetIPAddress(r, config.Config().ServiceSettings.TrustedProxyIPHeader) mlog.Debug("not found handler triggered", mlog.String("path", r.URL.Path), mlog.Int("code", 404), mlog.String("ip", ipAddress)) if IsApiCall(config, r) {