diff --git a/app/plugin_api_tests/basic_config.go b/app/plugin_api_tests/basic_config.go index a1addbd8cb..001288ba15 100644 --- a/app/plugin_api_tests/basic_config.go +++ b/app/plugin_api_tests/basic_config.go @@ -6,17 +6,17 @@ package plugin_api_tests import "reflect" type BasicConfig struct { - BasicChannelId string + BasicChannelID string BasicChannelName string - BasicPostId string + BasicPostID string BasicPostMessage string BasicTeamDisplayName string - BasicTeamId string + BasicTeamID string BasicTeamName string BasicUser2Email string BasicUser2Id string BasicUserEmail string - BasicUserId string + BasicUserID string } func IsEmpty(object interface{}) bool { diff --git a/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go b/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go index 272d0a771d..a9e0630239 100644 --- a/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go +++ b/app/plugin_api_tests/test_get_channels_for_team_for_user_plugin/main.go @@ -23,14 +23,14 @@ func (p *MyPlugin) OnConfigurationChange() error { func (p *MyPlugin) MessageWillBePosted(_ *plugin.Context, _ *model.Post) (*model.Post, string) { - channels, err := p.API.GetChannelsForTeamForUser(p.configuration.BasicTeamId, p.configuration.BasicUserId, false) + channels, err := p.API.GetChannelsForTeamForUser(p.configuration.BasicTeamID, p.configuration.BasicUserID, false) if err != nil { return nil, err.Error() } if len(channels) != 3 { return nil, "Returned invalid number of channels" } - channels, err = p.API.GetChannelsForTeamForUser("invalidid", p.configuration.BasicUserId, false) + channels, err = p.API.GetChannelsForTeamForUser("invalidid", p.configuration.BasicUserID, false) if err == nil { return nil, "Expected to get an error while retrieving channels for invalid id" } diff --git a/app/plugin_api_tests/test_get_direct_channel_plugin/main.go b/app/plugin_api_tests/test_get_direct_channel_plugin/main.go index 24a68227f3..ba019af4d7 100644 --- a/app/plugin_api_tests/test_get_direct_channel_plugin/main.go +++ b/app/plugin_api_tests/test_get_direct_channel_plugin/main.go @@ -22,7 +22,7 @@ func (p *MyPlugin) OnConfigurationChange() error { } func (p *MyPlugin) MessageWillBePosted(_ *plugin.Context, _ *model.Post) (*model.Post, string) { - dm1, err := p.API.GetDirectChannel(p.configuration.BasicUserId, p.configuration.BasicUser2Id) + dm1, err := p.API.GetDirectChannel(p.configuration.BasicUserID, p.configuration.BasicUser2Id) if err != nil { return nil, err.Error() } @@ -30,7 +30,7 @@ func (p *MyPlugin) MessageWillBePosted(_ *plugin.Context, _ *model.Post) (*model return nil, "dm1 is empty" } - dm2, err := p.API.GetDirectChannel(p.configuration.BasicUserId, p.configuration.BasicUserId) + dm2, err := p.API.GetDirectChannel(p.configuration.BasicUserID, p.configuration.BasicUserID) if err != nil { return nil, err.Error() } @@ -38,7 +38,7 @@ func (p *MyPlugin) MessageWillBePosted(_ *plugin.Context, _ *model.Post) (*model return nil, "dm2 is empty" } - dm3, err := p.API.GetDirectChannel(p.configuration.BasicUserId, model.NewId()) + dm3, err := p.API.GetDirectChannel(p.configuration.BasicUserID, model.NewId()) if err == nil { return nil, "Expected to get error while fetching incorrect channel" } diff --git a/app/plugin_api_tests/test_get_profile_image_plugin/main.go b/app/plugin_api_tests/test_get_profile_image_plugin/main.go index d18cae1d0f..fe50798f50 100644 --- a/app/plugin_api_tests/test_get_profile_image_plugin/main.go +++ b/app/plugin_api_tests/test_get_profile_image_plugin/main.go @@ -24,7 +24,7 @@ func (p *MyPlugin) OnConfigurationChange() error { func (p *MyPlugin) MessageWillBePosted(_ *plugin.Context, _ *model.Post) (*model.Post, string) { // check existing user first - data, err := p.API.GetProfileImage(p.configuration.BasicUserId) + data, err := p.API.GetProfileImage(p.configuration.BasicUserID) if err != nil { return nil, err.Error() } diff --git a/app/plugin_api_tests/test_member_channels_plugin/main.go b/app/plugin_api_tests/test_member_channels_plugin/main.go index 0f5fb5567b..578bd5830a 100644 --- a/app/plugin_api_tests/test_member_channels_plugin/main.go +++ b/app/plugin_api_tests/test_member_channels_plugin/main.go @@ -22,13 +22,13 @@ func (p *MyPlugin) OnConfigurationChange() error { } func (p *MyPlugin) MessageWillBePosted(_ *plugin.Context, _ *model.Post) (*model.Post, string) { - channelMembers, err := p.API.GetChannelMembersForUser(p.configuration.BasicTeamId, p.configuration.BasicUserId, 0, 10) + channelMembers, err := p.API.GetChannelMembersForUser(p.configuration.BasicTeamID, p.configuration.BasicUserID, 0, 10) if err != nil { return nil, err.Error() + "failed to get channel members" } else if len(channelMembers) != 3 { return nil, "Invalid number of channel members" - } else if channelMembers[0].UserId != p.configuration.BasicUserId { + } else if channelMembers[0].UserId != p.configuration.BasicUserID { return nil, "Invalid user id returned" } diff --git a/app/plugin_api_tests/test_members_plugin/main.go b/app/plugin_api_tests/test_members_plugin/main.go index f086a05979..869cbd807f 100644 --- a/app/plugin_api_tests/test_members_plugin/main.go +++ b/app/plugin_api_tests/test_members_plugin/main.go @@ -22,12 +22,12 @@ func (p *MyPlugin) OnConfigurationChange() error { } func (p *MyPlugin) MessageWillBePosted(_ *plugin.Context, _ *model.Post) (*model.Post, string) { - teamMembers, err := p.API.GetTeamMembersForUser(p.configuration.BasicUserId, 0, 10) + teamMembers, err := p.API.GetTeamMembersForUser(p.configuration.BasicUserID, 0, 10) if err != nil { return nil, err.Error() + "failed to get team members" } else if len(teamMembers) != 1 { return nil, "Invalid number of team members" - } else if teamMembers[0].UserId != p.configuration.BasicUserId || teamMembers[0].TeamId != p.configuration.BasicTeamId { + } else if teamMembers[0].UserId != p.configuration.BasicUserID || teamMembers[0].TeamId != p.configuration.BasicTeamID { return nil, "Invalid user or team id returned" } return nil, "OK" diff --git a/app/plugin_api_tests/test_search_channels_plugin/main.go b/app/plugin_api_tests/test_search_channels_plugin/main.go index 0cb792a9c5..a2c7653a6f 100644 --- a/app/plugin_api_tests/test_search_channels_plugin/main.go +++ b/app/plugin_api_tests/test_search_channels_plugin/main.go @@ -23,7 +23,7 @@ func (p *MyPlugin) OnConfigurationChange() error { func (p *MyPlugin) MessageWillBePosted(_ *plugin.Context, _ *model.Post) (*model.Post, string) { - channels, err := p.API.SearchChannels(p.configuration.BasicTeamId, p.configuration.BasicChannelName) + channels, err := p.API.SearchChannels(p.configuration.BasicTeamID, p.configuration.BasicChannelName) if err != nil { return nil, err.Error() } diff --git a/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go b/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go index 4afb96b999..6821033aee 100644 --- a/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go +++ b/app/plugin_api_tests/test_search_posts_in_team_plugin/main.go @@ -32,25 +32,25 @@ func (p *MyPlugin) MessageWillBePosted(_ *plugin.Context, _ *model.Post) (*model }{ { "nil params", - p.configuration.BasicTeamId, + p.configuration.BasicTeamID, nil, 0, }, { "empty params", - p.configuration.BasicTeamId, + p.configuration.BasicTeamID, []*model.SearchParams{}, 0, }, { "doesn't match any posts", - p.configuration.BasicTeamId, + p.configuration.BasicTeamID, model.ParseSearchParams("bad message", 0), 0, }, { "matched posts", - p.configuration.BasicTeamId, + p.configuration.BasicTeamID, model.ParseSearchParams(p.configuration.BasicPostMessage, 0), 1, }, diff --git a/app/plugin_api_tests/test_set_profile_image_plugin/main.go b/app/plugin_api_tests/test_set_profile_image_plugin/main.go index 161ccfbfe5..b73fe0644f 100644 --- a/app/plugin_api_tests/test_set_profile_image_plugin/main.go +++ b/app/plugin_api_tests/test_set_profile_image_plugin/main.go @@ -41,12 +41,12 @@ func (p *MyPlugin) MessageWillBePosted(_ *plugin.Context, _ *model.Post) (*model dataBytes := buf.Bytes() // Set the user profile image - if err := p.API.SetProfileImage(p.configuration.BasicUserId, dataBytes); err != nil { + if err := p.API.SetProfileImage(p.configuration.BasicUserID, dataBytes); err != nil { return nil, err.Error() } // Get the user profile image to check - imageProfile, err := p.API.GetProfileImage(p.configuration.BasicUserId) + imageProfile, err := p.API.GetProfileImage(p.configuration.BasicUserID) if err != nil { return nil, err.Error() } diff --git a/app/plugin_api_tests/test_update_user_active_plugin/main.go b/app/plugin_api_tests/test_update_user_active_plugin/main.go index 7abb3ef313..974358e674 100644 --- a/app/plugin_api_tests/test_update_user_active_plugin/main.go +++ b/app/plugin_api_tests/test_update_user_active_plugin/main.go @@ -22,7 +22,7 @@ func (p *MyPlugin) OnConfigurationChange() error { } func (p *MyPlugin) MessageWillBePosted(_ *plugin.Context, _ *model.Post) (*model.Post, string) { - uid := p.configuration.BasicUserId + uid := p.configuration.BasicUserID if err := p.API.UpdateUserActive(uid, true); err != nil { return nil, err.Error() } diff --git a/app/plugin_api_tests/test_update_user_status_plugin/main.go b/app/plugin_api_tests/test_update_user_status_plugin/main.go index 48a3330c3f..36c91897f7 100644 --- a/app/plugin_api_tests/test_update_user_status_plugin/main.go +++ b/app/plugin_api_tests/test_update_user_status_plugin/main.go @@ -24,7 +24,7 @@ func (p *MyPlugin) OnConfigurationChange() error { } func (p *MyPlugin) MessageWillBePosted(_ *plugin.Context, _ *model.Post) (*model.Post, string) { - uid := p.configuration.BasicUserId + uid := p.configuration.BasicUserID statuses := []string{model.STATUS_ONLINE, model.STATUS_AWAY, model.STATUS_DND, model.STATUS_OFFLINE} diff --git a/einterfaces/ldap.go b/einterfaces/ldap.go index 5dc09c2d8a..395401cfb5 100644 --- a/einterfaces/ldap.go +++ b/einterfaces/ldap.go @@ -14,7 +14,7 @@ type LdapInterface interface { CheckPassword(id string, password string) *model.AppError CheckPasswordAuthData(authData string, password string) *model.AppError CheckProviderAttributes(LS *model.LdapSettings, ouser *model.User, patch *model.UserPatch) string - SwitchToLdap(userId, ldapId, ldapPassword string) *model.AppError + SwitchToLdap(userID, ldapID, ldapPassword string) *model.AppError StartSynchronizeJob(waitForJobToFinish bool) (*model.Job, *model.AppError) RunTest() *model.AppError GetAllLdapUsers() ([]*model.User, *model.AppError) diff --git a/einterfaces/mfa.go b/einterfaces/mfa.go index b42aae748a..2992ea2b7f 100644 --- a/einterfaces/mfa.go +++ b/einterfaces/mfa.go @@ -10,6 +10,6 @@ import ( type MfaInterface interface { GenerateSecret(user *model.User) (string, []byte, *model.AppError) Activate(user *model.User, token string) *model.AppError - Deactivate(userId string) *model.AppError + Deactivate(userID string) *model.AppError ValidateToken(secret, token string) (bool, *model.AppError) } diff --git a/einterfaces/mocks/LdapInterface.go b/einterfaces/mocks/LdapInterface.go index 994ce66228..6694081187 100644 --- a/einterfaces/mocks/LdapInterface.go +++ b/einterfaces/mocks/LdapInterface.go @@ -323,13 +323,13 @@ func (_m *LdapInterface) StartSynchronizeJob(waitForJobToFinish bool) (*model.Jo return r0, r1 } -// SwitchToLdap provides a mock function with given fields: userId, ldapId, ldapPassword -func (_m *LdapInterface) SwitchToLdap(userId string, ldapId string, ldapPassword string) *model.AppError { - ret := _m.Called(userId, ldapId, ldapPassword) +// SwitchToLdap provides a mock function with given fields: userID, ldapID, ldapPassword +func (_m *LdapInterface) SwitchToLdap(userID string, ldapID string, ldapPassword string) *model.AppError { + ret := _m.Called(userID, ldapID, ldapPassword) var r0 *model.AppError if rf, ok := ret.Get(0).(func(string, string, string) *model.AppError); ok { - r0 = rf(userId, ldapId, ldapPassword) + r0 = rf(userID, ldapID, ldapPassword) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.AppError) diff --git a/einterfaces/mocks/MfaInterface.go b/einterfaces/mocks/MfaInterface.go index cb089a7236..249b4e5ad5 100644 --- a/einterfaces/mocks/MfaInterface.go +++ b/einterfaces/mocks/MfaInterface.go @@ -30,13 +30,13 @@ func (_m *MfaInterface) Activate(user *model.User, token string) *model.AppError return r0 } -// Deactivate provides a mock function with given fields: userId -func (_m *MfaInterface) Deactivate(userId string) *model.AppError { - ret := _m.Called(userId) +// Deactivate provides a mock function with given fields: userID +func (_m *MfaInterface) Deactivate(userID string) *model.AppError { + ret := _m.Called(userID) var r0 *model.AppError if rf, ok := ret.Get(0).(func(string) *model.AppError); ok { - r0 = rf(userId) + r0 = rf(userID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.AppError) diff --git a/einterfaces/mocks/NotificationInterface.go b/einterfaces/mocks/NotificationInterface.go index eca5ad32fe..ff77eab4bf 100644 --- a/einterfaces/mocks/NotificationInterface.go +++ b/einterfaces/mocks/NotificationInterface.go @@ -30,13 +30,13 @@ func (_m *NotificationInterface) CheckLicense() *model.AppError { return r0 } -// GetNotificationMessage provides a mock function with given fields: ack, userId -func (_m *NotificationInterface) GetNotificationMessage(ack *model.PushNotificationAck, userId string) (*model.PushNotification, *model.AppError) { - ret := _m.Called(ack, userId) +// GetNotificationMessage provides a mock function with given fields: ack, userID +func (_m *NotificationInterface) GetNotificationMessage(ack *model.PushNotificationAck, userID string) (*model.PushNotification, *model.AppError) { + ret := _m.Called(ack, userID) var r0 *model.PushNotification if rf, ok := ret.Get(0).(func(*model.PushNotificationAck, string) *model.PushNotification); ok { - r0 = rf(ack, userId) + r0 = rf(ack, userID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.PushNotification) @@ -45,7 +45,7 @@ func (_m *NotificationInterface) GetNotificationMessage(ack *model.PushNotificat var r1 *model.AppError if rf, ok := ret.Get(1).(func(*model.PushNotificationAck, string) *model.AppError); ok { - r1 = rf(ack, userId) + r1 = rf(ack, userID) } else { if ret.Get(1) != nil { r1 = ret.Get(1).(*model.AppError) diff --git a/einterfaces/notification.go b/einterfaces/notification.go index 05a07a331e..3dcedf3044 100644 --- a/einterfaces/notification.go +++ b/einterfaces/notification.go @@ -8,6 +8,6 @@ import ( ) type NotificationInterface interface { - GetNotificationMessage(ack *model.PushNotificationAck, userId string) (*model.PushNotification, *model.AppError) + GetNotificationMessage(ack *model.PushNotificationAck, userID string) (*model.PushNotification, *model.AppError) CheckLicense() *model.AppError } diff --git a/plugin/api.go b/plugin/api.go index 8a5f58dbe1..ec5f883d4a 100644 --- a/plugin/api.go +++ b/plugin/api.go @@ -36,7 +36,7 @@ type API interface { // // @tag Command // Minimum server version: 5.2 - UnregisterCommand(teamId, trigger string) error + UnregisterCommand(teamID, trigger string) error // ExecuteSlashCommand executes a slash command with the given parameters. // @@ -47,7 +47,7 @@ type API interface { // GetSession returns the session object for the Session ID // // Minimum server version: 5.2 - GetSession(sessionId string) (*model.Session, *model.AppError) + GetSession(sessionID string) (*model.Session, *model.AppError) // GetConfig fetches the currently persisted config // @@ -126,7 +126,7 @@ type API interface { // // @tag User // Minimum server version: 5.2 - DeleteUser(userId string) *model.AppError + DeleteUser(userID string) *model.AppError // GetUsers a list of users based on search options. // @@ -138,7 +138,7 @@ type API interface { // // @tag User // Minimum server version: 5.2 - GetUser(userId string) (*model.User, *model.AppError) + GetUser(userID string) (*model.User, *model.AppError) // GetUserByEmail gets a user by their email address. // @@ -163,46 +163,46 @@ type API interface { // @tag User // @tag Team // Minimum server version: 5.6 - GetUsersInTeam(teamId string, page int, perPage int) ([]*model.User, *model.AppError) + GetUsersInTeam(teamID string, page int, perPage int) ([]*model.User, *model.AppError) // GetPreferencesForUser gets a user's preferences. // // @tag User // @tag Preference // Minimum server version: 5.26 - GetPreferencesForUser(userId string) ([]model.Preference, *model.AppError) + GetPreferencesForUser(userID string) ([]model.Preference, *model.AppError) // UpdatePreferencesForUser updates a user's preferences. // // @tag User // @tag Preference // Minimum server version: 5.26 - UpdatePreferencesForUser(userId string, preferences []model.Preference) *model.AppError + UpdatePreferencesForUser(userID string, preferences []model.Preference) *model.AppError // DeletePreferencesForUser deletes a user's preferences. // // @tag User // @tag Preference // Minimum server version: 5.26 - DeletePreferencesForUser(userId string, preferences []model.Preference) *model.AppError + DeletePreferencesForUser(userID string, preferences []model.Preference) *model.AppError // GetTeamIcon gets the team icon. // // @tag Team // Minimum server version: 5.6 - GetTeamIcon(teamId string) ([]byte, *model.AppError) + GetTeamIcon(teamID string) ([]byte, *model.AppError) // SetTeamIcon sets the team icon. // // @tag Team // Minimum server version: 5.6 - SetTeamIcon(teamId string, data []byte) *model.AppError + SetTeamIcon(teamID string, data []byte) *model.AppError // RemoveTeamIcon removes the team icon. // // @tag Team // Minimum server version: 5.6 - RemoveTeamIcon(teamId string) *model.AppError + RemoveTeamIcon(teamID string) *model.AppError // UpdateUser updates a user. // @@ -214,7 +214,7 @@ type API interface { // // @tag User // Minimum server version: 5.2 - GetUserStatus(userId string) (*model.Status, *model.AppError) + GetUserStatus(userID string) (*model.Status, *model.AppError) // GetUserStatusesByIds will return a list of user statuses based on the provided slice of user IDs. // @@ -227,13 +227,13 @@ type API interface { // // @tag User // Minimum server version: 5.2 - UpdateUserStatus(userId, status string) (*model.Status, *model.AppError) + UpdateUserStatus(userID, status string) (*model.Status, *model.AppError) // UpdateUserActive deactivates or reactivates an user. // // @tag User // Minimum server version: 5.8 - UpdateUserActive(userId string, active bool) *model.AppError + UpdateUserActive(userID string, active bool) *model.AppError // GetUsersInChannel returns a page of users in a channel. Page counting starts at 0. // The sortBy parameter can be: "username" or "status". @@ -241,7 +241,7 @@ type API interface { // @tag User // @tag Channel // Minimum server version: 5.6 - GetUsersInChannel(channelId, sortBy string, page, perPage int) ([]*model.User, *model.AppError) + GetUsersInChannel(channelID, sortBy string, page, perPage int) ([]*model.User, *model.AppError) // GetLDAPUserAttributes will return LDAP attributes for a user. // The attributes parameter should be a list of attributes to pull. @@ -250,7 +250,7 @@ type API interface { // // @tag User // Minimum server version: 5.3 - GetLDAPUserAttributes(userId string, attributes []string) (map[string]string, *model.AppError) + GetLDAPUserAttributes(userID string, attributes []string) (map[string]string, *model.AppError) // CreateTeam creates a team. // @@ -262,7 +262,7 @@ type API interface { // // @tag Team // Minimum server version: 5.2 - DeleteTeam(teamId string) *model.AppError + DeleteTeam(teamID string) *model.AppError // GetTeam gets all teams. // @@ -274,7 +274,7 @@ type API interface { // // @tag Team // Minimum server version: 5.2 - GetTeam(teamId string) (*model.Team, *model.AppError) + GetTeam(teamID string) (*model.Team, *model.AppError) // GetTeamByName gets a team by its name. // @@ -287,7 +287,7 @@ type API interface { // @tag Team // @tag User // Minimum server version: 5.6 - GetTeamsUnreadForUser(userId string) ([]*model.TeamUnread, *model.AppError) + GetTeamsUnreadForUser(userID string) ([]*model.TeamUnread, *model.AppError) // UpdateTeam updates a team. // @@ -306,63 +306,63 @@ type API interface { // @tag Team // @tag User // Minimum server version: 5.6 - GetTeamsForUser(userId string) ([]*model.Team, *model.AppError) + GetTeamsForUser(userID string) ([]*model.Team, *model.AppError) // CreateTeamMember creates a team membership. // // @tag Team // @tag User // Minimum server version: 5.2 - CreateTeamMember(teamId, userId string) (*model.TeamMember, *model.AppError) + CreateTeamMember(teamID, userID string) (*model.TeamMember, *model.AppError) // CreateTeamMembers creates a team membership for all provided user ids. // // @tag Team // @tag User // Minimum server version: 5.2 - CreateTeamMembers(teamId string, userIds []string, requestorId string) ([]*model.TeamMember, *model.AppError) + CreateTeamMembers(teamID string, userIds []string, requestorId string) ([]*model.TeamMember, *model.AppError) // CreateTeamMembersGracefully creates a team membership for all provided user ids and reports the users that were not added. // // @tag Team // @tag User // Minimum server version: 5.20 - CreateTeamMembersGracefully(teamId string, userIds []string, requestorId string) ([]*model.TeamMemberWithError, *model.AppError) + CreateTeamMembersGracefully(teamID string, userIds []string, requestorId string) ([]*model.TeamMemberWithError, *model.AppError) // DeleteTeamMember deletes a team membership. // // @tag Team // @tag User // Minimum server version: 5.2 - DeleteTeamMember(teamId, userId, requestorId string) *model.AppError + DeleteTeamMember(teamID, userID, requestorId string) *model.AppError // GetTeamMembers returns the memberships of a specific team. // // @tag Team // @tag User // Minimum server version: 5.2 - GetTeamMembers(teamId string, page, perPage int) ([]*model.TeamMember, *model.AppError) + GetTeamMembers(teamID string, page, perPage int) ([]*model.TeamMember, *model.AppError) // GetTeamMember returns a specific membership. // // @tag Team // @tag User // Minimum server version: 5.2 - GetTeamMember(teamId, userId string) (*model.TeamMember, *model.AppError) + GetTeamMember(teamID, userID string) (*model.TeamMember, *model.AppError) // GetTeamMembersForUser returns all team memberships for a user. // // @tag Team // @tag User // Minimum server version: 5.10 - GetTeamMembersForUser(userId string, page int, perPage int) ([]*model.TeamMember, *model.AppError) + GetTeamMembersForUser(userID string, page int, perPage int) ([]*model.TeamMember, *model.AppError) // UpdateTeamMemberRoles updates the role for a team membership. // // @tag Team // @tag User // Minimum server version: 5.2 - UpdateTeamMemberRoles(teamId, userId, newRoles string) (*model.TeamMember, *model.AppError) + UpdateTeamMemberRoles(teamID, userID, newRoles string) (*model.TeamMember, *model.AppError) // CreateChannel creates a channel. // @@ -381,7 +381,7 @@ type API interface { // @tag Channel // @tag Team // Minimum server version: 5.2 - GetPublicChannelsForTeam(teamId string, page, perPage int) ([]*model.Channel, *model.AppError) + GetPublicChannelsForTeam(teamID string, page, perPage int) ([]*model.Channel, *model.AppError) // GetChannel gets a channel. // @@ -393,7 +393,7 @@ type API interface { // // @tag Channel // Minimum server version: 5.2 - GetChannelByName(teamId, name string, includeDeleted bool) (*model.Channel, *model.AppError) + GetChannelByName(teamID, name string, includeDeleted bool) (*model.Channel, *model.AppError) // GetChannelByNameForTeamName gets a channel by its name, given a team name. // @@ -408,7 +408,7 @@ type API interface { // @tag Team // @tag User // Minimum server version: 5.6 - GetChannelsForTeamForUser(teamId, userId string, includeDeleted bool) ([]*model.Channel, *model.AppError) + GetChannelsForTeamForUser(teamID, userID string, includeDeleted bool) ([]*model.Channel, *model.AppError) // GetChannelStats gets statistics for a channel. // @@ -442,7 +442,7 @@ type API interface { // // @tag Channel // Minimum server version: 5.6 - SearchChannels(teamId string, term string) ([]*model.Channel, *model.AppError) + SearchChannels(teamID string, term string) ([]*model.Channel, *model.AppError) // SearchUsers returns a list of users based on some search criteria. // @@ -455,13 +455,13 @@ type API interface { // @tag Post // @tag Team // Minimum server version: 5.10 - SearchPostsInTeam(teamId string, paramsList []*model.SearchParams) ([]*model.Post, *model.AppError) + SearchPostsInTeam(teamID string, paramsList []*model.SearchParams) ([]*model.Post, *model.AppError) // SearchPostsInTeamForUser returns a list of posts by team and user that match the given // search parameters. // @tag Post // Minimum server version: 5.26 - SearchPostsInTeamForUser(teamId string, userId string, searchParams model.SearchParameter) (*model.PostSearchResults, *model.AppError) + SearchPostsInTeamForUser(teamID string, userID string, searchParams model.SearchParameter) (*model.PostSearchResults, *model.AppError) // AddChannelMember joins a user to a channel (as if they joined themselves) // This means the user will not receive notifications for joining the channel. @@ -469,7 +469,7 @@ type API interface { // @tag Channel // @tag User // Minimum server version: 5.2 - AddChannelMember(channelId, userId string) (*model.ChannelMember, *model.AppError) + AddChannelMember(channelId, userID string) (*model.ChannelMember, *model.AppError) // AddUserToChannel adds a user to a channel as if the specified user had invited them. // This means the user will receive the regular notifications for being added to the channel. @@ -477,14 +477,14 @@ type API interface { // @tag User // @tag Channel // Minimum server version: 5.18 - AddUserToChannel(channelId, userId, asUserId string) (*model.ChannelMember, *model.AppError) + AddUserToChannel(channelId, userID, asUserId string) (*model.ChannelMember, *model.AppError) // GetChannelMember gets a channel membership for a user. // // @tag Channel // @tag User // Minimum server version: 5.2 - GetChannelMember(channelId, userId string) (*model.ChannelMember, *model.AppError) + GetChannelMember(channelId, userID string) (*model.ChannelMember, *model.AppError) // GetChannelMembers gets a channel membership for all users. // @@ -505,21 +505,21 @@ type API interface { // @tag Channel // @tag User // Minimum server version: 5.10 - GetChannelMembersForUser(teamId, userId string, page, perPage int) ([]*model.ChannelMember, *model.AppError) + GetChannelMembersForUser(teamID, userID string, page, perPage int) ([]*model.ChannelMember, *model.AppError) // UpdateChannelMemberRoles updates a user's roles for a channel. // // @tag Channel // @tag User // Minimum server version: 5.2 - UpdateChannelMemberRoles(channelId, userId, newRoles string) (*model.ChannelMember, *model.AppError) + UpdateChannelMemberRoles(channelId, userID, newRoles string) (*model.ChannelMember, *model.AppError) // UpdateChannelMemberNotifications updates a user's notification properties for a channel. // // @tag Channel // @tag User // Minimum server version: 5.2 - UpdateChannelMemberNotifications(channelId, userId string, notifications map[string]string) (*model.ChannelMember, *model.AppError) + UpdateChannelMemberNotifications(channelId, userID string, notifications map[string]string) (*model.ChannelMember, *model.AppError) // GetGroup gets a group by ID. // @@ -538,14 +538,14 @@ type API interface { // @tag Group // @tag User // Minimum server version: 5.18 - GetGroupsForUser(userId string) ([]*model.Group, *model.AppError) + GetGroupsForUser(userID string) ([]*model.Group, *model.AppError) // DeleteChannelMember deletes a channel membership for a user. // // @tag Channel // @tag User // Minimum server version: 5.2 - DeleteChannelMember(channelId, userId string) *model.AppError + DeleteChannelMember(channelId, userID string) *model.AppError // CreatePost creates a post. // @@ -575,21 +575,21 @@ type API interface { // // @tag Post // Minimum server version: 5.2 - SendEphemeralPost(userId string, post *model.Post) *model.Post + SendEphemeralPost(userID string, post *model.Post) *model.Post // UpdateEphemeralPost updates an ephemeral message previously sent to the user. // EXPERIMENTAL: This API is experimental and can be changed without advance notice. // // @tag Post // Minimum server version: 5.2 - UpdateEphemeralPost(userId string, post *model.Post) *model.Post + UpdateEphemeralPost(userID string, post *model.Post) *model.Post // DeleteEphemeralPost deletes an ephemeral message previously sent to the user. // EXPERIMENTAL: This API is experimental and can be changed without advance notice. // // @tag Post // Minimum server version: 5.2 - DeleteEphemeralPost(userId, postId string) + DeleteEphemeralPost(userID, postId string) // DeletePost deletes a post. // @@ -641,7 +641,7 @@ type API interface { // // @tag Team // Minimum server version: 5.8 - GetTeamStats(teamId string) (*model.TeamStats, *model.AppError) + GetTeamStats(teamID string) (*model.TeamStats, *model.AppError) // UpdatePost updates a post. // @@ -653,13 +653,13 @@ type API interface { // // @tag User // Minimum server version: 5.6 - GetProfileImage(userId string) ([]byte, *model.AppError) + GetProfileImage(userID string) ([]byte, *model.AppError) // SetProfileImage sets a user's profile image. // // @tag User // Minimum server version: 5.6 - SetProfileImage(userId string, data []byte) *model.AppError + SetProfileImage(userID string, data []byte) *model.AppError // GetEmojiList returns a page of custom emoji on the system. // @@ -691,7 +691,7 @@ type API interface { // @tag File // @tag User // Minimum server version: 5.2 - CopyFileInfos(userId string, fileIds []string) ([]string, *model.AppError) + CopyFileInfos(userID string, fileIds []string) ([]string, *model.AppError) // GetFileInfo gets a File Info for a specific fileId // @@ -860,21 +860,21 @@ type API interface { // // @tag User // Minimum server version: 5.3 - HasPermissionTo(userId string, permission *model.Permission) bool + HasPermissionTo(userID string, permission *model.Permission) bool // HasPermissionToTeam check if the user has the permission at team scope. // // @tag User // @tag Team // Minimum server version: 5.3 - HasPermissionToTeam(userId, teamId string, permission *model.Permission) bool + HasPermissionToTeam(userID, teamID string, permission *model.Permission) bool // HasPermissionToChannel check if the user has the permission at channel scope. // // @tag User // @tag Channel // Minimum server version: 5.3 - HasPermissionToChannel(userId, channelId string, permission *model.Permission) bool + HasPermissionToChannel(userID, channelId string, permission *model.Permission) bool // LogDebug writes a log message to the Mattermost server log file. // Appropriate context such as the plugin name will already be added as fields so plugins @@ -978,7 +978,7 @@ type API interface { // // @tag User // Minimum server version: 5.26 - PublishUserTyping(userId, channelId, parentId string) *model.AppError + PublishUserTyping(userID, channelId, parentId string) *model.AppError // CreateCommand creates a server-owned slash command that is not handled by the plugin // itself, and which will persist past the life of the plugin. The command will have its diff --git a/services/httpservice/client_test.go b/services/httpservice/client_test.go index 8b72764918..a57e5134ad 100644 --- a/services/httpservice/client_test.go +++ b/services/httpservice/client_test.go @@ -67,7 +67,7 @@ func TestHTTPClient(t *testing.T) { testCases := []struct { description string allowHost func(string) bool - allowIp func(net.IP) bool + allowIP func(net.IP) bool expectedAllowed bool }{ {"allow with no checks", nil, nil, true}, @@ -84,7 +84,7 @@ func TestHTTPClient(t *testing.T) { } for _, testCase := range testCases { t.Run(testCase.description, func(t *testing.T) { - c := NewHTTPClient(NewTransport(false, testCase.allowHost, testCase.allowIp)) + c := NewHTTPClient(NewTransport(false, testCase.allowHost, testCase.allowIP)) if _, err := c.Get(mockHTTP.URL); testCase.expectedAllowed { require.NoError(t, err) } else { diff --git a/services/imageproxy/imageproxy.go b/services/imageproxy/imageproxy.go index 98313b7482..87dccf15db 100644 --- a/services/imageproxy/imageproxy.go +++ b/services/imageproxy/imageproxy.go @@ -23,7 +23,7 @@ var ErrNotEnabled = Error{errors.New("imageproxy.ImageProxy: image proxy not ena // using MakeImageProxy which requires a configService and an HTTPService provided by the server. type ImageProxy struct { ConfigService configservice.ConfigService - configListenerId string + configListenerID string HTTPService httpservice.HTTPService @@ -56,7 +56,7 @@ func MakeImageProxy(configService configservice.ConfigService, httpService https siteURL, _ := url.Parse(*configService.Config().ServiceSettings.SiteURL) proxy.siteURL = siteURL - proxy.configListenerId = proxy.ConfigService.AddConfigListener(proxy.OnConfigChange) + proxy.configListenerID = proxy.ConfigService.AddConfigListener(proxy.OnConfigChange) config := proxy.ConfigService.Config() proxy.backend = proxy.makeBackend(*config.ImageProxySettings.Enable, *config.ImageProxySettings.ImageProxyType) @@ -83,7 +83,7 @@ func (proxy *ImageProxy) Close() { proxy.lock.Lock() defer proxy.lock.Unlock() - proxy.ConfigService.RemoveConfigListener(proxy.configListenerId) + proxy.ConfigService.RemoveConfigListener(proxy.configListenerID) } func (proxy *ImageProxy) OnConfigChange(oldConfig, newConfig *model.Config) { diff --git a/services/marketplace/client.go b/services/marketplace/client.go index a2bc6faccb..7a0263e0cf 100644 --- a/services/marketplace/client.go +++ b/services/marketplace/client.go @@ -26,11 +26,11 @@ type Client struct { // NewClient creates a client to the marketplace server at the given address. func NewClient(address string, httpService httpservice.HTTPService) (*Client, error) { var httpClient *http.Client - addressUrl, err := url.Parse(address) + addressURL, err := url.Parse(address) if err != nil { return nil, errors.Wrap(err, "failed to parse marketplace address") } - if addressUrl.Hostname() == "localhost" || addressUrl.Hostname() == "127.0.0.1" { + if addressURL.Hostname() == "localhost" || addressURL.Hostname() == "127.0.0.1" { httpClient = httpService.MakeClient(true) } else { httpClient = httpService.MakeClient(false) diff --git a/store/opentracinglayer/opentracinglayer.go b/store/opentracinglayer/opentracinglayer.go index e13949ff3e..31565c12a8 100644 --- a/store/opentracinglayer/opentracinglayer.go +++ b/store/opentracinglayer/opentracinglayer.go @@ -398,7 +398,7 @@ func (s *OpenTracingLayerAuditStore) Get(user_id string, offset int, limit int) return result, err } -func (s *OpenTracingLayerAuditStore) PermanentDeleteByUser(userId string) error { +func (s *OpenTracingLayerAuditStore) PermanentDeleteByUser(userID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "AuditStore.PermanentDeleteByUser") s.Root.Store.SetContext(newCtx) @@ -407,7 +407,7 @@ func (s *OpenTracingLayerAuditStore) PermanentDeleteByUser(userId string) error }() defer span.Finish() - err := s.AuditStore.PermanentDeleteByUser(userId) + err := s.AuditStore.PermanentDeleteByUser(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -434,7 +434,7 @@ func (s *OpenTracingLayerAuditStore) Save(audit *model.Audit) error { return err } -func (s *OpenTracingLayerBotStore) Get(userId string, includeDeleted bool) (*model.Bot, error) { +func (s *OpenTracingLayerBotStore) Get(userID string, includeDeleted bool) (*model.Bot, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "BotStore.Get") s.Root.Store.SetContext(newCtx) @@ -443,7 +443,7 @@ func (s *OpenTracingLayerBotStore) Get(userId string, includeDeleted bool) (*mod }() defer span.Finish() - result, err := s.BotStore.Get(userId, includeDeleted) + result, err := s.BotStore.Get(userID, includeDeleted) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -470,7 +470,7 @@ func (s *OpenTracingLayerBotStore) GetAll(options *model.BotGetOptions) ([]*mode return result, err } -func (s *OpenTracingLayerBotStore) PermanentDelete(userId string) error { +func (s *OpenTracingLayerBotStore) PermanentDelete(userID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "BotStore.PermanentDelete") s.Root.Store.SetContext(newCtx) @@ -479,7 +479,7 @@ func (s *OpenTracingLayerBotStore) PermanentDelete(userId string) error { }() defer span.Finish() - err := s.BotStore.PermanentDelete(userId) + err := s.BotStore.PermanentDelete(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -578,7 +578,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) @@ -587,7 +587,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) @@ -627,7 +627,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) @@ -636,7 +636,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) @@ -645,7 +645,7 @@ func (s *OpenTracingLayerChannelStore) ClearSidebarOnTeamLeave(userId string, te return err } -func (s *OpenTracingLayerChannelStore) CountPostsAfter(channelID string, timestamp int64, userId string) (int, int, error) { +func (s *OpenTracingLayerChannelStore) CountPostsAfter(channelID string, timestamp int64, userID string) (int, int, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.CountPostsAfter") s.Root.Store.SetContext(newCtx) @@ -654,7 +654,7 @@ func (s *OpenTracingLayerChannelStore) CountPostsAfter(channelID string, timesta }() defer span.Finish() - result, resultVar1, err := s.ChannelStore.CountPostsAfter(channelID, timestamp, userId) + result, resultVar1, err := s.ChannelStore.CountPostsAfter(channelID, timestamp, userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -663,7 +663,7 @@ func (s *OpenTracingLayerChannelStore) CountPostsAfter(channelID string, timesta return result, resultVar1, err } -func (s *OpenTracingLayerChannelStore) CreateDirectChannel(userId *model.User, otherUserId *model.User, channelOptions ...model.ChannelOption) (*model.Channel, error) { +func (s *OpenTracingLayerChannelStore) CreateDirectChannel(userID *model.User, otherUserID *model.User, channelOptions ...model.ChannelOption) (*model.Channel, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.CreateDirectChannel") s.Root.Store.SetContext(newCtx) @@ -672,7 +672,7 @@ func (s *OpenTracingLayerChannelStore) CreateDirectChannel(userId *model.User, o }() defer span.Finish() - result, err := s.ChannelStore.CreateDirectChannel(userId, otherUserId, channelOptions...) + result, err := s.ChannelStore.CreateDirectChannel(userID, otherUserID, channelOptions...) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -681,7 +681,7 @@ func (s *OpenTracingLayerChannelStore) CreateDirectChannel(userId *model.User, o return result, err } -func (s *OpenTracingLayerChannelStore) CreateInitialSidebarCategories(userId string, teamID string) (*model.OrderedSidebarCategories, error) { +func (s *OpenTracingLayerChannelStore) CreateInitialSidebarCategories(userID string, teamID string) (*model.OrderedSidebarCategories, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.CreateInitialSidebarCategories") s.Root.Store.SetContext(newCtx) @@ -690,7 +690,7 @@ func (s *OpenTracingLayerChannelStore) CreateInitialSidebarCategories(userId str }() defer span.Finish() - result, err := s.ChannelStore.CreateInitialSidebarCategories(userId, teamID) + result, err := s.ChannelStore.CreateInitialSidebarCategories(userID, teamID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -699,7 +699,7 @@ func (s *OpenTracingLayerChannelStore) CreateInitialSidebarCategories(userId str return result, 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) @@ -708,7 +708,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) @@ -807,7 +807,7 @@ func (s *OpenTracingLayerChannelStore) GetAll(teamID string) ([]*model.Channel, return result, err } -func (s *OpenTracingLayerChannelStore) GetAllChannelMembersForUser(userId string, allowFromCache bool, includeDeleted bool) (map[string]string, error) { +func (s *OpenTracingLayerChannelStore) GetAllChannelMembersForUser(userID string, allowFromCache bool, includeDeleted bool) (map[string]string, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetAllChannelMembersForUser") s.Root.Store.SetContext(newCtx) @@ -816,7 +816,7 @@ func (s *OpenTracingLayerChannelStore) GetAllChannelMembersForUser(userId string }() defer span.Finish() - result, err := s.ChannelStore.GetAllChannelMembersForUser(userId, allowFromCache, includeDeleted) + result, err := s.ChannelStore.GetAllChannelMembersForUser(userID, allowFromCache, includeDeleted) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -969,7 +969,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) @@ -978,7 +978,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) @@ -987,7 +987,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) @@ -996,7 +996,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) @@ -1023,7 +1023,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) @@ -1032,7 +1032,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) @@ -1041,7 +1041,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) @@ -1050,7 +1050,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) @@ -1113,7 +1113,7 @@ func (s *OpenTracingLayerChannelStore) GetChannelsByScheme(schemeID string, offs return result, err } -func (s *OpenTracingLayerChannelStore) GetDeleted(team_id string, offset int, limit int, userId string) (*model.ChannelList, error) { +func (s *OpenTracingLayerChannelStore) GetDeleted(team_id string, offset int, limit int, userID string) (*model.ChannelList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetDeleted") s.Root.Store.SetContext(newCtx) @@ -1122,7 +1122,7 @@ func (s *OpenTracingLayerChannelStore) GetDeleted(team_id string, offset int, li }() defer span.Finish() - result, err := s.ChannelStore.GetDeleted(team_id, offset, limit, userId) + result, err := s.ChannelStore.GetDeleted(team_id, offset, limit, userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1203,7 +1203,7 @@ func (s *OpenTracingLayerChannelStore) GetGuestCount(channelID string, allowFrom return result, err } -func (s *OpenTracingLayerChannelStore) GetMember(ctx context.Context, channelID string, userId string) (*model.ChannelMember, error) { +func (s *OpenTracingLayerChannelStore) GetMember(ctx context.Context, 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) @@ -1212,7 +1212,7 @@ func (s *OpenTracingLayerChannelStore) GetMember(ctx context.Context, channelID }() defer span.Finish() - result, err := s.ChannelStore.GetMember(ctx, channelID, userId) + result, err := s.ChannelStore.GetMember(ctx, channelID, userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1270,7 +1270,7 @@ func (s *OpenTracingLayerChannelStore) GetMemberCountsByGroup(ctx context.Contex 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) @@ -1279,7 +1279,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) @@ -1306,7 +1306,7 @@ func (s *OpenTracingLayerChannelStore) GetMembers(channelID string, offset int, return result, err } -func (s *OpenTracingLayerChannelStore) GetMembersByChannelIds(channelIds []string, userId string) (*model.ChannelMembers, error) { +func (s *OpenTracingLayerChannelStore) GetMembersByChannelIds(channelIds []string, userID string) (*model.ChannelMembers, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.GetMembersByChannelIds") s.Root.Store.SetContext(newCtx) @@ -1315,7 +1315,7 @@ func (s *OpenTracingLayerChannelStore) GetMembersByChannelIds(channelIds []strin }() defer span.Finish() - result, err := s.ChannelStore.GetMembersByChannelIds(channelIds, userId) + result, err := s.ChannelStore.GetMembersByChannelIds(channelIds, userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1342,7 +1342,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) @@ -1351,7 +1351,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) @@ -1360,7 +1360,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) @@ -1369,7 +1369,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) @@ -1378,7 +1378,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) @@ -1387,7 +1387,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) @@ -1486,7 +1486,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) @@ -1495,7 +1495,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) @@ -1522,7 +1522,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) @@ -1531,7 +1531,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) @@ -1594,7 +1594,7 @@ func (s *OpenTracingLayerChannelStore) GroupSyncedChannelCount() (int64, error) return result, err } -func (s *OpenTracingLayerChannelStore) IncrementMentionCount(channelID string, userId string, updateThreads bool, isRoot bool) error { +func (s *OpenTracingLayerChannelStore) IncrementMentionCount(channelID string, userID string, updateThreads bool, isRoot bool) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.IncrementMentionCount") s.Root.Store.SetContext(newCtx) @@ -1603,7 +1603,7 @@ func (s *OpenTracingLayerChannelStore) IncrementMentionCount(channelID string, u }() defer span.Finish() - err := s.ChannelStore.IncrementMentionCount(channelID, userId, updateThreads, isRoot) + err := s.ChannelStore.IncrementMentionCount(channelID, userID, updateThreads, isRoot) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1612,7 +1612,7 @@ func (s *OpenTracingLayerChannelStore) IncrementMentionCount(channelID string, u return err } -func (s *OpenTracingLayerChannelStore) InvalidateAllChannelMembersForUser(userId string) { +func (s *OpenTracingLayerChannelStore) InvalidateAllChannelMembersForUser(userID string) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.InvalidateAllChannelMembersForUser") s.Root.Store.SetContext(newCtx) @@ -1621,7 +1621,7 @@ func (s *OpenTracingLayerChannelStore) InvalidateAllChannelMembersForUser(userId }() defer span.Finish() - s.ChannelStore.InvalidateAllChannelMembersForUser(userId) + s.ChannelStore.InvalidateAllChannelMembersForUser(userID) } @@ -1703,7 +1703,7 @@ func (s *OpenTracingLayerChannelStore) InvalidatePinnedPostCount(channelID strin } -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) @@ -1712,11 +1712,11 @@ func (s *OpenTracingLayerChannelStore) IsUserInChannelUseCache(userId string, ch }() defer span.Finish() - result := s.ChannelStore.IsUserInChannelUseCache(userId, channelID) + result := s.ChannelStore.IsUserInChannelUseCache(userID, channelID) return result } -func (s *OpenTracingLayerChannelStore) MigrateChannelMembers(fromChannelId string, fromUserId string) (map[string]string, error) { +func (s *OpenTracingLayerChannelStore) MigrateChannelMembers(fromChannelID string, fromUserID string) (map[string]string, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.MigrateChannelMembers") s.Root.Store.SetContext(newCtx) @@ -1725,7 +1725,7 @@ func (s *OpenTracingLayerChannelStore) MigrateChannelMembers(fromChannelId strin }() defer span.Finish() - result, err := s.ChannelStore.MigrateChannelMembers(fromChannelId, fromUserId) + result, err := s.ChannelStore.MigrateChannelMembers(fromChannelID, fromUserID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1806,7 +1806,7 @@ func (s *OpenTracingLayerChannelStore) PermanentDeleteMembersByChannel(channelID return err } -func (s *OpenTracingLayerChannelStore) PermanentDeleteMembersByUser(userId string) error { +func (s *OpenTracingLayerChannelStore) PermanentDeleteMembersByUser(userID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.PermanentDeleteMembersByUser") s.Root.Store.SetContext(newCtx) @@ -1815,7 +1815,7 @@ func (s *OpenTracingLayerChannelStore) PermanentDeleteMembersByUser(userId strin }() defer span.Finish() - err := s.ChannelStore.PermanentDeleteMembersByUser(userId) + err := s.ChannelStore.PermanentDeleteMembersByUser(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -1842,7 +1842,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) @@ -1851,7 +1851,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) @@ -2004,7 +2004,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) @@ -2013,7 +2013,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) @@ -2022,7 +2022,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) @@ -2031,7 +2031,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) @@ -2040,7 +2040,7 @@ func (s *OpenTracingLayerChannelStore) SearchForUserInTeam(userId string, teamID return result, err } -func (s *OpenTracingLayerChannelStore) SearchGroupChannels(userId string, term string) (*model.ChannelList, error) { +func (s *OpenTracingLayerChannelStore) SearchGroupChannels(userID string, term string) (*model.ChannelList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.SearchGroupChannels") s.Root.Store.SetContext(newCtx) @@ -2049,7 +2049,7 @@ func (s *OpenTracingLayerChannelStore) SearchGroupChannels(userId string, term s }() defer span.Finish() - result, err := s.ChannelStore.SearchGroupChannels(userId, term) + result, err := s.ChannelStore.SearchGroupChannels(userID, term) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2076,7 +2076,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) @@ -2085,7 +2085,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) @@ -2148,7 +2148,7 @@ func (s *OpenTracingLayerChannelStore) Update(channel *model.Channel) (*model.Ch return result, err } -func (s *OpenTracingLayerChannelStore) UpdateLastViewedAt(channelIds []string, userId string, updateThreads bool) (map[string]int64, error) { +func (s *OpenTracingLayerChannelStore) UpdateLastViewedAt(channelIds []string, userID string, updateThreads bool) (map[string]int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.UpdateLastViewedAt") s.Root.Store.SetContext(newCtx) @@ -2157,7 +2157,7 @@ func (s *OpenTracingLayerChannelStore) UpdateLastViewedAt(channelIds []string, u }() defer span.Finish() - result, err := s.ChannelStore.UpdateLastViewedAt(channelIds, userId, updateThreads) + result, err := s.ChannelStore.UpdateLastViewedAt(channelIds, userID, updateThreads) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2238,7 +2238,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) @@ -2247,7 +2247,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) @@ -2256,7 +2256,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) @@ -2265,7 +2265,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) @@ -2310,7 +2310,7 @@ func (s *OpenTracingLayerChannelStore) UpdateSidebarChannelsByPreferences(prefer return err } -func (s *OpenTracingLayerChannelStore) UserBelongsToChannels(userId string, channelIds []string) (bool, error) { +func (s *OpenTracingLayerChannelStore) UserBelongsToChannels(userID string, channelIds []string) (bool, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ChannelStore.UserBelongsToChannels") s.Root.Store.SetContext(newCtx) @@ -2319,7 +2319,7 @@ func (s *OpenTracingLayerChannelStore) UserBelongsToChannels(userId string, chan }() defer span.Finish() - result, err := s.ChannelStore.UserBelongsToChannels(userId, channelIds) + result, err := s.ChannelStore.UserBelongsToChannels(userID, channelIds) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2346,7 +2346,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) @@ -2355,7 +2355,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) @@ -2364,7 +2364,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) @@ -2373,7 +2373,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) @@ -2616,7 +2616,7 @@ func (s *OpenTracingLayerCommandStore) PermanentDeleteByTeam(teamID string) erro return err } -func (s *OpenTracingLayerCommandStore) PermanentDeleteByUser(userId string) error { +func (s *OpenTracingLayerCommandStore) PermanentDeleteByUser(userID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "CommandStore.PermanentDeleteByUser") s.Root.Store.SetContext(newCtx) @@ -2625,7 +2625,7 @@ func (s *OpenTracingLayerCommandStore) PermanentDeleteByUser(userId string) erro }() defer span.Finish() - err := s.CommandStore.PermanentDeleteByUser(userId) + err := s.CommandStore.PermanentDeleteByUser(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -2971,7 +2971,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) @@ -2980,7 +2980,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) @@ -3128,7 +3128,7 @@ func (s *OpenTracingLayerFileInfoStore) GetForPost(postID string, readFromMaster return result, err } -func (s *OpenTracingLayerFileInfoStore) GetForUser(userId string) ([]*model.FileInfo, error) { +func (s *OpenTracingLayerFileInfoStore) GetForUser(userID string) ([]*model.FileInfo, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "FileInfoStore.GetForUser") s.Root.Store.SetContext(newCtx) @@ -3137,7 +3137,7 @@ func (s *OpenTracingLayerFileInfoStore) GetForUser(userId string) ([]*model.File }() defer span.Finish() - result, err := s.FileInfoStore.GetForUser(userId) + result, err := s.FileInfoStore.GetForUser(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -3213,7 +3213,7 @@ func (s *OpenTracingLayerFileInfoStore) PermanentDeleteBatch(endTime int64, limi return result, err } -func (s *OpenTracingLayerFileInfoStore) PermanentDeleteByUser(userId string) (int64, error) { +func (s *OpenTracingLayerFileInfoStore) PermanentDeleteByUser(userID string) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "FileInfoStore.PermanentDeleteByUser") s.Root.Store.SetContext(newCtx) @@ -3222,7 +3222,7 @@ func (s *OpenTracingLayerFileInfoStore) PermanentDeleteByUser(userId string) (in }() defer span.Finish() - result, err := s.FileInfoStore.PermanentDeleteByUser(userId) + result, err := s.FileInfoStore.PermanentDeleteByUser(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -3249,7 +3249,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) @@ -3258,7 +3258,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) @@ -3663,7 +3663,7 @@ func (s *OpenTracingLayerGroupStore) GetByRemoteID(remoteID string, groupSource return result, err } -func (s *OpenTracingLayerGroupStore) GetByUser(userId string) ([]*model.Group, error) { +func (s *OpenTracingLayerGroupStore) GetByUser(userID string) ([]*model.Group, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "GroupStore.GetByUser") s.Root.Store.SetContext(newCtx) @@ -3672,7 +3672,7 @@ func (s *OpenTracingLayerGroupStore) GetByUser(userId string) ([]*model.Group, e }() defer span.Finish() - result, err := s.GroupStore.GetByUser(userId) + result, err := s.GroupStore.GetByUser(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -3951,7 +3951,7 @@ func (s *OpenTracingLayerGroupStore) GroupTeamCount() (int64, error) { return result, err } -func (s *OpenTracingLayerGroupStore) PermanentDeleteMembersByUser(userId string) error { +func (s *OpenTracingLayerGroupStore) PermanentDeleteMembersByUser(userID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "GroupStore.PermanentDeleteMembersByUser") s.Root.Store.SetContext(newCtx) @@ -3960,7 +3960,7 @@ func (s *OpenTracingLayerGroupStore) PermanentDeleteMembersByUser(userId string) }() defer span.Finish() - err := s.GroupStore.PermanentDeleteMembersByUser(userId) + err := s.GroupStore.PermanentDeleteMembersByUser(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -4455,7 +4455,7 @@ func (s *OpenTracingLayerOAuthStore) GetAccessDataByRefreshToken(token string) ( return result, err } -func (s *OpenTracingLayerOAuthStore) GetAccessDataByUserForApp(userId string, clientId string) ([]*model.AccessData, error) { +func (s *OpenTracingLayerOAuthStore) GetAccessDataByUserForApp(userID string, clientId string) ([]*model.AccessData, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "OAuthStore.GetAccessDataByUserForApp") s.Root.Store.SetContext(newCtx) @@ -4464,7 +4464,7 @@ func (s *OpenTracingLayerOAuthStore) GetAccessDataByUserForApp(userId string, cl }() defer span.Finish() - result, err := s.OAuthStore.GetAccessDataByUserForApp(userId, clientId) + result, err := s.OAuthStore.GetAccessDataByUserForApp(userID, clientId) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -4491,7 +4491,7 @@ func (s *OpenTracingLayerOAuthStore) GetApp(id string) (*model.OAuthApp, error) return result, err } -func (s *OpenTracingLayerOAuthStore) GetAppByUser(userId string, offset int, limit int) ([]*model.OAuthApp, error) { +func (s *OpenTracingLayerOAuthStore) GetAppByUser(userID string, offset int, limit int) ([]*model.OAuthApp, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "OAuthStore.GetAppByUser") s.Root.Store.SetContext(newCtx) @@ -4500,7 +4500,7 @@ func (s *OpenTracingLayerOAuthStore) GetAppByUser(userId string, offset int, lim }() defer span.Finish() - result, err := s.OAuthStore.GetAppByUser(userId, offset, limit) + result, err := s.OAuthStore.GetAppByUser(userID, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -4545,7 +4545,7 @@ func (s *OpenTracingLayerOAuthStore) GetAuthData(code string) (*model.AuthData, return result, err } -func (s *OpenTracingLayerOAuthStore) GetAuthorizedApps(userId string, offset int, limit int) ([]*model.OAuthApp, error) { +func (s *OpenTracingLayerOAuthStore) GetAuthorizedApps(userID string, offset int, limit int) ([]*model.OAuthApp, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "OAuthStore.GetAuthorizedApps") s.Root.Store.SetContext(newCtx) @@ -4554,7 +4554,7 @@ func (s *OpenTracingLayerOAuthStore) GetAuthorizedApps(userId string, offset int }() defer span.Finish() - result, err := s.OAuthStore.GetAuthorizedApps(userId, offset, limit) + result, err := s.OAuthStore.GetAuthorizedApps(userID, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -4563,7 +4563,7 @@ func (s *OpenTracingLayerOAuthStore) GetAuthorizedApps(userId string, offset int return result, err } -func (s *OpenTracingLayerOAuthStore) GetPreviousAccessData(userId string, clientId string) (*model.AccessData, error) { +func (s *OpenTracingLayerOAuthStore) GetPreviousAccessData(userID string, clientId string) (*model.AccessData, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "OAuthStore.GetPreviousAccessData") s.Root.Store.SetContext(newCtx) @@ -4572,7 +4572,7 @@ func (s *OpenTracingLayerOAuthStore) GetPreviousAccessData(userId string, client }() defer span.Finish() - result, err := s.OAuthStore.GetPreviousAccessData(userId, clientId) + result, err := s.OAuthStore.GetPreviousAccessData(userID, clientId) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -4581,7 +4581,7 @@ func (s *OpenTracingLayerOAuthStore) GetPreviousAccessData(userId string, client return result, err } -func (s *OpenTracingLayerOAuthStore) PermanentDeleteAuthDataByUser(userId string) error { +func (s *OpenTracingLayerOAuthStore) PermanentDeleteAuthDataByUser(userID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "OAuthStore.PermanentDeleteAuthDataByUser") s.Root.Store.SetContext(newCtx) @@ -4590,7 +4590,7 @@ func (s *OpenTracingLayerOAuthStore) PermanentDeleteAuthDataByUser(userId string }() defer span.Finish() - err := s.OAuthStore.PermanentDeleteAuthDataByUser(userId) + err := s.OAuthStore.PermanentDeleteAuthDataByUser(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5039,7 +5039,7 @@ func (s *OpenTracingLayerPostStore) GetEtag(channelID string, allowFromCache boo return result } -func (s *OpenTracingLayerPostStore) GetFlaggedPosts(userId string, offset int, limit int) (*model.PostList, error) { +func (s *OpenTracingLayerPostStore) GetFlaggedPosts(userID string, offset int, limit int) (*model.PostList, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.GetFlaggedPosts") s.Root.Store.SetContext(newCtx) @@ -5048,7 +5048,7 @@ func (s *OpenTracingLayerPostStore) GetFlaggedPosts(userId string, offset int, l }() defer span.Finish() - result, err := s.PostStore.GetFlaggedPosts(userId, offset, limit) + result, err := s.PostStore.GetFlaggedPosts(userID, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5057,7 +5057,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) @@ -5066,7 +5066,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) @@ -5075,7 +5075,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) @@ -5083,7 +5083,7 @@ func (s *OpenTracingLayerPostStore) GetFlaggedPostsForTeam(userId string, teamID s.Root.Store.SetContext(origCtx) }() - span.SetTag("userId", userId) + span.SetTag("userID", userID) span.SetTag("teamID", teamID) @@ -5092,7 +5092,7 @@ func (s *OpenTracingLayerPostStore) GetFlaggedPostsForTeam(userId string, teamID 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) @@ -5487,7 +5487,7 @@ func (s *OpenTracingLayerPostStore) PermanentDeleteByChannel(channelID string) e return err } -func (s *OpenTracingLayerPostStore) PermanentDeleteByUser(userId string) error { +func (s *OpenTracingLayerPostStore) PermanentDeleteByUser(userID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PostStore.PermanentDeleteByUser") s.Root.Store.SetContext(newCtx) @@ -5496,7 +5496,7 @@ func (s *OpenTracingLayerPostStore) PermanentDeleteByUser(userId string) error { }() defer span.Finish() - err := s.PostStore.PermanentDeleteByUser(userId) + err := s.PostStore.PermanentDeleteByUser(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5541,7 +5541,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) @@ -5550,7 +5550,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) @@ -5559,7 +5559,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) @@ -5568,7 +5568,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) @@ -5613,7 +5613,7 @@ func (s *OpenTracingLayerPreferenceStore) CleanupFlagsBatch(limit int64) (int64, return result, err } -func (s *OpenTracingLayerPreferenceStore) Delete(userId string, category string, name string) error { +func (s *OpenTracingLayerPreferenceStore) Delete(userID string, category string, name string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PreferenceStore.Delete") s.Root.Store.SetContext(newCtx) @@ -5622,7 +5622,7 @@ func (s *OpenTracingLayerPreferenceStore) Delete(userId string, category string, }() defer span.Finish() - err := s.PreferenceStore.Delete(userId, category, name) + err := s.PreferenceStore.Delete(userID, category, name) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5631,7 +5631,7 @@ func (s *OpenTracingLayerPreferenceStore) Delete(userId string, category string, return err } -func (s *OpenTracingLayerPreferenceStore) DeleteCategory(userId string, category string) error { +func (s *OpenTracingLayerPreferenceStore) DeleteCategory(userID string, category string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PreferenceStore.DeleteCategory") s.Root.Store.SetContext(newCtx) @@ -5640,7 +5640,7 @@ func (s *OpenTracingLayerPreferenceStore) DeleteCategory(userId string, category }() defer span.Finish() - err := s.PreferenceStore.DeleteCategory(userId, category) + err := s.PreferenceStore.DeleteCategory(userID, category) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5667,7 +5667,7 @@ func (s *OpenTracingLayerPreferenceStore) DeleteCategoryAndName(category string, return err } -func (s *OpenTracingLayerPreferenceStore) Get(userId string, category string, name string) (*model.Preference, error) { +func (s *OpenTracingLayerPreferenceStore) Get(userID string, category string, name string) (*model.Preference, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PreferenceStore.Get") s.Root.Store.SetContext(newCtx) @@ -5676,7 +5676,7 @@ func (s *OpenTracingLayerPreferenceStore) Get(userId string, category string, na }() defer span.Finish() - result, err := s.PreferenceStore.Get(userId, category, name) + result, err := s.PreferenceStore.Get(userID, category, name) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5685,7 +5685,7 @@ func (s *OpenTracingLayerPreferenceStore) Get(userId string, category string, na return result, err } -func (s *OpenTracingLayerPreferenceStore) GetAll(userId string) (model.Preferences, error) { +func (s *OpenTracingLayerPreferenceStore) GetAll(userID string) (model.Preferences, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PreferenceStore.GetAll") s.Root.Store.SetContext(newCtx) @@ -5694,7 +5694,7 @@ func (s *OpenTracingLayerPreferenceStore) GetAll(userId string) (model.Preferenc }() defer span.Finish() - result, err := s.PreferenceStore.GetAll(userId) + result, err := s.PreferenceStore.GetAll(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5703,7 +5703,7 @@ func (s *OpenTracingLayerPreferenceStore) GetAll(userId string) (model.Preferenc return result, err } -func (s *OpenTracingLayerPreferenceStore) GetCategory(userId string, category string) (model.Preferences, error) { +func (s *OpenTracingLayerPreferenceStore) GetCategory(userID string, category string) (model.Preferences, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PreferenceStore.GetCategory") s.Root.Store.SetContext(newCtx) @@ -5712,7 +5712,7 @@ func (s *OpenTracingLayerPreferenceStore) GetCategory(userId string, category st }() defer span.Finish() - result, err := s.PreferenceStore.GetCategory(userId, category) + result, err := s.PreferenceStore.GetCategory(userID, category) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5721,7 +5721,7 @@ func (s *OpenTracingLayerPreferenceStore) GetCategory(userId string, category st return result, err } -func (s *OpenTracingLayerPreferenceStore) PermanentDeleteByUser(userId string) error { +func (s *OpenTracingLayerPreferenceStore) PermanentDeleteByUser(userID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "PreferenceStore.PermanentDeleteByUser") s.Root.Store.SetContext(newCtx) @@ -5730,7 +5730,7 @@ func (s *OpenTracingLayerPreferenceStore) PermanentDeleteByUser(userId string) e }() defer span.Finish() - err := s.PreferenceStore.PermanentDeleteByUser(userId) + err := s.PreferenceStore.PermanentDeleteByUser(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5793,7 +5793,7 @@ func (s *OpenTracingLayerProductNoticesStore) ClearOldNotices(currentNotices *mo return err } -func (s *OpenTracingLayerProductNoticesStore) GetViews(userId string) ([]model.ProductNoticeViewState, error) { +func (s *OpenTracingLayerProductNoticesStore) GetViews(userID string) ([]model.ProductNoticeViewState, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ProductNoticesStore.GetViews") s.Root.Store.SetContext(newCtx) @@ -5802,7 +5802,7 @@ func (s *OpenTracingLayerProductNoticesStore) GetViews(userId string) ([]model.P }() defer span.Finish() - result, err := s.ProductNoticesStore.GetViews(userId) + result, err := s.ProductNoticesStore.GetViews(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -5811,7 +5811,7 @@ func (s *OpenTracingLayerProductNoticesStore) GetViews(userId string) ([]model.P return result, err } -func (s *OpenTracingLayerProductNoticesStore) View(userId string, notices []string) error { +func (s *OpenTracingLayerProductNoticesStore) View(userID string, notices []string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ProductNoticesStore.View") s.Root.Store.SetContext(newCtx) @@ -5820,7 +5820,7 @@ func (s *OpenTracingLayerProductNoticesStore) View(userId string, notices []stri }() defer span.Finish() - err := s.ProductNoticesStore.View(userId, notices) + err := s.ProductNoticesStore.View(userID, notices) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -6454,7 +6454,7 @@ func (s *OpenTracingLayerSessionStore) Get(ctx context.Context, sessionIDOrToken return result, err } -func (s *OpenTracingLayerSessionStore) GetSessions(userId string) ([]*model.Session, error) { +func (s *OpenTracingLayerSessionStore) GetSessions(userID string) ([]*model.Session, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "SessionStore.GetSessions") s.Root.Store.SetContext(newCtx) @@ -6463,7 +6463,7 @@ func (s *OpenTracingLayerSessionStore) GetSessions(userId string) ([]*model.Sess }() defer span.Finish() - result, err := s.SessionStore.GetSessions(userId) + result, err := s.SessionStore.GetSessions(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -6490,7 +6490,7 @@ func (s *OpenTracingLayerSessionStore) GetSessionsExpired(thresholdMillis int64, return result, err } -func (s *OpenTracingLayerSessionStore) GetSessionsWithActiveDeviceIds(userId string) ([]*model.Session, error) { +func (s *OpenTracingLayerSessionStore) GetSessionsWithActiveDeviceIds(userID string) ([]*model.Session, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "SessionStore.GetSessionsWithActiveDeviceIds") s.Root.Store.SetContext(newCtx) @@ -6499,7 +6499,7 @@ func (s *OpenTracingLayerSessionStore) GetSessionsWithActiveDeviceIds(userId str }() defer span.Finish() - result, err := s.SessionStore.GetSessionsWithActiveDeviceIds(userId) + result, err := s.SessionStore.GetSessionsWithActiveDeviceIds(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -6670,7 +6670,7 @@ func (s *OpenTracingLayerSessionStore) UpdateProps(session *model.Session) error return err } -func (s *OpenTracingLayerSessionStore) UpdateRoles(userId string, roles string) (string, error) { +func (s *OpenTracingLayerSessionStore) UpdateRoles(userID string, roles string) (string, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "SessionStore.UpdateRoles") s.Root.Store.SetContext(newCtx) @@ -6679,7 +6679,7 @@ func (s *OpenTracingLayerSessionStore) UpdateRoles(userId string, roles string) }() defer span.Finish() - result, err := s.SessionStore.UpdateRoles(userId, roles) + result, err := s.SessionStore.UpdateRoles(userID, roles) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7120,7 +7120,7 @@ func (s *OpenTracingLayerSharedChannelStore) UpsertAttachment(remote *model.Shar return result, err } -func (s *OpenTracingLayerStatusStore) Get(userId string) (*model.Status, error) { +func (s *OpenTracingLayerStatusStore) Get(userID string) (*model.Status, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "StatusStore.Get") s.Root.Store.SetContext(newCtx) @@ -7129,7 +7129,7 @@ func (s *OpenTracingLayerStatusStore) Get(userId string) (*model.Status, error) }() defer span.Finish() - result, err := s.StatusStore.Get(userId) + result, err := s.StatusStore.Get(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7210,7 +7210,7 @@ func (s *OpenTracingLayerStatusStore) SaveOrUpdate(status *model.Status) error { return err } -func (s *OpenTracingLayerStatusStore) UpdateLastActivityAt(userId string, lastActivityAt int64) error { +func (s *OpenTracingLayerStatusStore) UpdateLastActivityAt(userID string, lastActivityAt int64) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "StatusStore.UpdateLastActivityAt") s.Root.Store.SetContext(newCtx) @@ -7219,7 +7219,7 @@ func (s *OpenTracingLayerStatusStore) UpdateLastActivityAt(userId string, lastAc }() defer span.Finish() - err := s.StatusStore.UpdateLastActivityAt(userId, lastActivityAt) + err := s.StatusStore.UpdateLastActivityAt(userID, lastActivityAt) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7709,7 +7709,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) @@ -7718,7 +7718,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) @@ -7727,7 +7727,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) @@ -7736,7 +7736,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) @@ -7745,7 +7745,7 @@ func (s *OpenTracingLayerTeamStore) GetChannelUnreadsForTeam(teamID string, user return result, err } -func (s *OpenTracingLayerTeamStore) GetMember(ctx context.Context, teamID string, userId string) (*model.TeamMember, error) { +func (s *OpenTracingLayerTeamStore) GetMember(ctx context.Context, 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) @@ -7754,7 +7754,7 @@ func (s *OpenTracingLayerTeamStore) GetMember(ctx context.Context, teamID string }() defer span.Finish() - result, err := s.TeamStore.GetMember(ctx, teamID, userId) + result, err := s.TeamStore.GetMember(ctx, teamID, userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7799,7 +7799,7 @@ func (s *OpenTracingLayerTeamStore) GetMembersByIds(teamID string, userIds []str return result, err } -func (s *OpenTracingLayerTeamStore) GetTeamMembersForExport(userId string) ([]*model.TeamMemberForExport, error) { +func (s *OpenTracingLayerTeamStore) GetTeamMembersForExport(userID string) ([]*model.TeamMemberForExport, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.GetTeamMembersForExport") s.Root.Store.SetContext(newCtx) @@ -7808,7 +7808,7 @@ func (s *OpenTracingLayerTeamStore) GetTeamMembersForExport(userId string) ([]*m }() defer span.Finish() - result, err := s.TeamStore.GetTeamMembersForExport(userId) + result, err := s.TeamStore.GetTeamMembersForExport(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7835,7 +7835,7 @@ func (s *OpenTracingLayerTeamStore) GetTeamsByScheme(schemeID string, offset int return result, err } -func (s *OpenTracingLayerTeamStore) GetTeamsByUserId(userId string) ([]*model.Team, error) { +func (s *OpenTracingLayerTeamStore) GetTeamsByUserId(userID string) ([]*model.Team, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.GetTeamsByUserId") s.Root.Store.SetContext(newCtx) @@ -7844,7 +7844,7 @@ func (s *OpenTracingLayerTeamStore) GetTeamsByUserId(userId string) ([]*model.Te }() defer span.Finish() - result, err := s.TeamStore.GetTeamsByUserId(userId) + result, err := s.TeamStore.GetTeamsByUserId(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7853,7 +7853,7 @@ func (s *OpenTracingLayerTeamStore) GetTeamsByUserId(userId string) ([]*model.Te return result, err } -func (s *OpenTracingLayerTeamStore) GetTeamsForUser(ctx context.Context, userId string) ([]*model.TeamMember, error) { +func (s *OpenTracingLayerTeamStore) GetTeamsForUser(ctx context.Context, userID string) ([]*model.TeamMember, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.GetTeamsForUser") s.Root.Store.SetContext(newCtx) @@ -7862,7 +7862,7 @@ func (s *OpenTracingLayerTeamStore) GetTeamsForUser(ctx context.Context, userId }() defer span.Finish() - result, err := s.TeamStore.GetTeamsForUser(ctx, userId) + result, err := s.TeamStore.GetTeamsForUser(ctx, userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7871,7 +7871,7 @@ func (s *OpenTracingLayerTeamStore) GetTeamsForUser(ctx context.Context, userId return result, err } -func (s *OpenTracingLayerTeamStore) GetTeamsForUserWithPagination(userId string, page int, perPage int) ([]*model.TeamMember, error) { +func (s *OpenTracingLayerTeamStore) GetTeamsForUserWithPagination(userID string, page int, perPage int) ([]*model.TeamMember, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.GetTeamsForUserWithPagination") s.Root.Store.SetContext(newCtx) @@ -7880,7 +7880,7 @@ func (s *OpenTracingLayerTeamStore) GetTeamsForUserWithPagination(userId string, }() defer span.Finish() - result, err := s.TeamStore.GetTeamsForUserWithPagination(userId, page, perPage) + result, err := s.TeamStore.GetTeamsForUserWithPagination(userID, page, perPage) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7907,7 +7907,7 @@ func (s *OpenTracingLayerTeamStore) GetTotalMemberCount(teamID string, restricti return result, err } -func (s *OpenTracingLayerTeamStore) GetUserTeamIds(userId string, allowFromCache bool) ([]string, error) { +func (s *OpenTracingLayerTeamStore) GetUserTeamIds(userID string, allowFromCache bool) ([]string, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.GetUserTeamIds") s.Root.Store.SetContext(newCtx) @@ -7916,7 +7916,7 @@ func (s *OpenTracingLayerTeamStore) GetUserTeamIds(userId string, allowFromCache }() defer span.Finish() - result, err := s.TeamStore.GetUserTeamIds(userId, allowFromCache) + result, err := s.TeamStore.GetUserTeamIds(userID, allowFromCache) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -7943,7 +7943,7 @@ func (s *OpenTracingLayerTeamStore) GroupSyncedTeamCount() (int64, error) { return result, err } -func (s *OpenTracingLayerTeamStore) InvalidateAllTeamIdsForUser(userId string) { +func (s *OpenTracingLayerTeamStore) InvalidateAllTeamIdsForUser(userID string) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.InvalidateAllTeamIdsForUser") s.Root.Store.SetContext(newCtx) @@ -7952,11 +7952,11 @@ func (s *OpenTracingLayerTeamStore) InvalidateAllTeamIdsForUser(userId string) { }() defer span.Finish() - s.TeamStore.InvalidateAllTeamIdsForUser(userId) + s.TeamStore.InvalidateAllTeamIdsForUser(userID) } -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) @@ -7965,7 +7965,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) @@ -8010,7 +8010,7 @@ func (s *OpenTracingLayerTeamStore) RemoveAllMembersByTeam(teamID string) error return err } -func (s *OpenTracingLayerTeamStore) RemoveAllMembersByUser(userId string) error { +func (s *OpenTracingLayerTeamStore) RemoveAllMembersByUser(userID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.RemoveAllMembersByUser") s.Root.Store.SetContext(newCtx) @@ -8019,7 +8019,7 @@ func (s *OpenTracingLayerTeamStore) RemoveAllMembersByUser(userId string) error }() defer span.Finish() - err := s.TeamStore.RemoveAllMembersByUser(userId) + err := s.TeamStore.RemoveAllMembersByUser(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -8028,7 +8028,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) @@ -8037,7 +8037,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) @@ -8298,7 +8298,7 @@ func (s *OpenTracingLayerTeamStore) UpdateMultipleMembers(members []*model.TeamM return result, err } -func (s *OpenTracingLayerTeamStore) UserBelongsToTeams(userId string, teamIds []string) (bool, error) { +func (s *OpenTracingLayerTeamStore) UserBelongsToTeams(userID string, teamIds []string) (bool, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.UserBelongsToTeams") s.Root.Store.SetContext(newCtx) @@ -8307,7 +8307,7 @@ func (s *OpenTracingLayerTeamStore) UserBelongsToTeams(userId string, teamIds [] }() defer span.Finish() - result, err := s.TeamStore.UserBelongsToTeams(userId, teamIds) + result, err := s.TeamStore.UserBelongsToTeams(userID, teamIds) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -8388,7 +8388,7 @@ func (s *OpenTracingLayerThreadStore) CollectThreadsWithNewerReplies(userId stri return result, err } -func (s *OpenTracingLayerThreadStore) Delete(postId string) error { +func (s *OpenTracingLayerThreadStore) Delete(postID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ThreadStore.Delete") s.Root.Store.SetContext(newCtx) @@ -8397,7 +8397,7 @@ func (s *OpenTracingLayerThreadStore) Delete(postId string) error { }() defer span.Finish() - err := s.ThreadStore.Delete(postId) + err := s.ThreadStore.Delete(postID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -8478,7 +8478,7 @@ func (s *OpenTracingLayerThreadStore) GetMembershipsForUser(userId string, teamI return result, err } -func (s *OpenTracingLayerThreadStore) GetPosts(threadId string, since int64) ([]*model.Post, error) { +func (s *OpenTracingLayerThreadStore) GetPosts(threadID string, since int64) ([]*model.Post, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ThreadStore.GetPosts") s.Root.Store.SetContext(newCtx) @@ -8487,7 +8487,7 @@ func (s *OpenTracingLayerThreadStore) GetPosts(threadId string, since int64) ([] }() defer span.Finish() - result, err := s.ThreadStore.GetPosts(threadId, since) + result, err := s.ThreadStore.GetPosts(threadID, since) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -8496,7 +8496,7 @@ func (s *OpenTracingLayerThreadStore) GetPosts(threadId string, since int64) ([] return result, err } -func (s *OpenTracingLayerThreadStore) GetThreadForUser(userId string, teamId string, threadId string, extended bool) (*model.ThreadResponse, error) { +func (s *OpenTracingLayerThreadStore) GetThreadForUser(userID string, teamID string, threadId string, extended bool) (*model.ThreadResponse, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ThreadStore.GetThreadForUser") s.Root.Store.SetContext(newCtx) @@ -8505,7 +8505,7 @@ func (s *OpenTracingLayerThreadStore) GetThreadForUser(userId string, teamId str }() defer span.Finish() - result, err := s.ThreadStore.GetThreadForUser(userId, teamId, threadId, extended) + result, err := s.ThreadStore.GetThreadForUser(userID, teamID, threadId, extended) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -8514,7 +8514,7 @@ func (s *OpenTracingLayerThreadStore) GetThreadForUser(userId string, teamId str return result, err } -func (s *OpenTracingLayerThreadStore) GetThreadsForUser(userId string, teamId string, opts model.GetUserThreadsOpts) (*model.Threads, error) { +func (s *OpenTracingLayerThreadStore) GetThreadsForUser(userId string, teamID string, opts model.GetUserThreadsOpts) (*model.Threads, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ThreadStore.GetThreadsForUser") s.Root.Store.SetContext(newCtx) @@ -8523,7 +8523,7 @@ func (s *OpenTracingLayerThreadStore) GetThreadsForUser(userId string, teamId st }() defer span.Finish() - result, err := s.ThreadStore.GetThreadsForUser(userId, teamId, opts) + result, err := s.ThreadStore.GetThreadsForUser(userId, teamID, opts) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -8532,7 +8532,7 @@ func (s *OpenTracingLayerThreadStore) GetThreadsForUser(userId string, teamId st return result, err } -func (s *OpenTracingLayerThreadStore) MaintainMembership(userId string, postID string, following bool, incrementMentions bool, updateFollowing bool, updateViewedTimestamp bool) error { +func (s *OpenTracingLayerThreadStore) MaintainMembership(userID string, postID string, following bool, incrementMentions bool, updateFollowing bool, updateViewedTimestamp bool) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "ThreadStore.MaintainMembership") s.Root.Store.SetContext(newCtx) @@ -8541,7 +8541,7 @@ func (s *OpenTracingLayerThreadStore) MaintainMembership(userId string, postID s }() defer span.Finish() - err := s.ThreadStore.MaintainMembership(userId, postID, following, incrementMentions, updateFollowing, updateViewedTimestamp) + err := s.ThreadStore.MaintainMembership(userID, postID, following, incrementMentions, updateFollowing, updateViewedTimestamp) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -8550,7 +8550,7 @@ func (s *OpenTracingLayerThreadStore) MaintainMembership(userId string, postID s return 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) @@ -8559,7 +8559,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) @@ -8568,7 +8568,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) @@ -8577,7 +8577,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) @@ -8815,7 +8815,7 @@ func (s *OpenTracingLayerUploadSessionStore) Get(id string) (*model.UploadSessio return result, err } -func (s *OpenTracingLayerUploadSessionStore) GetForUser(userId string) ([]*model.UploadSession, error) { +func (s *OpenTracingLayerUploadSessionStore) GetForUser(userID string) ([]*model.UploadSession, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UploadSessionStore.GetForUser") s.Root.Store.SetContext(newCtx) @@ -8824,7 +8824,7 @@ func (s *OpenTracingLayerUploadSessionStore) GetForUser(userId string) ([]*model }() defer span.Finish() - result, err := s.UploadSessionStore.GetForUser(userId) + result, err := s.UploadSessionStore.GetForUser(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9170,7 +9170,7 @@ func (s *OpenTracingLayerUserStore) GetAllProfiles(options *model.UserGetOptions return result, err } -func (s *OpenTracingLayerUserStore) GetAllProfilesInChannel(ctx context.Context, channelId string, allowFromCache bool) (map[string]*model.User, error) { +func (s *OpenTracingLayerUserStore) GetAllProfilesInChannel(ctx context.Context, channelID string, allowFromCache bool) (map[string]*model.User, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.GetAllProfilesInChannel") s.Root.Store.SetContext(newCtx) @@ -9179,7 +9179,7 @@ func (s *OpenTracingLayerUserStore) GetAllProfilesInChannel(ctx context.Context, }() defer span.Finish() - result, err := s.UserStore.GetAllProfilesInChannel(ctx, channelId, allowFromCache) + result, err := s.UserStore.GetAllProfilesInChannel(ctx, channelID, allowFromCache) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9206,7 +9206,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) @@ -9215,7 +9215,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) @@ -9407,7 +9407,7 @@ func (s *OpenTracingLayerUserStore) GetNewUsersForTeam(teamID string, offset int return result, err } -func (s *OpenTracingLayerUserStore) GetProfileByGroupChannelIdsForUser(userId string, channelIds []string) (map[string][]*model.User, error) { +func (s *OpenTracingLayerUserStore) GetProfileByGroupChannelIdsForUser(userID string, channelIds []string) (map[string][]*model.User, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.GetProfileByGroupChannelIdsForUser") s.Root.Store.SetContext(newCtx) @@ -9416,7 +9416,7 @@ func (s *OpenTracingLayerUserStore) GetProfileByGroupChannelIdsForUser(userId st }() defer span.Finish() - result, err := s.UserStore.GetProfileByGroupChannelIdsForUser(userId, channelIds) + result, err := s.UserStore.GetProfileByGroupChannelIdsForUser(userID, channelIds) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9515,7 +9515,7 @@ func (s *OpenTracingLayerUserStore) GetProfilesInChannelByStatus(options *model. return result, err } -func (s *OpenTracingLayerUserStore) GetProfilesNotInChannel(teamId string, channelId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { +func (s *OpenTracingLayerUserStore) GetProfilesNotInChannel(teamID string, channelId 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.GetProfilesNotInChannel") s.Root.Store.SetContext(newCtx) @@ -9524,7 +9524,7 @@ func (s *OpenTracingLayerUserStore) GetProfilesNotInChannel(teamId string, chann }() defer span.Finish() - result, err := s.UserStore.GetProfilesNotInChannel(teamId, channelId, groupConstrained, offset, limit, viewRestrictions) + result, err := s.UserStore.GetProfilesNotInChannel(teamID, channelId, groupConstrained, offset, limit, viewRestrictions) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9623,7 +9623,7 @@ func (s *OpenTracingLayerUserStore) GetTeamGroupUsers(teamID string) ([]*model.U return result, err } -func (s *OpenTracingLayerUserStore) GetUnreadCount(userId string) (int64, error) { +func (s *OpenTracingLayerUserStore) GetUnreadCount(userID string) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.GetUnreadCount") s.Root.Store.SetContext(newCtx) @@ -9632,7 +9632,7 @@ func (s *OpenTracingLayerUserStore) GetUnreadCount(userId string) (int64, error) }() defer span.Finish() - result, err := s.UserStore.GetUnreadCount(userId) + result, err := s.UserStore.GetUnreadCount(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9641,7 +9641,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) @@ -9650,7 +9650,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) @@ -9695,7 +9695,7 @@ func (s *OpenTracingLayerUserStore) InferSystemInstallDate() (int64, error) { return result, err } -func (s *OpenTracingLayerUserStore) InvalidateProfileCacheForUser(userId string) { +func (s *OpenTracingLayerUserStore) InvalidateProfileCacheForUser(userID string) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.InvalidateProfileCacheForUser") s.Root.Store.SetContext(newCtx) @@ -9704,7 +9704,7 @@ func (s *OpenTracingLayerUserStore) InvalidateProfileCacheForUser(userId string) }() defer span.Finish() - s.UserStore.InvalidateProfileCacheForUser(userId) + s.UserStore.InvalidateProfileCacheForUser(userID) } @@ -9721,7 +9721,7 @@ func (s *OpenTracingLayerUserStore) InvalidateProfilesInChannelCache(channelID s } -func (s *OpenTracingLayerUserStore) InvalidateProfilesInChannelCacheByUser(userId string) { +func (s *OpenTracingLayerUserStore) InvalidateProfilesInChannelCacheByUser(userID string) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.InvalidateProfilesInChannelCacheByUser") s.Root.Store.SetContext(newCtx) @@ -9730,11 +9730,11 @@ func (s *OpenTracingLayerUserStore) InvalidateProfilesInChannelCacheByUser(userI }() defer span.Finish() - s.UserStore.InvalidateProfilesInChannelCacheByUser(userId) + s.UserStore.InvalidateProfilesInChannelCacheByUser(userID) } -func (s *OpenTracingLayerUserStore) PermanentDelete(userId string) error { +func (s *OpenTracingLayerUserStore) PermanentDelete(userID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.PermanentDelete") s.Root.Store.SetContext(newCtx) @@ -9743,7 +9743,7 @@ func (s *OpenTracingLayerUserStore) PermanentDelete(userId string) error { }() defer span.Finish() - err := s.UserStore.PermanentDelete(userId) + err := s.UserStore.PermanentDelete(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9770,7 +9770,7 @@ func (s *OpenTracingLayerUserStore) PromoteGuestToUser(userID string) error { return err } -func (s *OpenTracingLayerUserStore) ResetLastPictureUpdate(userId string) error { +func (s *OpenTracingLayerUserStore) ResetLastPictureUpdate(userID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.ResetLastPictureUpdate") s.Root.Store.SetContext(newCtx) @@ -9779,7 +9779,7 @@ func (s *OpenTracingLayerUserStore) ResetLastPictureUpdate(userId string) error }() defer span.Finish() - err := s.UserStore.ResetLastPictureUpdate(userId) + err := s.UserStore.ResetLastPictureUpdate(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9878,7 +9878,7 @@ func (s *OpenTracingLayerUserStore) SearchNotInChannel(teamID string, channelID return result, err } -func (s *OpenTracingLayerUserStore) SearchNotInTeam(notInTeamId string, term string, options *model.UserSearchOptions) ([]*model.User, error) { +func (s *OpenTracingLayerUserStore) SearchNotInTeam(notInTeamID string, term string, options *model.UserSearchOptions) ([]*model.User, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.SearchNotInTeam") s.Root.Store.SetContext(newCtx) @@ -9887,7 +9887,7 @@ func (s *OpenTracingLayerUserStore) SearchNotInTeam(notInTeamId string, term str }() defer span.Finish() - result, err := s.UserStore.SearchNotInTeam(notInTeamId, term, options) + result, err := s.UserStore.SearchNotInTeam(notInTeamID, term, options) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9932,7 +9932,7 @@ func (s *OpenTracingLayerUserStore) Update(user *model.User, allowRoleUpdate boo return result, err } -func (s *OpenTracingLayerUserStore) UpdateAuthData(userId string, service string, authData *string, email string, resetMfa bool) (string, error) { +func (s *OpenTracingLayerUserStore) UpdateAuthData(userID string, service string, authData *string, email string, resetMfa bool) (string, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.UpdateAuthData") s.Root.Store.SetContext(newCtx) @@ -9941,7 +9941,7 @@ func (s *OpenTracingLayerUserStore) UpdateAuthData(userId string, service string }() defer span.Finish() - result, err := s.UserStore.UpdateAuthData(userId, service, authData, email, resetMfa) + result, err := s.UserStore.UpdateAuthData(userID, service, authData, email, resetMfa) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9950,7 +9950,7 @@ func (s *OpenTracingLayerUserStore) UpdateAuthData(userId string, service string return result, err } -func (s *OpenTracingLayerUserStore) UpdateFailedPasswordAttempts(userId string, attempts int) error { +func (s *OpenTracingLayerUserStore) UpdateFailedPasswordAttempts(userID string, attempts int) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.UpdateFailedPasswordAttempts") s.Root.Store.SetContext(newCtx) @@ -9959,7 +9959,7 @@ func (s *OpenTracingLayerUserStore) UpdateFailedPasswordAttempts(userId string, }() defer span.Finish() - err := s.UserStore.UpdateFailedPasswordAttempts(userId, attempts) + err := s.UserStore.UpdateFailedPasswordAttempts(userID, attempts) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9968,7 +9968,7 @@ func (s *OpenTracingLayerUserStore) UpdateFailedPasswordAttempts(userId string, return err } -func (s *OpenTracingLayerUserStore) UpdateLastPictureUpdate(userId string) error { +func (s *OpenTracingLayerUserStore) UpdateLastPictureUpdate(userID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.UpdateLastPictureUpdate") s.Root.Store.SetContext(newCtx) @@ -9977,7 +9977,7 @@ func (s *OpenTracingLayerUserStore) UpdateLastPictureUpdate(userId string) error }() defer span.Finish() - err := s.UserStore.UpdateLastPictureUpdate(userId) + err := s.UserStore.UpdateLastPictureUpdate(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -9986,7 +9986,7 @@ func (s *OpenTracingLayerUserStore) UpdateLastPictureUpdate(userId string) error return err } -func (s *OpenTracingLayerUserStore) UpdateMfaActive(userId string, active bool) error { +func (s *OpenTracingLayerUserStore) UpdateMfaActive(userID string, active bool) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.UpdateMfaActive") s.Root.Store.SetContext(newCtx) @@ -9995,7 +9995,7 @@ func (s *OpenTracingLayerUserStore) UpdateMfaActive(userId string, active bool) }() defer span.Finish() - err := s.UserStore.UpdateMfaActive(userId, active) + err := s.UserStore.UpdateMfaActive(userID, active) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -10004,7 +10004,7 @@ func (s *OpenTracingLayerUserStore) UpdateMfaActive(userId string, active bool) return err } -func (s *OpenTracingLayerUserStore) UpdateMfaSecret(userId string, secret string) error { +func (s *OpenTracingLayerUserStore) UpdateMfaSecret(userID string, secret string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.UpdateMfaSecret") s.Root.Store.SetContext(newCtx) @@ -10013,7 +10013,7 @@ func (s *OpenTracingLayerUserStore) UpdateMfaSecret(userId string, secret string }() defer span.Finish() - err := s.UserStore.UpdateMfaSecret(userId, secret) + err := s.UserStore.UpdateMfaSecret(userID, secret) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -10022,7 +10022,7 @@ func (s *OpenTracingLayerUserStore) UpdateMfaSecret(userId string, secret string return err } -func (s *OpenTracingLayerUserStore) UpdatePassword(userId string, newPassword string) error { +func (s *OpenTracingLayerUserStore) UpdatePassword(userID string, newPassword string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.UpdatePassword") s.Root.Store.SetContext(newCtx) @@ -10031,7 +10031,7 @@ func (s *OpenTracingLayerUserStore) UpdatePassword(userId string, newPassword st }() defer span.Finish() - err := s.UserStore.UpdatePassword(userId, newPassword) + err := s.UserStore.UpdatePassword(userID, newPassword) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -10040,7 +10040,7 @@ func (s *OpenTracingLayerUserStore) UpdatePassword(userId string, newPassword st return err } -func (s *OpenTracingLayerUserStore) UpdateUpdateAt(userId string) (int64, error) { +func (s *OpenTracingLayerUserStore) UpdateUpdateAt(userID string) (int64, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.UpdateUpdateAt") s.Root.Store.SetContext(newCtx) @@ -10049,7 +10049,7 @@ func (s *OpenTracingLayerUserStore) UpdateUpdateAt(userId string) (int64, error) }() defer span.Finish() - result, err := s.UserStore.UpdateUpdateAt(userId) + result, err := s.UserStore.UpdateUpdateAt(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -10058,7 +10058,7 @@ func (s *OpenTracingLayerUserStore) UpdateUpdateAt(userId string) (int64, error) return result, err } -func (s *OpenTracingLayerUserStore) VerifyEmail(userId string, email string) (string, error) { +func (s *OpenTracingLayerUserStore) VerifyEmail(userID string, email string) (string, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.VerifyEmail") s.Root.Store.SetContext(newCtx) @@ -10067,7 +10067,7 @@ func (s *OpenTracingLayerUserStore) VerifyEmail(userId string, email string) (st }() defer span.Finish() - result, err := s.UserStore.VerifyEmail(userId, email) + result, err := s.UserStore.VerifyEmail(userID, email) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -10094,7 +10094,7 @@ func (s *OpenTracingLayerUserAccessTokenStore) Delete(tokenID string) error { return err } -func (s *OpenTracingLayerUserAccessTokenStore) DeleteAllForUser(userId string) error { +func (s *OpenTracingLayerUserAccessTokenStore) DeleteAllForUser(userID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserAccessTokenStore.DeleteAllForUser") s.Root.Store.SetContext(newCtx) @@ -10103,7 +10103,7 @@ func (s *OpenTracingLayerUserAccessTokenStore) DeleteAllForUser(userId string) e }() defer span.Finish() - err := s.UserAccessTokenStore.DeleteAllForUser(userId) + err := s.UserAccessTokenStore.DeleteAllForUser(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -10166,7 +10166,7 @@ func (s *OpenTracingLayerUserAccessTokenStore) GetByToken(tokenString string) (* return result, err } -func (s *OpenTracingLayerUserAccessTokenStore) GetByUser(userId string, page int, perPage int) ([]*model.UserAccessToken, error) { +func (s *OpenTracingLayerUserAccessTokenStore) GetByUser(userID string, page int, perPage int) ([]*model.UserAccessToken, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserAccessTokenStore.GetByUser") s.Root.Store.SetContext(newCtx) @@ -10175,7 +10175,7 @@ func (s *OpenTracingLayerUserAccessTokenStore) GetByUser(userId string, page int }() defer span.Finish() - result, err := s.UserAccessTokenStore.GetByUser(userId, page, perPage) + result, err := s.UserAccessTokenStore.GetByUser(userID, page, perPage) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -10256,7 +10256,7 @@ func (s *OpenTracingLayerUserAccessTokenStore) UpdateTokenEnable(tokenID string) return err } -func (s *OpenTracingLayerUserTermsOfServiceStore) Delete(userId string, termsOfServiceId string) error { +func (s *OpenTracingLayerUserTermsOfServiceStore) Delete(userID string, termsOfServiceId string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserTermsOfServiceStore.Delete") s.Root.Store.SetContext(newCtx) @@ -10265,7 +10265,7 @@ func (s *OpenTracingLayerUserTermsOfServiceStore) Delete(userId string, termsOfS }() defer span.Finish() - err := s.UserTermsOfServiceStore.Delete(userId, termsOfServiceId) + err := s.UserTermsOfServiceStore.Delete(userID, termsOfServiceId) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -10274,7 +10274,7 @@ func (s *OpenTracingLayerUserTermsOfServiceStore) Delete(userId string, termsOfS return err } -func (s *OpenTracingLayerUserTermsOfServiceStore) GetByUser(userId string) (*model.UserTermsOfService, error) { +func (s *OpenTracingLayerUserTermsOfServiceStore) GetByUser(userID string) (*model.UserTermsOfService, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserTermsOfServiceStore.GetByUser") s.Root.Store.SetContext(newCtx) @@ -10283,7 +10283,7 @@ func (s *OpenTracingLayerUserTermsOfServiceStore) GetByUser(userId string) (*mod }() defer span.Finish() - result, err := s.UserTermsOfServiceStore.GetByUser(userId) + result, err := s.UserTermsOfServiceStore.GetByUser(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -10449,7 +10449,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) @@ -10458,7 +10458,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) @@ -10485,7 +10485,7 @@ func (s *OpenTracingLayerWebhookStore) GetIncomingList(offset int, limit int) ([ return result, err } -func (s *OpenTracingLayerWebhookStore) GetIncomingListByUser(userId string, offset int, limit int) ([]*model.IncomingWebhook, error) { +func (s *OpenTracingLayerWebhookStore) GetIncomingListByUser(userID string, offset int, limit int) ([]*model.IncomingWebhook, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "WebhookStore.GetIncomingListByUser") s.Root.Store.SetContext(newCtx) @@ -10494,7 +10494,7 @@ func (s *OpenTracingLayerWebhookStore) GetIncomingListByUser(userId string, offs }() defer span.Finish() - result, err := s.WebhookStore.GetIncomingListByUser(userId, offset, limit) + result, err := s.WebhookStore.GetIncomingListByUser(userID, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -10539,7 +10539,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) @@ -10548,7 +10548,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) @@ -10575,7 +10575,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) @@ -10584,7 +10584,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) @@ -10611,7 +10611,7 @@ func (s *OpenTracingLayerWebhookStore) GetOutgoingList(offset int, limit int) ([ return result, err } -func (s *OpenTracingLayerWebhookStore) GetOutgoingListByUser(userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { +func (s *OpenTracingLayerWebhookStore) GetOutgoingListByUser(userID string, offset int, limit int) ([]*model.OutgoingWebhook, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "WebhookStore.GetOutgoingListByUser") s.Root.Store.SetContext(newCtx) @@ -10620,7 +10620,7 @@ func (s *OpenTracingLayerWebhookStore) GetOutgoingListByUser(userId string, offs }() defer span.Finish() - result, err := s.WebhookStore.GetOutgoingListByUser(userId, offset, limit) + result, err := s.WebhookStore.GetOutgoingListByUser(userID, offset, limit) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -10660,7 +10660,7 @@ func (s *OpenTracingLayerWebhookStore) PermanentDeleteIncomingByChannel(channelI return err } -func (s *OpenTracingLayerWebhookStore) PermanentDeleteIncomingByUser(userId string) error { +func (s *OpenTracingLayerWebhookStore) PermanentDeleteIncomingByUser(userID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "WebhookStore.PermanentDeleteIncomingByUser") s.Root.Store.SetContext(newCtx) @@ -10669,7 +10669,7 @@ func (s *OpenTracingLayerWebhookStore) PermanentDeleteIncomingByUser(userId stri }() defer span.Finish() - err := s.WebhookStore.PermanentDeleteIncomingByUser(userId) + err := s.WebhookStore.PermanentDeleteIncomingByUser(userID) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) @@ -10696,7 +10696,7 @@ func (s *OpenTracingLayerWebhookStore) PermanentDeleteOutgoingByChannel(channelI return err } -func (s *OpenTracingLayerWebhookStore) PermanentDeleteOutgoingByUser(userId string) error { +func (s *OpenTracingLayerWebhookStore) PermanentDeleteOutgoingByUser(userID string) error { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "WebhookStore.PermanentDeleteOutgoingByUser") s.Root.Store.SetContext(newCtx) @@ -10705,7 +10705,7 @@ func (s *OpenTracingLayerWebhookStore) PermanentDeleteOutgoingByUser(userId stri }() defer span.Finish() - err := s.WebhookStore.PermanentDeleteOutgoingByUser(userId) + err := s.WebhookStore.PermanentDeleteOutgoingByUser(userID) 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 6e5b7b5cb1..4506fb05b7 100644 --- a/store/retrylayer/retrylayer.go +++ b/store/retrylayer/retrylayer.go @@ -418,11 +418,11 @@ func (s *RetryLayerAuditStore) Get(user_id string, offset int, limit int) (model } -func (s *RetryLayerAuditStore) PermanentDeleteByUser(userId string) error { +func (s *RetryLayerAuditStore) PermanentDeleteByUser(userID string) error { tries := 0 for { - err := s.AuditStore.PermanentDeleteByUser(userId) + err := s.AuditStore.PermanentDeleteByUser(userID) if err == nil { return nil } @@ -458,11 +458,11 @@ func (s *RetryLayerAuditStore) Save(audit *model.Audit) error { } -func (s *RetryLayerBotStore) Get(userId string, includeDeleted bool) (*model.Bot, error) { +func (s *RetryLayerBotStore) Get(userID string, includeDeleted bool) (*model.Bot, error) { tries := 0 for { - result, err := s.BotStore.Get(userId, includeDeleted) + result, err := s.BotStore.Get(userID, includeDeleted) if err == nil { return result, nil } @@ -498,11 +498,11 @@ func (s *RetryLayerBotStore) GetAll(options *model.BotGetOptions) ([]*model.Bot, } -func (s *RetryLayerBotStore) PermanentDelete(userId string) error { +func (s *RetryLayerBotStore) PermanentDelete(userID string) error { tries := 0 for { - err := s.BotStore.PermanentDelete(userId) + err := s.BotStore.PermanentDelete(userID) if err == nil { return nil } @@ -618,11 +618,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 } @@ -664,11 +664,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 } @@ -684,11 +684,11 @@ func (s *RetryLayerChannelStore) ClearSidebarOnTeamLeave(userId string, teamID s } -func (s *RetryLayerChannelStore) CountPostsAfter(channelID string, timestamp int64, userId string) (int, int, error) { +func (s *RetryLayerChannelStore) CountPostsAfter(channelID string, timestamp int64, userID string) (int, int, error) { tries := 0 for { - result, resultVar1, err := s.ChannelStore.CountPostsAfter(channelID, timestamp, userId) + result, resultVar1, err := s.ChannelStore.CountPostsAfter(channelID, timestamp, userID) if err == nil { return result, resultVar1, nil } @@ -704,11 +704,11 @@ func (s *RetryLayerChannelStore) CountPostsAfter(channelID string, timestamp int } -func (s *RetryLayerChannelStore) CreateDirectChannel(userId *model.User, otherUserId *model.User, channelOptions ...model.ChannelOption) (*model.Channel, error) { +func (s *RetryLayerChannelStore) CreateDirectChannel(userID *model.User, otherUserID *model.User, channelOptions ...model.ChannelOption) (*model.Channel, error) { tries := 0 for { - result, err := s.ChannelStore.CreateDirectChannel(userId, otherUserId, channelOptions...) + result, err := s.ChannelStore.CreateDirectChannel(userID, otherUserID, channelOptions...) if err == nil { return result, nil } @@ -724,11 +724,11 @@ func (s *RetryLayerChannelStore) CreateDirectChannel(userId *model.User, otherUs } -func (s *RetryLayerChannelStore) CreateInitialSidebarCategories(userId string, teamID string) (*model.OrderedSidebarCategories, error) { +func (s *RetryLayerChannelStore) CreateInitialSidebarCategories(userID string, teamID string) (*model.OrderedSidebarCategories, error) { tries := 0 for { - result, err := s.ChannelStore.CreateInitialSidebarCategories(userId, teamID) + result, err := s.ChannelStore.CreateInitialSidebarCategories(userID, teamID) if err == nil { return result, nil } @@ -744,11 +744,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 } @@ -864,11 +864,11 @@ func (s *RetryLayerChannelStore) GetAll(teamID string) ([]*model.Channel, error) } -func (s *RetryLayerChannelStore) GetAllChannelMembersForUser(userId string, allowFromCache bool, includeDeleted bool) (map[string]string, error) { +func (s *RetryLayerChannelStore) GetAllChannelMembersForUser(userID string, allowFromCache bool, includeDeleted bool) (map[string]string, error) { tries := 0 for { - result, err := s.ChannelStore.GetAllChannelMembersForUser(userId, allowFromCache, includeDeleted) + result, err := s.ChannelStore.GetAllChannelMembersForUser(userID, allowFromCache, includeDeleted) if err == nil { return result, nil } @@ -1044,11 +1044,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 } @@ -1064,11 +1064,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 } @@ -1104,11 +1104,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 } @@ -1124,11 +1124,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 } @@ -1204,11 +1204,11 @@ func (s *RetryLayerChannelStore) GetChannelsByScheme(schemeID string, offset int } -func (s *RetryLayerChannelStore) GetDeleted(team_id string, offset int, limit int, userId string) (*model.ChannelList, error) { +func (s *RetryLayerChannelStore) GetDeleted(team_id string, offset int, limit int, userID string) (*model.ChannelList, error) { tries := 0 for { - result, err := s.ChannelStore.GetDeleted(team_id, offset, limit, userId) + result, err := s.ChannelStore.GetDeleted(team_id, offset, limit, userID) if err == nil { return result, nil } @@ -1304,11 +1304,11 @@ func (s *RetryLayerChannelStore) GetGuestCount(channelID string, allowFromCache } -func (s *RetryLayerChannelStore) GetMember(ctx context.Context, channelID string, userId string) (*model.ChannelMember, error) { +func (s *RetryLayerChannelStore) GetMember(ctx context.Context, channelID string, userID string) (*model.ChannelMember, error) { tries := 0 for { - result, err := s.ChannelStore.GetMember(ctx, channelID, userId) + result, err := s.ChannelStore.GetMember(ctx, channelID, userID) if err == nil { return result, nil } @@ -1370,11 +1370,11 @@ func (s *RetryLayerChannelStore) GetMemberCountsByGroup(ctx context.Context, cha } -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 } @@ -1410,11 +1410,11 @@ func (s *RetryLayerChannelStore) GetMembers(channelID string, offset int, limit } -func (s *RetryLayerChannelStore) GetMembersByChannelIds(channelIds []string, userId string) (*model.ChannelMembers, error) { +func (s *RetryLayerChannelStore) GetMembersByChannelIds(channelIds []string, userID string) (*model.ChannelMembers, error) { tries := 0 for { - result, err := s.ChannelStore.GetMembersByChannelIds(channelIds, userId) + result, err := s.ChannelStore.GetMembersByChannelIds(channelIds, userID) if err == nil { return result, nil } @@ -1450,11 +1450,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 } @@ -1470,11 +1470,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 } @@ -1490,11 +1490,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 } @@ -1610,11 +1610,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 } @@ -1650,11 +1650,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 } @@ -1730,11 +1730,11 @@ func (s *RetryLayerChannelStore) GroupSyncedChannelCount() (int64, error) { } -func (s *RetryLayerChannelStore) IncrementMentionCount(channelID string, userId string, updateThreads bool, isRoot bool) error { +func (s *RetryLayerChannelStore) IncrementMentionCount(channelID string, userID string, updateThreads bool, isRoot bool) error { tries := 0 for { - err := s.ChannelStore.IncrementMentionCount(channelID, userId, updateThreads, isRoot) + err := s.ChannelStore.IncrementMentionCount(channelID, userID, updateThreads, isRoot) if err == nil { return nil } @@ -1750,9 +1750,9 @@ func (s *RetryLayerChannelStore) IncrementMentionCount(channelID string, userId } -func (s *RetryLayerChannelStore) InvalidateAllChannelMembersForUser(userId string) { +func (s *RetryLayerChannelStore) InvalidateAllChannelMembersForUser(userID string) { - s.ChannelStore.InvalidateAllChannelMembersForUser(userId) + s.ChannelStore.InvalidateAllChannelMembersForUser(userID) } @@ -1792,17 +1792,17 @@ func (s *RetryLayerChannelStore) InvalidatePinnedPostCount(channelID string) { } -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) } -func (s *RetryLayerChannelStore) MigrateChannelMembers(fromChannelId string, fromUserId string) (map[string]string, error) { +func (s *RetryLayerChannelStore) MigrateChannelMembers(fromChannelID string, fromUserID string) (map[string]string, error) { tries := 0 for { - result, err := s.ChannelStore.MigrateChannelMembers(fromChannelId, fromUserId) + result, err := s.ChannelStore.MigrateChannelMembers(fromChannelID, fromUserID) if err == nil { return result, nil } @@ -1898,11 +1898,11 @@ func (s *RetryLayerChannelStore) PermanentDeleteMembersByChannel(channelID strin } -func (s *RetryLayerChannelStore) PermanentDeleteMembersByUser(userId string) error { +func (s *RetryLayerChannelStore) PermanentDeleteMembersByUser(userID string) error { tries := 0 for { - err := s.ChannelStore.PermanentDeleteMembersByUser(userId) + err := s.ChannelStore.PermanentDeleteMembersByUser(userID) if err == nil { return nil } @@ -1938,11 +1938,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 } @@ -2118,11 +2118,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 } @@ -2138,11 +2138,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 } @@ -2158,11 +2158,11 @@ func (s *RetryLayerChannelStore) SearchForUserInTeam(userId string, teamID strin } -func (s *RetryLayerChannelStore) SearchGroupChannels(userId string, term string) (*model.ChannelList, error) { +func (s *RetryLayerChannelStore) SearchGroupChannels(userID string, term string) (*model.ChannelList, error) { tries := 0 for { - result, err := s.ChannelStore.SearchGroupChannels(userId, term) + result, err := s.ChannelStore.SearchGroupChannels(userID, term) if err == nil { return result, nil } @@ -2198,11 +2198,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 } @@ -2278,11 +2278,11 @@ func (s *RetryLayerChannelStore) Update(channel *model.Channel) (*model.Channel, } -func (s *RetryLayerChannelStore) UpdateLastViewedAt(channelIds []string, userId string, updateThreads bool) (map[string]int64, error) { +func (s *RetryLayerChannelStore) UpdateLastViewedAt(channelIds []string, userID string, updateThreads bool) (map[string]int64, error) { tries := 0 for { - result, err := s.ChannelStore.UpdateLastViewedAt(channelIds, userId, updateThreads) + result, err := s.ChannelStore.UpdateLastViewedAt(channelIds, userID, updateThreads) if err == nil { return result, nil } @@ -2378,11 +2378,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 } @@ -2398,11 +2398,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 } @@ -2458,11 +2458,11 @@ func (s *RetryLayerChannelStore) UpdateSidebarChannelsByPreferences(preferences } -func (s *RetryLayerChannelStore) UserBelongsToChannels(userId string, channelIds []string) (bool, error) { +func (s *RetryLayerChannelStore) UserBelongsToChannels(userID string, channelIds []string) (bool, error) { tries := 0 for { - result, err := s.ChannelStore.UserBelongsToChannels(userId, channelIds) + result, err := s.ChannelStore.UserBelongsToChannels(userID, channelIds) if err == nil { return result, nil } @@ -2498,11 +2498,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 } @@ -2518,11 +2518,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 } @@ -2798,11 +2798,11 @@ func (s *RetryLayerCommandStore) PermanentDeleteByTeam(teamID string) error { } -func (s *RetryLayerCommandStore) PermanentDeleteByUser(userId string) error { +func (s *RetryLayerCommandStore) PermanentDeleteByUser(userID string) error { tries := 0 for { - err := s.CommandStore.PermanentDeleteByUser(userId) + err := s.CommandStore.PermanentDeleteByUser(userID) if err == nil { return nil } @@ -3184,11 +3184,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 } @@ -3350,11 +3350,11 @@ func (s *RetryLayerFileInfoStore) GetForPost(postID string, readFromMaster bool, } -func (s *RetryLayerFileInfoStore) GetForUser(userId string) ([]*model.FileInfo, error) { +func (s *RetryLayerFileInfoStore) GetForUser(userID string) ([]*model.FileInfo, error) { tries := 0 for { - result, err := s.FileInfoStore.GetForUser(userId) + result, err := s.FileInfoStore.GetForUser(userID) if err == nil { return result, nil } @@ -3436,11 +3436,11 @@ func (s *RetryLayerFileInfoStore) PermanentDeleteBatch(endTime int64, limit int6 } -func (s *RetryLayerFileInfoStore) PermanentDeleteByUser(userId string) (int64, error) { +func (s *RetryLayerFileInfoStore) PermanentDeleteByUser(userID string) (int64, error) { tries := 0 for { - result, err := s.FileInfoStore.PermanentDeleteByUser(userId) + result, err := s.FileInfoStore.PermanentDeleteByUser(userID) if err == nil { return result, nil } @@ -3476,11 +3476,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 } @@ -3936,11 +3936,11 @@ func (s *RetryLayerGroupStore) GetByRemoteID(remoteID string, groupSource model. } -func (s *RetryLayerGroupStore) GetByUser(userId string) ([]*model.Group, error) { +func (s *RetryLayerGroupStore) GetByUser(userID string) ([]*model.Group, error) { tries := 0 for { - result, err := s.GroupStore.GetByUser(userId) + result, err := s.GroupStore.GetByUser(userID) if err == nil { return result, nil } @@ -4256,11 +4256,11 @@ func (s *RetryLayerGroupStore) GroupTeamCount() (int64, error) { } -func (s *RetryLayerGroupStore) PermanentDeleteMembersByUser(userId string) error { +func (s *RetryLayerGroupStore) PermanentDeleteMembersByUser(userID string) error { tries := 0 for { - err := s.GroupStore.PermanentDeleteMembersByUser(userId) + err := s.GroupStore.PermanentDeleteMembersByUser(userID) if err == nil { return nil } @@ -4816,11 +4816,11 @@ func (s *RetryLayerOAuthStore) GetAccessDataByRefreshToken(token string) (*model } -func (s *RetryLayerOAuthStore) GetAccessDataByUserForApp(userId string, clientId string) ([]*model.AccessData, error) { +func (s *RetryLayerOAuthStore) GetAccessDataByUserForApp(userID string, clientId string) ([]*model.AccessData, error) { tries := 0 for { - result, err := s.OAuthStore.GetAccessDataByUserForApp(userId, clientId) + result, err := s.OAuthStore.GetAccessDataByUserForApp(userID, clientId) if err == nil { return result, nil } @@ -4856,11 +4856,11 @@ func (s *RetryLayerOAuthStore) GetApp(id string) (*model.OAuthApp, error) { } -func (s *RetryLayerOAuthStore) GetAppByUser(userId string, offset int, limit int) ([]*model.OAuthApp, error) { +func (s *RetryLayerOAuthStore) GetAppByUser(userID string, offset int, limit int) ([]*model.OAuthApp, error) { tries := 0 for { - result, err := s.OAuthStore.GetAppByUser(userId, offset, limit) + result, err := s.OAuthStore.GetAppByUser(userID, offset, limit) if err == nil { return result, nil } @@ -4916,11 +4916,11 @@ func (s *RetryLayerOAuthStore) GetAuthData(code string) (*model.AuthData, error) } -func (s *RetryLayerOAuthStore) GetAuthorizedApps(userId string, offset int, limit int) ([]*model.OAuthApp, error) { +func (s *RetryLayerOAuthStore) GetAuthorizedApps(userID string, offset int, limit int) ([]*model.OAuthApp, error) { tries := 0 for { - result, err := s.OAuthStore.GetAuthorizedApps(userId, offset, limit) + result, err := s.OAuthStore.GetAuthorizedApps(userID, offset, limit) if err == nil { return result, nil } @@ -4936,11 +4936,11 @@ func (s *RetryLayerOAuthStore) GetAuthorizedApps(userId string, offset int, limi } -func (s *RetryLayerOAuthStore) GetPreviousAccessData(userId string, clientId string) (*model.AccessData, error) { +func (s *RetryLayerOAuthStore) GetPreviousAccessData(userID string, clientId string) (*model.AccessData, error) { tries := 0 for { - result, err := s.OAuthStore.GetPreviousAccessData(userId, clientId) + result, err := s.OAuthStore.GetPreviousAccessData(userID, clientId) if err == nil { return result, nil } @@ -4956,11 +4956,11 @@ func (s *RetryLayerOAuthStore) GetPreviousAccessData(userId string, clientId str } -func (s *RetryLayerOAuthStore) PermanentDeleteAuthDataByUser(userId string) error { +func (s *RetryLayerOAuthStore) PermanentDeleteAuthDataByUser(userID string) error { tries := 0 for { - err := s.OAuthStore.PermanentDeleteAuthDataByUser(userId) + err := s.OAuthStore.PermanentDeleteAuthDataByUser(userID) if err == nil { return nil } @@ -5448,11 +5448,11 @@ func (s *RetryLayerPostStore) GetEtag(channelID string, allowFromCache bool, col } -func (s *RetryLayerPostStore) GetFlaggedPosts(userId string, offset int, limit int) (*model.PostList, error) { +func (s *RetryLayerPostStore) GetFlaggedPosts(userID string, offset int, limit int) (*model.PostList, error) { tries := 0 for { - result, err := s.PostStore.GetFlaggedPosts(userId, offset, limit) + result, err := s.PostStore.GetFlaggedPosts(userID, offset, limit) if err == nil { return result, nil } @@ -5468,11 +5468,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 } @@ -5488,11 +5488,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 } @@ -5920,11 +5920,11 @@ func (s *RetryLayerPostStore) PermanentDeleteByChannel(channelID string) error { } -func (s *RetryLayerPostStore) PermanentDeleteByUser(userId string) error { +func (s *RetryLayerPostStore) PermanentDeleteByUser(userID string) error { tries := 0 for { - err := s.PostStore.PermanentDeleteByUser(userId) + err := s.PostStore.PermanentDeleteByUser(userID) if err == nil { return nil } @@ -5980,11 +5980,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 } @@ -6000,11 +6000,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 } @@ -6060,11 +6060,11 @@ func (s *RetryLayerPreferenceStore) CleanupFlagsBatch(limit int64) (int64, error } -func (s *RetryLayerPreferenceStore) Delete(userId string, category string, name string) error { +func (s *RetryLayerPreferenceStore) Delete(userID string, category string, name string) error { tries := 0 for { - err := s.PreferenceStore.Delete(userId, category, name) + err := s.PreferenceStore.Delete(userID, category, name) if err == nil { return nil } @@ -6080,11 +6080,11 @@ func (s *RetryLayerPreferenceStore) Delete(userId string, category string, name } -func (s *RetryLayerPreferenceStore) DeleteCategory(userId string, category string) error { +func (s *RetryLayerPreferenceStore) DeleteCategory(userID string, category string) error { tries := 0 for { - err := s.PreferenceStore.DeleteCategory(userId, category) + err := s.PreferenceStore.DeleteCategory(userID, category) if err == nil { return nil } @@ -6120,11 +6120,11 @@ func (s *RetryLayerPreferenceStore) DeleteCategoryAndName(category string, name } -func (s *RetryLayerPreferenceStore) Get(userId string, category string, name string) (*model.Preference, error) { +func (s *RetryLayerPreferenceStore) Get(userID string, category string, name string) (*model.Preference, error) { tries := 0 for { - result, err := s.PreferenceStore.Get(userId, category, name) + result, err := s.PreferenceStore.Get(userID, category, name) if err == nil { return result, nil } @@ -6140,11 +6140,11 @@ func (s *RetryLayerPreferenceStore) Get(userId string, category string, name str } -func (s *RetryLayerPreferenceStore) GetAll(userId string) (model.Preferences, error) { +func (s *RetryLayerPreferenceStore) GetAll(userID string) (model.Preferences, error) { tries := 0 for { - result, err := s.PreferenceStore.GetAll(userId) + result, err := s.PreferenceStore.GetAll(userID) if err == nil { return result, nil } @@ -6160,11 +6160,11 @@ func (s *RetryLayerPreferenceStore) GetAll(userId string) (model.Preferences, er } -func (s *RetryLayerPreferenceStore) GetCategory(userId string, category string) (model.Preferences, error) { +func (s *RetryLayerPreferenceStore) GetCategory(userID string, category string) (model.Preferences, error) { tries := 0 for { - result, err := s.PreferenceStore.GetCategory(userId, category) + result, err := s.PreferenceStore.GetCategory(userID, category) if err == nil { return result, nil } @@ -6180,11 +6180,11 @@ func (s *RetryLayerPreferenceStore) GetCategory(userId string, category string) } -func (s *RetryLayerPreferenceStore) PermanentDeleteByUser(userId string) error { +func (s *RetryLayerPreferenceStore) PermanentDeleteByUser(userID string) error { tries := 0 for { - err := s.PreferenceStore.PermanentDeleteByUser(userId) + err := s.PreferenceStore.PermanentDeleteByUser(userID) if err == nil { return nil } @@ -6260,11 +6260,11 @@ func (s *RetryLayerProductNoticesStore) ClearOldNotices(currentNotices *model.Pr } -func (s *RetryLayerProductNoticesStore) GetViews(userId string) ([]model.ProductNoticeViewState, error) { +func (s *RetryLayerProductNoticesStore) GetViews(userID string) ([]model.ProductNoticeViewState, error) { tries := 0 for { - result, err := s.ProductNoticesStore.GetViews(userId) + result, err := s.ProductNoticesStore.GetViews(userID) if err == nil { return result, nil } @@ -6280,11 +6280,11 @@ func (s *RetryLayerProductNoticesStore) GetViews(userId string) ([]model.Product } -func (s *RetryLayerProductNoticesStore) View(userId string, notices []string) error { +func (s *RetryLayerProductNoticesStore) View(userID string, notices []string) error { tries := 0 for { - err := s.ProductNoticesStore.View(userId, notices) + err := s.ProductNoticesStore.View(userID, notices) if err == nil { return nil } @@ -6986,11 +6986,11 @@ func (s *RetryLayerSessionStore) Get(ctx context.Context, sessionIDOrToken strin } -func (s *RetryLayerSessionStore) GetSessions(userId string) ([]*model.Session, error) { +func (s *RetryLayerSessionStore) GetSessions(userID string) ([]*model.Session, error) { tries := 0 for { - result, err := s.SessionStore.GetSessions(userId) + result, err := s.SessionStore.GetSessions(userID) if err == nil { return result, nil } @@ -7026,11 +7026,11 @@ func (s *RetryLayerSessionStore) GetSessionsExpired(thresholdMillis int64, mobil } -func (s *RetryLayerSessionStore) GetSessionsWithActiveDeviceIds(userId string) ([]*model.Session, error) { +func (s *RetryLayerSessionStore) GetSessionsWithActiveDeviceIds(userID string) ([]*model.Session, error) { tries := 0 for { - result, err := s.SessionStore.GetSessionsWithActiveDeviceIds(userId) + result, err := s.SessionStore.GetSessionsWithActiveDeviceIds(userID) if err == nil { return result, nil } @@ -7226,11 +7226,11 @@ func (s *RetryLayerSessionStore) UpdateProps(session *model.Session) error { } -func (s *RetryLayerSessionStore) UpdateRoles(userId string, roles string) (string, error) { +func (s *RetryLayerSessionStore) UpdateRoles(userID string, roles string) (string, error) { tries := 0 for { - result, err := s.SessionStore.UpdateRoles(userId, roles) + result, err := s.SessionStore.UpdateRoles(userID, roles) if err == nil { return result, nil } @@ -7726,11 +7726,11 @@ func (s *RetryLayerSharedChannelStore) UpsertAttachment(remote *model.SharedChan } -func (s *RetryLayerStatusStore) Get(userId string) (*model.Status, error) { +func (s *RetryLayerStatusStore) Get(userID string) (*model.Status, error) { tries := 0 for { - result, err := s.StatusStore.Get(userId) + result, err := s.StatusStore.Get(userID) if err == nil { return result, nil } @@ -7826,11 +7826,11 @@ func (s *RetryLayerStatusStore) SaveOrUpdate(status *model.Status) error { } -func (s *RetryLayerStatusStore) UpdateLastActivityAt(userId string, lastActivityAt int64) error { +func (s *RetryLayerStatusStore) UpdateLastActivityAt(userID string, lastActivityAt int64) error { tries := 0 for { - err := s.StatusStore.UpdateLastActivityAt(userId, lastActivityAt) + err := s.StatusStore.UpdateLastActivityAt(userID, lastActivityAt) if err == nil { return nil } @@ -8372,11 +8372,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 } @@ -8392,11 +8392,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 } @@ -8412,11 +8412,11 @@ func (s *RetryLayerTeamStore) GetChannelUnreadsForTeam(teamID string, userId str } -func (s *RetryLayerTeamStore) GetMember(ctx context.Context, teamID string, userId string) (*model.TeamMember, error) { +func (s *RetryLayerTeamStore) GetMember(ctx context.Context, teamID string, userID string) (*model.TeamMember, error) { tries := 0 for { - result, err := s.TeamStore.GetMember(ctx, teamID, userId) + result, err := s.TeamStore.GetMember(ctx, teamID, userID) if err == nil { return result, nil } @@ -8472,11 +8472,11 @@ func (s *RetryLayerTeamStore) GetMembersByIds(teamID string, userIds []string, r } -func (s *RetryLayerTeamStore) GetTeamMembersForExport(userId string) ([]*model.TeamMemberForExport, error) { +func (s *RetryLayerTeamStore) GetTeamMembersForExport(userID string) ([]*model.TeamMemberForExport, error) { tries := 0 for { - result, err := s.TeamStore.GetTeamMembersForExport(userId) + result, err := s.TeamStore.GetTeamMembersForExport(userID) if err == nil { return result, nil } @@ -8512,11 +8512,11 @@ func (s *RetryLayerTeamStore) GetTeamsByScheme(schemeID string, offset int, limi } -func (s *RetryLayerTeamStore) GetTeamsByUserId(userId string) ([]*model.Team, error) { +func (s *RetryLayerTeamStore) GetTeamsByUserId(userID string) ([]*model.Team, error) { tries := 0 for { - result, err := s.TeamStore.GetTeamsByUserId(userId) + result, err := s.TeamStore.GetTeamsByUserId(userID) if err == nil { return result, nil } @@ -8532,11 +8532,11 @@ func (s *RetryLayerTeamStore) GetTeamsByUserId(userId string) ([]*model.Team, er } -func (s *RetryLayerTeamStore) GetTeamsForUser(ctx context.Context, userId string) ([]*model.TeamMember, error) { +func (s *RetryLayerTeamStore) GetTeamsForUser(ctx context.Context, userID string) ([]*model.TeamMember, error) { tries := 0 for { - result, err := s.TeamStore.GetTeamsForUser(ctx, userId) + result, err := s.TeamStore.GetTeamsForUser(ctx, userID) if err == nil { return result, nil } @@ -8552,11 +8552,11 @@ func (s *RetryLayerTeamStore) GetTeamsForUser(ctx context.Context, userId string } -func (s *RetryLayerTeamStore) GetTeamsForUserWithPagination(userId string, page int, perPage int) ([]*model.TeamMember, error) { +func (s *RetryLayerTeamStore) GetTeamsForUserWithPagination(userID string, page int, perPage int) ([]*model.TeamMember, error) { tries := 0 for { - result, err := s.TeamStore.GetTeamsForUserWithPagination(userId, page, perPage) + result, err := s.TeamStore.GetTeamsForUserWithPagination(userID, page, perPage) if err == nil { return result, nil } @@ -8592,11 +8592,11 @@ func (s *RetryLayerTeamStore) GetTotalMemberCount(teamID string, restrictions *m } -func (s *RetryLayerTeamStore) GetUserTeamIds(userId string, allowFromCache bool) ([]string, error) { +func (s *RetryLayerTeamStore) GetUserTeamIds(userID string, allowFromCache bool) ([]string, error) { tries := 0 for { - result, err := s.TeamStore.GetUserTeamIds(userId, allowFromCache) + result, err := s.TeamStore.GetUserTeamIds(userID, allowFromCache) if err == nil { return result, nil } @@ -8632,17 +8632,17 @@ func (s *RetryLayerTeamStore) GroupSyncedTeamCount() (int64, error) { } -func (s *RetryLayerTeamStore) InvalidateAllTeamIdsForUser(userId string) { +func (s *RetryLayerTeamStore) InvalidateAllTeamIdsForUser(userID string) { - s.TeamStore.InvalidateAllTeamIdsForUser(userId) + s.TeamStore.InvalidateAllTeamIdsForUser(userID) } -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 } @@ -8698,11 +8698,11 @@ func (s *RetryLayerTeamStore) RemoveAllMembersByTeam(teamID string) error { } -func (s *RetryLayerTeamStore) RemoveAllMembersByUser(userId string) error { +func (s *RetryLayerTeamStore) RemoveAllMembersByUser(userID string) error { tries := 0 for { - err := s.TeamStore.RemoveAllMembersByUser(userId) + err := s.TeamStore.RemoveAllMembersByUser(userID) if err == nil { return nil } @@ -8718,11 +8718,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 } @@ -9018,11 +9018,11 @@ func (s *RetryLayerTeamStore) UpdateMultipleMembers(members []*model.TeamMember) } -func (s *RetryLayerTeamStore) UserBelongsToTeams(userId string, teamIds []string) (bool, error) { +func (s *RetryLayerTeamStore) UserBelongsToTeams(userID string, teamIds []string) (bool, error) { tries := 0 for { - result, err := s.TeamStore.UserBelongsToTeams(userId, teamIds) + result, err := s.TeamStore.UserBelongsToTeams(userID, teamIds) if err == nil { return result, nil } @@ -9118,11 +9118,11 @@ func (s *RetryLayerThreadStore) CollectThreadsWithNewerReplies(userId string, ch } -func (s *RetryLayerThreadStore) Delete(postId string) error { +func (s *RetryLayerThreadStore) Delete(postID string) error { tries := 0 for { - err := s.ThreadStore.Delete(postId) + err := s.ThreadStore.Delete(postID) if err == nil { return nil } @@ -9218,11 +9218,11 @@ func (s *RetryLayerThreadStore) GetMembershipsForUser(userId string, teamID stri } -func (s *RetryLayerThreadStore) GetPosts(threadId string, since int64) ([]*model.Post, error) { +func (s *RetryLayerThreadStore) GetPosts(threadID string, since int64) ([]*model.Post, error) { tries := 0 for { - result, err := s.ThreadStore.GetPosts(threadId, since) + result, err := s.ThreadStore.GetPosts(threadID, since) if err == nil { return result, nil } @@ -9238,11 +9238,11 @@ func (s *RetryLayerThreadStore) GetPosts(threadId string, since int64) ([]*model } -func (s *RetryLayerThreadStore) GetThreadForUser(userId string, teamId string, threadId string, extended bool) (*model.ThreadResponse, error) { +func (s *RetryLayerThreadStore) GetThreadForUser(userID string, teamID string, threadId string, extended bool) (*model.ThreadResponse, error) { tries := 0 for { - result, err := s.ThreadStore.GetThreadForUser(userId, teamId, threadId, extended) + result, err := s.ThreadStore.GetThreadForUser(userID, teamID, threadId, extended) if err == nil { return result, nil } @@ -9258,11 +9258,11 @@ func (s *RetryLayerThreadStore) GetThreadForUser(userId string, teamId string, t } -func (s *RetryLayerThreadStore) GetThreadsForUser(userId string, teamId string, opts model.GetUserThreadsOpts) (*model.Threads, error) { +func (s *RetryLayerThreadStore) GetThreadsForUser(userId string, teamID string, opts model.GetUserThreadsOpts) (*model.Threads, error) { tries := 0 for { - result, err := s.ThreadStore.GetThreadsForUser(userId, teamId, opts) + result, err := s.ThreadStore.GetThreadsForUser(userId, teamID, opts) if err == nil { return result, nil } @@ -9278,11 +9278,11 @@ func (s *RetryLayerThreadStore) GetThreadsForUser(userId string, teamId string, } -func (s *RetryLayerThreadStore) MaintainMembership(userId string, postID string, following bool, incrementMentions bool, updateFollowing bool, updateViewedTimestamp bool) error { +func (s *RetryLayerThreadStore) MaintainMembership(userID string, postID string, following bool, incrementMentions bool, updateFollowing bool, updateViewedTimestamp bool) error { tries := 0 for { - err := s.ThreadStore.MaintainMembership(userId, postID, following, incrementMentions, updateFollowing, updateViewedTimestamp) + err := s.ThreadStore.MaintainMembership(userID, postID, following, incrementMentions, updateFollowing, updateViewedTimestamp) if err == nil { return nil } @@ -9298,11 +9298,11 @@ func (s *RetryLayerThreadStore) MaintainMembership(userId string, postID 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 } @@ -9318,11 +9318,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 } @@ -9584,11 +9584,11 @@ func (s *RetryLayerUploadSessionStore) Get(id string) (*model.UploadSession, err } -func (s *RetryLayerUploadSessionStore) GetForUser(userId string) ([]*model.UploadSession, error) { +func (s *RetryLayerUploadSessionStore) GetForUser(userID string) ([]*model.UploadSession, error) { tries := 0 for { - result, err := s.UploadSessionStore.GetForUser(userId) + result, err := s.UploadSessionStore.GetForUser(userID) if err == nil { return result, nil } @@ -9970,11 +9970,11 @@ func (s *RetryLayerUserStore) GetAllProfiles(options *model.UserGetOptions) ([]* } -func (s *RetryLayerUserStore) GetAllProfilesInChannel(ctx context.Context, channelId string, allowFromCache bool) (map[string]*model.User, error) { +func (s *RetryLayerUserStore) GetAllProfilesInChannel(ctx context.Context, channelID string, allowFromCache bool) (map[string]*model.User, error) { tries := 0 for { - result, err := s.UserStore.GetAllProfilesInChannel(ctx, channelId, allowFromCache) + result, err := s.UserStore.GetAllProfilesInChannel(ctx, channelID, allowFromCache) if err == nil { return result, nil } @@ -10010,11 +10010,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 } @@ -10208,11 +10208,11 @@ func (s *RetryLayerUserStore) GetNewUsersForTeam(teamID string, offset int, limi } -func (s *RetryLayerUserStore) GetProfileByGroupChannelIdsForUser(userId string, channelIds []string) (map[string][]*model.User, error) { +func (s *RetryLayerUserStore) GetProfileByGroupChannelIdsForUser(userID string, channelIds []string) (map[string][]*model.User, error) { tries := 0 for { - result, err := s.UserStore.GetProfileByGroupChannelIdsForUser(userId, channelIds) + result, err := s.UserStore.GetProfileByGroupChannelIdsForUser(userID, channelIds) if err == nil { return result, nil } @@ -10328,11 +10328,11 @@ func (s *RetryLayerUserStore) GetProfilesInChannelByStatus(options *model.UserGe } -func (s *RetryLayerUserStore) GetProfilesNotInChannel(teamId string, channelId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { +func (s *RetryLayerUserStore) GetProfilesNotInChannel(teamID string, channelId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { tries := 0 for { - result, err := s.UserStore.GetProfilesNotInChannel(teamId, channelId, groupConstrained, offset, limit, viewRestrictions) + result, err := s.UserStore.GetProfilesNotInChannel(teamID, channelId, groupConstrained, offset, limit, viewRestrictions) if err == nil { return result, nil } @@ -10448,11 +10448,11 @@ func (s *RetryLayerUserStore) GetTeamGroupUsers(teamID string) ([]*model.User, e } -func (s *RetryLayerUserStore) GetUnreadCount(userId string) (int64, error) { +func (s *RetryLayerUserStore) GetUnreadCount(userID string) (int64, error) { tries := 0 for { - result, err := s.UserStore.GetUnreadCount(userId) + result, err := s.UserStore.GetUnreadCount(userID) if err == nil { return result, nil } @@ -10468,11 +10468,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 } @@ -10528,9 +10528,9 @@ func (s *RetryLayerUserStore) InferSystemInstallDate() (int64, error) { } -func (s *RetryLayerUserStore) InvalidateProfileCacheForUser(userId string) { +func (s *RetryLayerUserStore) InvalidateProfileCacheForUser(userID string) { - s.UserStore.InvalidateProfileCacheForUser(userId) + s.UserStore.InvalidateProfileCacheForUser(userID) } @@ -10540,17 +10540,17 @@ func (s *RetryLayerUserStore) InvalidateProfilesInChannelCache(channelID string) } -func (s *RetryLayerUserStore) InvalidateProfilesInChannelCacheByUser(userId string) { +func (s *RetryLayerUserStore) InvalidateProfilesInChannelCacheByUser(userID string) { - s.UserStore.InvalidateProfilesInChannelCacheByUser(userId) + s.UserStore.InvalidateProfilesInChannelCacheByUser(userID) } -func (s *RetryLayerUserStore) PermanentDelete(userId string) error { +func (s *RetryLayerUserStore) PermanentDelete(userID string) error { tries := 0 for { - err := s.UserStore.PermanentDelete(userId) + err := s.UserStore.PermanentDelete(userID) if err == nil { return nil } @@ -10586,11 +10586,11 @@ func (s *RetryLayerUserStore) PromoteGuestToUser(userID string) error { } -func (s *RetryLayerUserStore) ResetLastPictureUpdate(userId string) error { +func (s *RetryLayerUserStore) ResetLastPictureUpdate(userID string) error { tries := 0 for { - err := s.UserStore.ResetLastPictureUpdate(userId) + err := s.UserStore.ResetLastPictureUpdate(userID) if err == nil { return nil } @@ -10706,11 +10706,11 @@ func (s *RetryLayerUserStore) SearchNotInChannel(teamID string, channelID string } -func (s *RetryLayerUserStore) SearchNotInTeam(notInTeamId string, term string, options *model.UserSearchOptions) ([]*model.User, error) { +func (s *RetryLayerUserStore) SearchNotInTeam(notInTeamID string, term string, options *model.UserSearchOptions) ([]*model.User, error) { tries := 0 for { - result, err := s.UserStore.SearchNotInTeam(notInTeamId, term, options) + result, err := s.UserStore.SearchNotInTeam(notInTeamID, term, options) if err == nil { return result, nil } @@ -10766,11 +10766,11 @@ func (s *RetryLayerUserStore) Update(user *model.User, allowRoleUpdate bool) (*m } -func (s *RetryLayerUserStore) UpdateAuthData(userId string, service string, authData *string, email string, resetMfa bool) (string, error) { +func (s *RetryLayerUserStore) UpdateAuthData(userID string, service string, authData *string, email string, resetMfa bool) (string, error) { tries := 0 for { - result, err := s.UserStore.UpdateAuthData(userId, service, authData, email, resetMfa) + result, err := s.UserStore.UpdateAuthData(userID, service, authData, email, resetMfa) if err == nil { return result, nil } @@ -10786,11 +10786,11 @@ func (s *RetryLayerUserStore) UpdateAuthData(userId string, service string, auth } -func (s *RetryLayerUserStore) UpdateFailedPasswordAttempts(userId string, attempts int) error { +func (s *RetryLayerUserStore) UpdateFailedPasswordAttempts(userID string, attempts int) error { tries := 0 for { - err := s.UserStore.UpdateFailedPasswordAttempts(userId, attempts) + err := s.UserStore.UpdateFailedPasswordAttempts(userID, attempts) if err == nil { return nil } @@ -10806,11 +10806,11 @@ func (s *RetryLayerUserStore) UpdateFailedPasswordAttempts(userId string, attemp } -func (s *RetryLayerUserStore) UpdateLastPictureUpdate(userId string) error { +func (s *RetryLayerUserStore) UpdateLastPictureUpdate(userID string) error { tries := 0 for { - err := s.UserStore.UpdateLastPictureUpdate(userId) + err := s.UserStore.UpdateLastPictureUpdate(userID) if err == nil { return nil } @@ -10826,11 +10826,11 @@ func (s *RetryLayerUserStore) UpdateLastPictureUpdate(userId string) error { } -func (s *RetryLayerUserStore) UpdateMfaActive(userId string, active bool) error { +func (s *RetryLayerUserStore) UpdateMfaActive(userID string, active bool) error { tries := 0 for { - err := s.UserStore.UpdateMfaActive(userId, active) + err := s.UserStore.UpdateMfaActive(userID, active) if err == nil { return nil } @@ -10846,11 +10846,11 @@ func (s *RetryLayerUserStore) UpdateMfaActive(userId string, active bool) error } -func (s *RetryLayerUserStore) UpdateMfaSecret(userId string, secret string) error { +func (s *RetryLayerUserStore) UpdateMfaSecret(userID string, secret string) error { tries := 0 for { - err := s.UserStore.UpdateMfaSecret(userId, secret) + err := s.UserStore.UpdateMfaSecret(userID, secret) if err == nil { return nil } @@ -10866,11 +10866,11 @@ func (s *RetryLayerUserStore) UpdateMfaSecret(userId string, secret string) erro } -func (s *RetryLayerUserStore) UpdatePassword(userId string, newPassword string) error { +func (s *RetryLayerUserStore) UpdatePassword(userID string, newPassword string) error { tries := 0 for { - err := s.UserStore.UpdatePassword(userId, newPassword) + err := s.UserStore.UpdatePassword(userID, newPassword) if err == nil { return nil } @@ -10886,11 +10886,11 @@ func (s *RetryLayerUserStore) UpdatePassword(userId string, newPassword string) } -func (s *RetryLayerUserStore) UpdateUpdateAt(userId string) (int64, error) { +func (s *RetryLayerUserStore) UpdateUpdateAt(userID string) (int64, error) { tries := 0 for { - result, err := s.UserStore.UpdateUpdateAt(userId) + result, err := s.UserStore.UpdateUpdateAt(userID) if err == nil { return result, nil } @@ -10906,11 +10906,11 @@ func (s *RetryLayerUserStore) UpdateUpdateAt(userId string) (int64, error) { } -func (s *RetryLayerUserStore) VerifyEmail(userId string, email string) (string, error) { +func (s *RetryLayerUserStore) VerifyEmail(userID string, email string) (string, error) { tries := 0 for { - result, err := s.UserStore.VerifyEmail(userId, email) + result, err := s.UserStore.VerifyEmail(userID, email) if err == nil { return result, nil } @@ -10946,11 +10946,11 @@ func (s *RetryLayerUserAccessTokenStore) Delete(tokenID string) error { } -func (s *RetryLayerUserAccessTokenStore) DeleteAllForUser(userId string) error { +func (s *RetryLayerUserAccessTokenStore) DeleteAllForUser(userID string) error { tries := 0 for { - err := s.UserAccessTokenStore.DeleteAllForUser(userId) + err := s.UserAccessTokenStore.DeleteAllForUser(userID) if err == nil { return nil } @@ -11026,11 +11026,11 @@ func (s *RetryLayerUserAccessTokenStore) GetByToken(tokenString string) (*model. } -func (s *RetryLayerUserAccessTokenStore) GetByUser(userId string, page int, perPage int) ([]*model.UserAccessToken, error) { +func (s *RetryLayerUserAccessTokenStore) GetByUser(userID string, page int, perPage int) ([]*model.UserAccessToken, error) { tries := 0 for { - result, err := s.UserAccessTokenStore.GetByUser(userId, page, perPage) + result, err := s.UserAccessTokenStore.GetByUser(userID, page, perPage) if err == nil { return result, nil } @@ -11126,11 +11126,11 @@ func (s *RetryLayerUserAccessTokenStore) UpdateTokenEnable(tokenID string) error } -func (s *RetryLayerUserTermsOfServiceStore) Delete(userId string, termsOfServiceId string) error { +func (s *RetryLayerUserTermsOfServiceStore) Delete(userID string, termsOfServiceId string) error { tries := 0 for { - err := s.UserTermsOfServiceStore.Delete(userId, termsOfServiceId) + err := s.UserTermsOfServiceStore.Delete(userID, termsOfServiceId) if err == nil { return nil } @@ -11146,11 +11146,11 @@ func (s *RetryLayerUserTermsOfServiceStore) Delete(userId string, termsOfService } -func (s *RetryLayerUserTermsOfServiceStore) GetByUser(userId string) (*model.UserTermsOfService, error) { +func (s *RetryLayerUserTermsOfServiceStore) GetByUser(userID string) (*model.UserTermsOfService, error) { tries := 0 for { - result, err := s.UserTermsOfServiceStore.GetByUser(userId) + result, err := s.UserTermsOfServiceStore.GetByUser(userID) if err == nil { return result, nil } @@ -11332,11 +11332,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 } @@ -11372,11 +11372,11 @@ func (s *RetryLayerWebhookStore) GetIncomingList(offset int, limit int) ([]*mode } -func (s *RetryLayerWebhookStore) GetIncomingListByUser(userId string, offset int, limit int) ([]*model.IncomingWebhook, error) { +func (s *RetryLayerWebhookStore) GetIncomingListByUser(userID string, offset int, limit int) ([]*model.IncomingWebhook, error) { tries := 0 for { - result, err := s.WebhookStore.GetIncomingListByUser(userId, offset, limit) + result, err := s.WebhookStore.GetIncomingListByUser(userID, offset, limit) if err == nil { return result, nil } @@ -11432,11 +11432,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 } @@ -11472,11 +11472,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 } @@ -11512,11 +11512,11 @@ func (s *RetryLayerWebhookStore) GetOutgoingList(offset int, limit int) ([]*mode } -func (s *RetryLayerWebhookStore) GetOutgoingListByUser(userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { +func (s *RetryLayerWebhookStore) GetOutgoingListByUser(userID string, offset int, limit int) ([]*model.OutgoingWebhook, error) { tries := 0 for { - result, err := s.WebhookStore.GetOutgoingListByUser(userId, offset, limit) + result, err := s.WebhookStore.GetOutgoingListByUser(userID, offset, limit) if err == nil { return result, nil } @@ -11558,11 +11558,11 @@ func (s *RetryLayerWebhookStore) PermanentDeleteIncomingByChannel(channelID stri } -func (s *RetryLayerWebhookStore) PermanentDeleteIncomingByUser(userId string) error { +func (s *RetryLayerWebhookStore) PermanentDeleteIncomingByUser(userID string) error { tries := 0 for { - err := s.WebhookStore.PermanentDeleteIncomingByUser(userId) + err := s.WebhookStore.PermanentDeleteIncomingByUser(userID) if err == nil { return nil } @@ -11598,11 +11598,11 @@ func (s *RetryLayerWebhookStore) PermanentDeleteOutgoingByChannel(channelID stri } -func (s *RetryLayerWebhookStore) PermanentDeleteOutgoingByUser(userId string) error { +func (s *RetryLayerWebhookStore) PermanentDeleteOutgoingByUser(userID string) error { tries := 0 for { - err := s.WebhookStore.PermanentDeleteOutgoingByUser(userId) + err := s.WebhookStore.PermanentDeleteOutgoingByUser(userID) if err == nil { return nil } diff --git a/store/store.go b/store/store.go index b9042003c4..daf930e83b 100644 --- a/store/store.go +++ b/store/store.go @@ -91,7 +91,7 @@ type TeamStore interface { GetAllPublicTeamPageListing(offset int, limit int) ([]*model.Team, error) GetAllTeamListing() ([]*model.Team, error) GetAllTeamPageListing(offset int, limit int) ([]*model.Team, error) - GetTeamsByUserId(userId string) ([]*model.Team, error) + GetTeamsByUserId(userID string) ([]*model.Team, error) GetByInviteId(inviteID string) (*model.Team, error) PermanentDelete(teamID string) error AnalyticsTeamCount(includeDeleted bool) (int64, error) @@ -101,30 +101,30 @@ 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(ctx context.Context, teamID string, userId string) (*model.TeamMember, error) + GetMember(ctx context.Context, 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 + 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 - RemoveAllMembersByUser(userId 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) + 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) - GetTeamMembersForExport(userId string) ([]*model.TeamMemberForExport, error) - UserBelongsToTeams(userId string, teamIds []string) (bool, error) - GetUserTeamIds(userId string, allowFromCache bool) ([]string, error) - InvalidateAllTeamIdsForUser(userId string) + GetTeamMembersForExport(userID string) ([]*model.TeamMemberForExport, error) + UserBelongsToTeams(userID string, teamIds []string) (bool, error) + GetUserTeamIds(userID string, allowFromCache bool) ([]string, error) + InvalidateAllTeamIdsForUser(userID string) ClearCaches() // UpdateMembersRole sets all of the given team members to admins and all of the other members of the team to @@ -137,11 +137,11 @@ type TeamStore interface { type ChannelStore interface { Save(channel *model.Channel, maxChannelsPerTeam int64) (*model.Channel, error) - CreateDirectChannel(userId *model.User, otherUserId *model.User, channelOptions ...model.ChannelOption) (*model.Channel, error) + CreateDirectChannel(userID *model.User, otherUserID *model.User, channelOptions ...model.ChannelOption) (*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 + ClearSidebarOnTeamLeave(userID, teamID string) error Get(id string, allowFromCache bool) (*model.Channel, error) InvalidateChannel(id string) InvalidateChannelByName(teamID, name string) @@ -155,15 +155,15 @@ type ChannelStore interface { 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) + 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) 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) + 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) + 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) @@ -173,14 +173,14 @@ type ChannelStore interface { UpdateMember(member *model.ChannelMember) (*model.ChannelMember, error) UpdateMultipleMembers(members []*model.ChannelMember) ([]*model.ChannelMember, error) GetMembers(channelID string, offset, limit int) (*model.ChannelMembers, error) - GetMember(ctx context.Context, channelID string, userId string) (*model.ChannelMember, error) + GetMember(ctx context.Context, 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 + 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) + GetMemberForPost(postID string, userID string) (*model.ChannelMember, error) InvalidateMemberCount(channelID string) GetMemberCountFromCache(channelID string) int64 GetMemberCount(channelID string, allowFromCache bool) (int64, error) @@ -190,51 +190,51 @@ type ChannelStore interface { InvalidateGuestCount(channelID string) GetGuestCount(channelID string, allowFromCache bool) (int64, error) GetPinnedPosts(channelID string) (*model.PostList, error) - RemoveMember(channelID string, userId string) error + RemoveMember(channelID string, userID string) error RemoveMembers(channelID string, userIds []string) error - PermanentDeleteMembersByUser(userId string) error + PermanentDeleteMembersByUser(userID string) error PermanentDeleteMembersByChannel(channelID string) error - UpdateLastViewedAt(channelIds []string, userId string, updateThreads bool) (map[string]int64, error) + UpdateLastViewedAt(channelIds []string, userID string, updateThreads bool) (map[string]int64, error) UpdateLastViewedAtPost(unreadPost *model.Post, userID string, mentionCount, mentionCountRoot int, updateThreads bool) (*model.ChannelUnreadAt, error) - CountPostsAfter(channelID string, timestamp int64, userId string) (int, int, error) - IncrementMentionCount(channelID string, userId string, updateThreads, isRoot bool) error + CountPostsAfter(channelID string, timestamp int64, userID string) (int, int, error) + IncrementMentionCount(channelID string, userID string, updateThreads, isRoot 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) + 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) + 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) - SearchGroupChannels(userId, term string) (*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) - GetMembersByChannelIds(channelIds []string, userId 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) + GetChannelUnread(channelID, userID string) (*model.ChannelUnread, error) ClearCaches() GetChannelsByScheme(schemeID string, offset int, limit int) (model.ChannelList, error) - MigrateChannelMembers(fromChannelId string, fromUserId string) (map[string]string, error) + MigrateChannelMembers(fromChannelID string, fromUserID string) (map[string]string, error) ResetAllChannelSchemes() error ClearAllCustomRoleAssignments() error MigratePublicChannels() error - CreateInitialSidebarCategories(userId, teamID string) (*model.OrderedSidebarCategories, error) - GetSidebarCategories(userId, teamID string) (*model.OrderedSidebarCategories, error) + CreateInitialSidebarCategories(userID, teamID string) (*model.OrderedSidebarCategories, 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) + 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) + 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) + UserBelongsToChannels(userID string, channelIds []string) (bool, error) // UpdateMembersRole sets all of the given team members to admins and all of the other members of the team to // non-admin members. @@ -249,8 +249,8 @@ type ChannelStore interface { } type ChannelMemberHistoryStore interface { - LogJoinEvent(userId string, channelID string, joinTime int64) error - LogLeaveEvent(userId string, channelID string, leaveTime int64) 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) } @@ -259,20 +259,20 @@ type ThreadStore interface { Save(thread *model.Thread) (*model.Thread, error) Update(thread *model.Thread) (*model.Thread, error) Get(id string) (*model.Thread, error) - GetThreadsForUser(userId, teamId string, opts model.GetUserThreadsOpts) (*model.Threads, error) - GetThreadForUser(userId, teamId, threadId string, extended bool) (*model.ThreadResponse, error) - Delete(postId string) error - GetPosts(threadId string, since int64) ([]*model.Post, error) + GetThreadsForUser(userId, teamID string, opts model.GetUserThreadsOpts) (*model.Threads, error) + GetThreadForUser(userID, teamID, threadId string, extended bool) (*model.ThreadResponse, error) + Delete(postID string) error + GetPosts(threadID string, since int64) ([]*model.Post, 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 - MaintainMembership(userId, postID string, following, incrementMentions, updateFollowing, updateViewedTimestamp bool) error + MaintainMembership(userID, postID string, following, incrementMentions, updateFollowing, updateViewedTimestamp bool) error CollectThreadsWithNewerReplies(userId string, channelIds []string, timestamp int64) ([]string, error) UpdateUnreadsByChannel(userId string, changedThreads []string, timestamp int64, updateViewedTimestamp bool) error } @@ -284,13 +284,13 @@ type PostStore interface { Get(ctx context.Context, id string, skipFetchThreads, collapsedThreads, collapsedThreadsExtended bool, userID string) (*model.PostList, error) GetSingle(id string, inclDeleted bool) (*model.Post, error) Delete(postID string, time int64, deleteByID string) error - PermanentDeleteByUser(userId string) error + PermanentDeleteByUser(userID 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) + 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) GetPostsBefore(options model.GetPostsOptions) (*model.PostList, error) GetPostsAfter(options model.GetPostsOptions) (*model.PostList, error) GetPostsSince(options model.GetPostsSinceOptions, allowFromCache bool) (*model.PostList, error) @@ -298,7 +298,7 @@ type PostStore interface { GetPostIdAfterTime(channelID string, time int64, collapsedThreads bool) (string, error) GetPostIdBeforeTime(channelID string, time int64, collapsedThreads bool) (string, error) GetEtag(channelID string, allowFromCache bool, collapsedThreads bool) string - Search(teamID string, userId string, params *model.SearchParams) (*model.PostList, error) + 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) @@ -315,7 +315,7 @@ type PostStore interface { 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) + SearchPostsInTeamForUser(paramsList []*model.SearchParams, userID, teamID string, page, perPage int) (*model.PostSearchResults, error) GetOldestEntityCreationTime() (int64, error) GetPostsSinceForSync(options model.GetPostsSinceForSyncOptions, allowFromCache bool) ([]*model.Post, error) } @@ -323,51 +323,51 @@ type PostStore interface { type UserStore interface { Save(user *model.User) (*model.User, error) Update(user *model.User, allowRoleUpdate bool) (*model.UserUpdate, error) - UpdateLastPictureUpdate(userId string) error - ResetLastPictureUpdate(userId string) error - UpdatePassword(userId, newPassword string) error - UpdateUpdateAt(userId string) (int64, error) - UpdateAuthData(userId string, service string, authData *string, email string, resetMfa bool) (string, error) - UpdateMfaSecret(userId, secret string) error - UpdateMfaActive(userId string, active bool) error + UpdateLastPictureUpdate(userID string) error + ResetLastPictureUpdate(userID string) error + UpdatePassword(userID, newPassword string) error + UpdateUpdateAt(userID string) (int64, error) + UpdateAuthData(userID string, service string, authData *string, email string, resetMfa bool) (string, error) + UpdateMfaSecret(userID, secret string) error + UpdateMfaActive(userID string, active bool) error Get(ctx context.Context, id string) (*model.User, error) GetMany(ctx context.Context, ids []string) ([]*model.User, error) GetAll() ([]*model.User, error) ClearCaches() - InvalidateProfilesInChannelCacheByUser(userId string) + InvalidateProfilesInChannelCacheByUser(userID 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) - GetProfilesNotInChannel(teamId string, channelId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) + GetAllProfilesInChannel(ctx context.Context, channelID string, allowFromCache bool) (map[string]*model.User, error) + GetProfilesNotInChannel(teamID string, channelId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) GetProfilesWithoutTeam(options *model.UserGetOptions) ([]*model.User, error) GetProfilesByUsernames(usernames []string, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) GetAllProfiles(options *model.UserGetOptions) ([]*model.User, error) GetProfiles(options *model.UserGetOptions) ([]*model.User, error) GetProfileByIds(ctx context.Context, userIds []string, options *UserGetByIdsOpts, allowFromCache bool) ([]*model.User, error) - GetProfileByGroupChannelIdsForUser(userId string, channelIds []string) (map[string][]*model.User, error) - InvalidateProfileCacheForUser(userId string) + GetProfileByGroupChannelIdsForUser(userID string, channelIds []string) (map[string][]*model.User, error) + InvalidateProfileCacheForUser(userID string) GetByEmail(email string) (*model.User, error) GetByAuth(authData *string, authService string) (*model.User, error) 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) - VerifyEmail(userId, email string) (string, error) + VerifyEmail(userID, email string) (string, error) GetEtagForAllProfiles() string GetEtagForProfiles(teamID string) string - UpdateFailedPasswordAttempts(userId string, attempts int) error + UpdateFailedPasswordAttempts(userID string, attempts int) error GetSystemAdminProfiles() (map[string]*model.User, error) - PermanentDelete(userId string) 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) + 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) - SearchNotInTeam(notInTeamId 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) SearchWithoutTeam(term string, options *model.UserSearchOptions) ([]*model.User, error) @@ -393,18 +393,18 @@ type UserStore interface { } type BotStore interface { - Get(userId string, includeDeleted bool) (*model.Bot, error) + Get(userID string, includeDeleted bool) (*model.Bot, error) GetAll(options *model.BotGetOptions) ([]*model.Bot, error) Save(bot *model.Bot) (*model.Bot, error) Update(bot *model.Bot) (*model.Bot, error) - PermanentDelete(userId string) error + PermanentDelete(userID string) error } type SessionStore interface { Get(ctx context.Context, sessionIDOrToken string) (*model.Session, error) Save(session *model.Session) (*model.Session, error) - GetSessions(userId string) ([]*model.Session, error) - GetSessionsWithActiveDeviceIds(userId string) ([]*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 @@ -412,7 +412,7 @@ type SessionStore interface { PermanentDeleteSessionsByUser(teamID string) error UpdateExpiresAt(sessionID string, time int64) error UpdateLastActivityAt(sessionID string, time int64) error - UpdateRoles(userId string, roles string) (string, error) + UpdateRoles(userID string, roles string) (string, error) UpdateDeviceId(id string, deviceID string, expiresAt int64) (string, error) UpdateProps(session *model.Session) error AnalyticsSessionCount() (int64, error) @@ -422,7 +422,7 @@ type SessionStore interface { type AuditStore interface { Save(audit *model.Audit) error Get(user_id string, offset int, limit int) (model.Audits, error) - PermanentDeleteByUser(userId string) error + PermanentDeleteByUser(userID string) error } type ClusterDiscoveryStore interface { @@ -457,20 +457,20 @@ type OAuthStore interface { SaveApp(app *model.OAuthApp) (*model.OAuthApp, error) UpdateApp(app *model.OAuthApp) (*model.OAuthApp, error) GetApp(id string) (*model.OAuthApp, error) - GetAppByUser(userId string, offset, limit int) ([]*model.OAuthApp, error) + GetAppByUser(userID string, offset, limit int) ([]*model.OAuthApp, error) GetApps(offset, limit int) ([]*model.OAuthApp, error) - GetAuthorizedApps(userId string, offset, limit int) ([]*model.OAuthApp, error) + GetAuthorizedApps(userID string, offset, limit int) ([]*model.OAuthApp, error) DeleteApp(id string) error SaveAuthData(authData *model.AuthData) (*model.AuthData, error) GetAuthData(code string) (*model.AuthData, error) RemoveAuthData(code string) error - PermanentDeleteAuthDataByUser(userId string) error + PermanentDeleteAuthDataByUser(userID string) error SaveAccessData(accessData *model.AccessData) (*model.AccessData, error) UpdateAccessData(accessData *model.AccessData) (*model.AccessData, error) GetAccessData(token string) (*model.AccessData, error) - GetAccessDataByUserForApp(userId, clientId string) ([]*model.AccessData, error) + GetAccessDataByUserForApp(userID, clientId string) ([]*model.AccessData, error) GetAccessDataByRefreshToken(token string) (*model.AccessData, error) - GetPreviousAccessData(userId, clientId string) (*model.AccessData, error) + GetPreviousAccessData(userID, clientId string) (*model.AccessData, error) RemoveAccessData(token string) error RemoveAllAccessData() error } @@ -490,26 +490,26 @@ type WebhookStore interface { SaveIncoming(webhook *model.IncomingWebhook) (*model.IncomingWebhook, error) GetIncoming(id string, allowFromCache bool) (*model.IncomingWebhook, error) GetIncomingList(offset, limit int) ([]*model.IncomingWebhook, error) - GetIncomingListByUser(userId string, 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) + 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 - PermanentDeleteIncomingByUser(userId 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) + 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) + 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) + 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 + PermanentDeleteOutgoingByUser(userID string) error UpdateOutgoing(hook *model.OutgoingWebhook) (*model.OutgoingWebhook, error) AnalyticsIncomingCount(teamID string) (int64, error) @@ -525,7 +525,7 @@ type CommandStore interface { GetByTeam(teamID string) ([]*model.Command, error) Delete(commandID string, time int64) error PermanentDeleteByTeam(teamID string) error - PermanentDeleteByUser(userId string) error + PermanentDeleteByUser(userID string) error Update(hook *model.Command) (*model.Command, error) AnalyticsCommandCount(teamID string) (int64, error) } @@ -539,13 +539,13 @@ type CommandWebhookStore interface { type PreferenceStore interface { Save(preferences *model.Preferences) error - GetCategory(userId string, category string) (model.Preferences, error) - Get(userId string, category string, name string) (*model.Preference, error) - GetAll(userId string) (model.Preferences, error) - Delete(userId, category, name string) error - DeleteCategory(userId string, category string) error + GetCategory(userID string, category string) (model.Preferences, error) + Get(userID string, category string, name string) (*model.Preference, error) + GetAll(userID string) (model.Preferences, error) + Delete(userID, category, name string) error + DeleteCategory(userID string, category string) error DeleteCategoryAndName(category string, name string) error - PermanentDeleteByUser(userId string) error + PermanentDeleteByUser(userID string) error CleanupFlagsBatch(limit int64) (int64, error) } @@ -574,11 +574,11 @@ type EmojiStore interface { type StatusStore interface { SaveOrUpdate(status *model.Status) error - Get(userId string) (*model.Status, error) + Get(userID string) (*model.Status, error) GetByIds(userIds []string) ([]*model.Status, error) ResetAll() error GetTotalActiveUsersCount() (int64, error) - UpdateLastActivityAt(userId string, lastActivityAt int64) error + UpdateLastActivityAt(userID string, lastActivityAt int64) error } type FileInfoStore interface { @@ -588,16 +588,16 @@ type FileInfoStore interface { GetByIds(ids []string) ([]*model.FileInfo, error) GetByPath(path string) (*model.FileInfo, error) GetForPost(postID string, readFromMaster, includeDeleted, allowFromCache bool) ([]*model.FileInfo, error) - GetForUser(userId string) ([]*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 + 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) + PermanentDeleteByUser(userID string) (int64, error) SetContent(fileID, content string) error - Search(paramsList []*model.SearchParams, userId, teamID string, page, perPage int) (*model.FileInfoList, error) + Search(paramsList []*model.SearchParams, userID, teamID string, page, perPage int) (*model.FileInfoList, error) CountAll() (int64, error) GetFilesBatchForIndexing(startTime, endTime int64, limit int) ([]*model.FileForIndexing, error) ClearCaches() @@ -607,7 +607,7 @@ type UploadSessionStore interface { Save(session *model.UploadSession) (*model.UploadSession, error) Update(session *model.UploadSession) error Get(id string) (*model.UploadSession, error) - GetForUser(userId string) ([]*model.UploadSession, error) + GetForUser(userID string) ([]*model.UploadSession, error) Delete(id string) error } @@ -639,12 +639,12 @@ type JobStore interface { type UserAccessTokenStore interface { Save(token *model.UserAccessToken) (*model.UserAccessToken, error) - DeleteAllForUser(userId string) error + DeleteAllForUser(userID string) 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) + GetByUser(userID string, page, perPage int) ([]*model.UserAccessToken, error) Search(term string) ([]*model.UserAccessToken, error) UpdateTokenEnable(tokenID string) error UpdateTokenDisable(tokenID string) error @@ -701,16 +701,16 @@ type TermsOfServiceStore interface { } type ProductNoticesStore interface { - View(userId string, notices []string) error + View(userID string, notices []string) error Clear(notices []string) error ClearOldNotices(currentNotices *model.ProductNotices) error - GetViews(userId string) ([]model.ProductNoticeViewState, error) + GetViews(userID string) ([]model.ProductNoticeViewState, error) } type UserTermsOfServiceStore interface { - GetByUser(userId string) (*model.UserTermsOfService, error) + GetByUser(userID string) (*model.UserTermsOfService, error) Save(userTermsOfService *model.UserTermsOfService) (*model.UserTermsOfService, error) - Delete(userId, termsOfServiceId string) error + Delete(userID, termsOfServiceId string) error } type GroupStore interface { @@ -720,7 +720,7 @@ type GroupStore interface { GetByIDs(groupIDs []string) ([]*model.Group, error) GetByRemoteID(remoteID string, groupSource model.GroupSource) (*model.Group, error) GetAllBySource(groupSource model.GroupSource) ([]*model.Group, error) - GetByUser(userId string) ([]*model.Group, error) + GetByUser(userID string) ([]*model.Group, error) Update(group *model.Group) (*model.Group, error) Delete(groupID string) (*model.Group, error) @@ -733,7 +733,7 @@ type GroupStore interface { UpsertMember(groupID string, userID string) (*model.GroupMember, error) DeleteMember(groupID string, userID string) (*model.GroupMember, error) - PermanentDeleteMembersByUser(userId string) error + PermanentDeleteMembersByUser(userID string) error CreateGroupSyncable(groupSyncable *model.GroupSyncable) (*model.GroupSyncable, error) GetGroupSyncable(groupID string, syncableID string, syncableType model.GroupSyncableType) (*model.GroupSyncable, error) @@ -793,7 +793,7 @@ type GroupStore interface { // GroupMemberCount returns the total count of records in the GroupMembers table. GroupMemberCount() (int64, error) - // DistinctGroupMemberCount returns the count of records in the GroupMembers table with distinct UserId values. + // DistinctGroupMemberCount returns the count of records in the GroupMembers table with distinct userID values. DistinctGroupMemberCount() (int64, error) // GroupCountWithAllowReference returns the count of records in the Groups table with AllowReference set to true. diff --git a/store/storetest/mocks/AuditStore.go b/store/storetest/mocks/AuditStore.go index b33fd5a6f6..03f9eb0a55 100644 --- a/store/storetest/mocks/AuditStore.go +++ b/store/storetest/mocks/AuditStore.go @@ -37,13 +37,13 @@ func (_m *AuditStore) Get(user_id string, offset int, limit int) (model.Audits, return r0, r1 } -// PermanentDeleteByUser provides a mock function with given fields: userId -func (_m *AuditStore) PermanentDeleteByUser(userId string) error { - ret := _m.Called(userId) +// PermanentDeleteByUser provides a mock function with given fields: userID +func (_m *AuditStore) PermanentDeleteByUser(userID string) error { + ret := _m.Called(userID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(userId) + r0 = rf(userID) } else { r0 = ret.Error(0) } diff --git a/store/storetest/mocks/BotStore.go b/store/storetest/mocks/BotStore.go index 0dd2a00eb4..8126a2a742 100644 --- a/store/storetest/mocks/BotStore.go +++ b/store/storetest/mocks/BotStore.go @@ -14,13 +14,13 @@ type BotStore struct { mock.Mock } -// Get provides a mock function with given fields: userId, includeDeleted -func (_m *BotStore) Get(userId string, includeDeleted bool) (*model.Bot, error) { - ret := _m.Called(userId, includeDeleted) +// Get provides a mock function with given fields: userID, includeDeleted +func (_m *BotStore) Get(userID string, includeDeleted bool) (*model.Bot, error) { + ret := _m.Called(userID, includeDeleted) var r0 *model.Bot if rf, ok := ret.Get(0).(func(string, bool) *model.Bot); ok { - r0 = rf(userId, includeDeleted) + r0 = rf(userID, includeDeleted) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.Bot) @@ -29,7 +29,7 @@ func (_m *BotStore) Get(userId string, includeDeleted bool) (*model.Bot, error) var r1 error if rf, ok := ret.Get(1).(func(string, bool) error); ok { - r1 = rf(userId, includeDeleted) + r1 = rf(userID, includeDeleted) } else { r1 = ret.Error(1) } @@ -60,13 +60,13 @@ func (_m *BotStore) GetAll(options *model.BotGetOptions) ([]*model.Bot, error) { return r0, r1 } -// PermanentDelete provides a mock function with given fields: userId -func (_m *BotStore) PermanentDelete(userId string) error { - ret := _m.Called(userId) +// PermanentDelete provides a mock function with given fields: userID +func (_m *BotStore) PermanentDelete(userID string) error { + ret := _m.Called(userID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(userId) + r0 = rf(userID) } else { r0 = ret.Error(0) } diff --git a/store/storetest/mocks/ChannelMemberHistoryStore.go b/store/storetest/mocks/ChannelMemberHistoryStore.go index 70af87e459..0ade64e1df 100644 --- a/store/storetest/mocks/ChannelMemberHistoryStore.go +++ b/store/storetest/mocks/ChannelMemberHistoryStore.go @@ -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 1a49bbd60a..72d600179f 100644 --- a/store/storetest/mocks/ChannelStore.go +++ b/store/storetest/mocks/ChannelStore.go @@ -83,13 +83,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) @@ -98,7 +98,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) } @@ -125,13 +125,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) } @@ -139,27 +139,27 @@ 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, 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, 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 int if rf, ok := ret.Get(1).(func(string, int64, string) int); ok { - r1 = rf(channelID, timestamp, userId) + r1 = rf(channelID, timestamp, userID) } else { r1 = ret.Get(1).(int) } var r2 error if rf, ok := ret.Get(2).(func(string, int64, string) error); ok { - r2 = rf(channelID, timestamp, userId) + r2 = rf(channelID, timestamp, userID) } else { r2 = ret.Error(2) } @@ -167,20 +167,20 @@ func (_m *ChannelStore) CountPostsAfter(channelID string, timestamp int64, userI return r0, r1, r2 } -// CreateDirectChannel provides a mock function with given fields: userId, otherUserId, channelOptions -func (_m *ChannelStore) CreateDirectChannel(userId *model.User, otherUserId *model.User, channelOptions ...model.ChannelOption) (*model.Channel, error) { +// CreateDirectChannel provides a mock function with given fields: userID, otherUserID, channelOptions +func (_m *ChannelStore) CreateDirectChannel(userID *model.User, otherUserID *model.User, channelOptions ...model.ChannelOption) (*model.Channel, error) { _va := make([]interface{}, len(channelOptions)) for _i := range channelOptions { _va[_i] = channelOptions[_i] } var _ca []interface{} - _ca = append(_ca, userId, otherUserId) + _ca = append(_ca, userID, otherUserID) _ca = append(_ca, _va...) ret := _m.Called(_ca...) var r0 *model.Channel if rf, ok := ret.Get(0).(func(*model.User, *model.User, ...model.ChannelOption) *model.Channel); ok { - r0 = rf(userId, otherUserId, channelOptions...) + r0 = rf(userID, otherUserID, channelOptions...) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.Channel) @@ -189,7 +189,7 @@ func (_m *ChannelStore) CreateDirectChannel(userId *model.User, otherUserId *mod var r1 error if rf, ok := ret.Get(1).(func(*model.User, *model.User, ...model.ChannelOption) error); ok { - r1 = rf(userId, otherUserId, channelOptions...) + r1 = rf(userID, otherUserID, channelOptions...) } else { r1 = ret.Error(1) } @@ -197,13 +197,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) (*model.OrderedSidebarCategories, error) { - ret := _m.Called(userId, teamID) +// CreateInitialSidebarCategories provides a mock function with given fields: userID, teamID +func (_m *ChannelStore) CreateInitialSidebarCategories(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) @@ -212,7 +212,7 @@ func (_m *ChannelStore) CreateInitialSidebarCategories(userId string, teamID str 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) } @@ -220,13 +220,13 @@ func (_m *ChannelStore) CreateInitialSidebarCategories(userId string, teamID str return r0, r1 } -// 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) @@ -235,7 +235,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) } @@ -331,13 +331,13 @@ func (_m *ChannelStore) GetAll(teamID string) ([]*model.Channel, error) { return r0, r1 } -// GetAllChannelMembersForUser provides a mock function with given fields: userId, allowFromCache, includeDeleted -func (_m *ChannelStore) GetAllChannelMembersForUser(userId string, allowFromCache bool, includeDeleted bool) (map[string]string, error) { - ret := _m.Called(userId, allowFromCache, includeDeleted) +// GetAllChannelMembersForUser provides a mock function with given fields: userID, allowFromCache, includeDeleted +func (_m *ChannelStore) GetAllChannelMembersForUser(userID string, allowFromCache bool, includeDeleted bool) (map[string]string, error) { + ret := _m.Called(userID, allowFromCache, includeDeleted) var r0 map[string]string if rf, ok := ret.Get(0).(func(string, bool, bool) map[string]string); ok { - r0 = rf(userId, allowFromCache, includeDeleted) + r0 = rf(userID, allowFromCache, includeDeleted) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(map[string]string) @@ -346,7 +346,7 @@ func (_m *ChannelStore) GetAllChannelMembersForUser(userId string, allowFromCach var r1 error if rf, ok := ret.Get(1).(func(string, bool, bool) error); ok { - r1 = rf(userId, allowFromCache, includeDeleted) + r1 = rf(userID, allowFromCache, includeDeleted) } else { r1 = ret.Error(1) } @@ -536,13 +536,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) @@ -551,7 +551,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) } @@ -559,13 +559,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) @@ -574,7 +574,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) } @@ -605,13 +605,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) @@ -620,7 +620,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) } @@ -628,13 +628,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) @@ -643,7 +643,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) } @@ -720,13 +720,13 @@ func (_m *ChannelStore) GetChannelsByScheme(schemeID string, offset int, limit i return r0, r1 } -// GetDeleted provides a mock function with given fields: team_id, offset, limit, userId -func (_m *ChannelStore) GetDeleted(team_id string, offset int, limit int, userId string) (*model.ChannelList, error) { - ret := _m.Called(team_id, offset, limit, userId) +// GetDeleted provides a mock function with given fields: team_id, offset, limit, userID +func (_m *ChannelStore) GetDeleted(team_id string, offset int, limit int, userID string) (*model.ChannelList, error) { + ret := _m.Called(team_id, offset, limit, userID) var r0 *model.ChannelList if rf, ok := ret.Get(0).(func(string, int, int, string) *model.ChannelList); ok { - r0 = rf(team_id, offset, limit, userId) + r0 = rf(team_id, offset, limit, userID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelList) @@ -735,7 +735,7 @@ func (_m *ChannelStore) GetDeleted(team_id string, offset int, limit int, userId var r1 error if rf, ok := ret.Get(1).(func(string, int, int, string) error); ok { - r1 = rf(team_id, offset, limit, userId) + r1 = rf(team_id, offset, limit, userID) } else { r1 = ret.Error(1) } @@ -833,13 +833,13 @@ func (_m *ChannelStore) GetGuestCount(channelID string, allowFromCache bool) (in return r0, r1 } -// GetMember provides a mock function with given fields: ctx, channelID, userId -func (_m *ChannelStore) GetMember(ctx context.Context, channelID string, userId string) (*model.ChannelMember, error) { - ret := _m.Called(ctx, channelID, userId) +// GetMember provides a mock function with given fields: ctx, channelID, userID +func (_m *ChannelStore) GetMember(ctx context.Context, channelID string, userID string) (*model.ChannelMember, error) { + ret := _m.Called(ctx, channelID, userID) var r0 *model.ChannelMember if rf, ok := ret.Get(0).(func(context.Context, string, string) *model.ChannelMember); ok { - r0 = rf(ctx, channelID, userId) + r0 = rf(ctx, channelID, userID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelMember) @@ -848,7 +848,7 @@ func (_m *ChannelStore) GetMember(ctx context.Context, channelID string, userId var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { - r1 = rf(ctx, channelID, userId) + r1 = rf(ctx, channelID, userID) } else { r1 = ret.Error(1) } @@ -914,13 +914,13 @@ func (_m *ChannelStore) GetMemberCountsByGroup(ctx context.Context, channelID st 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) @@ -929,7 +929,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) } @@ -960,13 +960,13 @@ func (_m *ChannelStore) GetMembers(channelID string, offset int, limit int) (*mo return r0, r1 } -// GetMembersByChannelIds provides a mock function with given fields: channelIds, userId -func (_m *ChannelStore) GetMembersByChannelIds(channelIds []string, userId string) (*model.ChannelMembers, error) { - ret := _m.Called(channelIds, userId) +// GetMembersByChannelIds provides a mock function with given fields: channelIds, userID +func (_m *ChannelStore) GetMembersByChannelIds(channelIds []string, userID string) (*model.ChannelMembers, error) { + ret := _m.Called(channelIds, userID) var r0 *model.ChannelMembers if rf, ok := ret.Get(0).(func([]string, string) *model.ChannelMembers); ok { - r0 = rf(channelIds, userId) + r0 = rf(channelIds, userID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelMembers) @@ -975,7 +975,7 @@ func (_m *ChannelStore) GetMembersByChannelIds(channelIds []string, userId strin var r1 error if rf, ok := ret.Get(1).(func([]string, string) error); ok { - r1 = rf(channelIds, userId) + r1 = rf(channelIds, userID) } else { r1 = ret.Error(1) } @@ -1006,13 +1006,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) @@ -1021,7 +1021,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) } @@ -1029,13 +1029,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) @@ -1044,7 +1044,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) } @@ -1052,13 +1052,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) @@ -1067,7 +1067,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) } @@ -1188,13 +1188,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) @@ -1203,7 +1203,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) } @@ -1234,13 +1234,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) @@ -1249,7 +1249,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) } @@ -1324,13 +1324,13 @@ func (_m *ChannelStore) GroupSyncedChannelCount() (int64, error) { return r0, r1 } -// IncrementMentionCount provides a mock function with given fields: channelID, userId, updateThreads, isRoot -func (_m *ChannelStore) IncrementMentionCount(channelID string, userId string, updateThreads bool, isRoot bool) error { - ret := _m.Called(channelID, userId, updateThreads, isRoot) +// IncrementMentionCount provides a mock function with given fields: channelID, userID, updateThreads, isRoot +func (_m *ChannelStore) IncrementMentionCount(channelID string, userID string, updateThreads bool, isRoot bool) error { + ret := _m.Called(channelID, userID, updateThreads, isRoot) var r0 error if rf, ok := ret.Get(0).(func(string, string, bool, bool) error); ok { - r0 = rf(channelID, userId, updateThreads, isRoot) + r0 = rf(channelID, userID, updateThreads, isRoot) } else { r0 = ret.Error(0) } @@ -1338,9 +1338,9 @@ func (_m *ChannelStore) IncrementMentionCount(channelID string, userId string, u return r0 } -// InvalidateAllChannelMembersForUser provides a mock function with given fields: userId -func (_m *ChannelStore) InvalidateAllChannelMembersForUser(userId string) { - _m.Called(userId) +// InvalidateAllChannelMembersForUser provides a mock function with given fields: userID +func (_m *ChannelStore) InvalidateAllChannelMembersForUser(userID string) { + _m.Called(userID) } // InvalidateCacheForChannelMembersNotifyProps provides a mock function with given fields: channelID @@ -1373,13 +1373,13 @@ 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) } @@ -1387,13 +1387,13 @@ func (_m *ChannelStore) IsUserInChannelUseCache(userId string, channelID string) return r0 } -// MigrateChannelMembers provides a mock function with given fields: fromChannelId, fromUserId -func (_m *ChannelStore) MigrateChannelMembers(fromChannelId string, fromUserId string) (map[string]string, error) { - ret := _m.Called(fromChannelId, fromUserId) +// MigrateChannelMembers provides a mock function with given fields: fromChannelID, fromUserID +func (_m *ChannelStore) MigrateChannelMembers(fromChannelID string, fromUserID string) (map[string]string, error) { + ret := _m.Called(fromChannelID, fromUserID) var r0 map[string]string if rf, ok := ret.Get(0).(func(string, string) map[string]string); ok { - r0 = rf(fromChannelId, fromUserId) + r0 = rf(fromChannelID, fromUserID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(map[string]string) @@ -1402,7 +1402,7 @@ func (_m *ChannelStore) MigrateChannelMembers(fromChannelId string, fromUserId s var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(fromChannelId, fromUserId) + r1 = rf(fromChannelID, fromUserID) } else { r1 = ret.Error(1) } @@ -1466,13 +1466,13 @@ func (_m *ChannelStore) PermanentDeleteMembersByChannel(channelID string) error return r0 } -// PermanentDeleteMembersByUser provides a mock function with given fields: userId -func (_m *ChannelStore) PermanentDeleteMembersByUser(userId string) error { - ret := _m.Called(userId) +// PermanentDeleteMembersByUser provides a mock function with given fields: userID +func (_m *ChannelStore) PermanentDeleteMembersByUser(userID string) error { + ret := _m.Called(userID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(userId) + r0 = rf(userID) } else { r0 = ret.Error(0) } @@ -1494,13 +1494,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) } @@ -1672,13 +1672,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) @@ -1687,7 +1687,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) } @@ -1695,13 +1695,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) @@ -1710,7 +1710,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) } @@ -1718,13 +1718,13 @@ func (_m *ChannelStore) SearchForUserInTeam(userId string, teamID string, term s return r0, r1 } -// SearchGroupChannels provides a mock function with given fields: userId, term -func (_m *ChannelStore) SearchGroupChannels(userId string, term string) (*model.ChannelList, error) { - ret := _m.Called(userId, term) +// SearchGroupChannels provides a mock function with given fields: userID, term +func (_m *ChannelStore) SearchGroupChannels(userID string, term string) (*model.ChannelList, error) { + ret := _m.Called(userID, term) var r0 *model.ChannelList if rf, ok := ret.Get(0).(func(string, string) *model.ChannelList); ok { - r0 = rf(userId, term) + r0 = rf(userID, term) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ChannelList) @@ -1733,7 +1733,7 @@ func (_m *ChannelStore) SearchGroupChannels(userId string, term string) (*model. var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(userId, term) + r1 = rf(userID, term) } else { r1 = ret.Error(1) } @@ -1764,13 +1764,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) @@ -1779,7 +1779,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) } @@ -1838,13 +1838,13 @@ func (_m *ChannelStore) Update(channel *model.Channel) (*model.Channel, error) { return r0, r1 } -// UpdateLastViewedAt provides a mock function with given fields: channelIds, userId, updateThreads -func (_m *ChannelStore) UpdateLastViewedAt(channelIds []string, userId string, updateThreads bool) (map[string]int64, error) { - ret := _m.Called(channelIds, userId, updateThreads) +// UpdateLastViewedAt provides a mock function with given fields: channelIds, userID, updateThreads +func (_m *ChannelStore) UpdateLastViewedAt(channelIds []string, userID string, updateThreads bool) (map[string]int64, error) { + ret := _m.Called(channelIds, userID, updateThreads) var r0 map[string]int64 if rf, ok := ret.Get(0).(func([]string, string, bool) map[string]int64); ok { - r0 = rf(channelIds, userId, updateThreads) + r0 = rf(channelIds, userID, updateThreads) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(map[string]int64) @@ -1853,7 +1853,7 @@ func (_m *ChannelStore) UpdateLastViewedAt(channelIds []string, userId string, u var r1 error if rf, ok := ret.Get(1).(func([]string, string, bool) error); ok { - r1 = rf(channelIds, userId, updateThreads) + r1 = rf(channelIds, userID, updateThreads) } else { r1 = ret.Error(1) } @@ -1944,13 +1944,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) @@ -1959,7 +1959,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) @@ -1968,7 +1968,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) } @@ -1976,13 +1976,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) } @@ -2018,20 +2018,20 @@ func (_m *ChannelStore) UpdateSidebarChannelsByPreferences(preferences *model.Pr return r0 } -// UserBelongsToChannels provides a mock function with given fields: userId, channelIds -func (_m *ChannelStore) UserBelongsToChannels(userId string, channelIds []string) (bool, error) { - ret := _m.Called(userId, channelIds) +// UserBelongsToChannels provides a mock function with given fields: userID, channelIds +func (_m *ChannelStore) UserBelongsToChannels(userID string, channelIds []string) (bool, error) { + ret := _m.Called(userID, channelIds) var r0 bool if rf, ok := ret.Get(0).(func(string, []string) bool); ok { - r0 = rf(userId, channelIds) + r0 = rf(userID, channelIds) } else { r0 = ret.Get(0).(bool) } var r1 error if rf, ok := ret.Get(1).(func(string, []string) error); ok { - r1 = rf(userId, channelIds) + r1 = rf(userID, channelIds) } else { r1 = ret.Error(1) } diff --git a/store/storetest/mocks/CommandStore.go b/store/storetest/mocks/CommandStore.go index 577ddd7589..48ff965488 100644 --- a/store/storetest/mocks/CommandStore.go +++ b/store/storetest/mocks/CommandStore.go @@ -132,13 +132,13 @@ func (_m *CommandStore) PermanentDeleteByTeam(teamID string) error { return r0 } -// PermanentDeleteByUser provides a mock function with given fields: userId -func (_m *CommandStore) PermanentDeleteByUser(userId string) error { - ret := _m.Called(userId) +// PermanentDeleteByUser provides a mock function with given fields: userID +func (_m *CommandStore) PermanentDeleteByUser(userID string) error { + ret := _m.Called(userID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(userId) + r0 = rf(userID) } else { r0 = ret.Error(0) } diff --git a/store/storetest/mocks/FileInfoStore.go b/store/storetest/mocks/FileInfoStore.go index c7f3c58f76..8e828618fe 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) } @@ -190,13 +190,13 @@ func (_m *FileInfoStore) GetForPost(postID string, readFromMaster bool, includeD return r0, r1 } -// GetForUser provides a mock function with given fields: userId -func (_m *FileInfoStore) GetForUser(userId string) ([]*model.FileInfo, error) { - ret := _m.Called(userId) +// GetForUser provides a mock function with given fields: userID +func (_m *FileInfoStore) GetForUser(userID string) ([]*model.FileInfo, error) { + ret := _m.Called(userID) var r0 []*model.FileInfo if rf, ok := ret.Get(0).(func(string) []*model.FileInfo); ok { - r0 = rf(userId) + r0 = rf(userID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.FileInfo) @@ -205,7 +205,7 @@ func (_m *FileInfoStore) GetForUser(userId string) ([]*model.FileInfo, error) { var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(userId) + r1 = rf(userID) } else { r1 = ret.Error(1) } @@ -276,20 +276,20 @@ func (_m *FileInfoStore) PermanentDeleteBatch(endTime int64, limit int64) (int64 return r0, r1 } -// PermanentDeleteByUser provides a mock function with given fields: userId -func (_m *FileInfoStore) PermanentDeleteByUser(userId string) (int64, error) { - ret := _m.Called(userId) +// PermanentDeleteByUser provides a mock function with given fields: userID +func (_m *FileInfoStore) PermanentDeleteByUser(userID string) (int64, error) { + ret := _m.Called(userID) var r0 int64 if rf, ok := ret.Get(0).(func(string) int64); ok { - r0 = rf(userId) + r0 = rf(userID) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(userId) + r1 = rf(userID) } else { r1 = ret.Error(1) } @@ -320,13 +320,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) @@ -335,7 +335,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) } diff --git a/store/storetest/mocks/GroupStore.go b/store/storetest/mocks/GroupStore.go index 707c4a6aa5..8c17caa44a 100644 --- a/store/storetest/mocks/GroupStore.go +++ b/store/storetest/mocks/GroupStore.go @@ -464,13 +464,13 @@ func (_m *GroupStore) GetByRemoteID(remoteID string, groupSource model.GroupSour return r0, r1 } -// GetByUser provides a mock function with given fields: userId -func (_m *GroupStore) GetByUser(userId string) ([]*model.Group, error) { - ret := _m.Called(userId) +// GetByUser provides a mock function with given fields: userID +func (_m *GroupStore) GetByUser(userID string) ([]*model.Group, error) { + ret := _m.Called(userID) var r0 []*model.Group if rf, ok := ret.Get(0).(func(string) []*model.Group); ok { - r0 = rf(userId) + r0 = rf(userID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.Group) @@ -479,7 +479,7 @@ func (_m *GroupStore) GetByUser(userId string) ([]*model.Group, error) { var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(userId) + r1 = rf(userID) } else { r1 = ret.Error(1) } @@ -820,13 +820,13 @@ func (_m *GroupStore) GroupTeamCount() (int64, error) { return r0, r1 } -// PermanentDeleteMembersByUser provides a mock function with given fields: userId -func (_m *GroupStore) PermanentDeleteMembersByUser(userId string) error { - ret := _m.Called(userId) +// PermanentDeleteMembersByUser provides a mock function with given fields: userID +func (_m *GroupStore) PermanentDeleteMembersByUser(userID string) error { + ret := _m.Called(userID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(userId) + r0 = rf(userID) } else { r0 = ret.Error(0) } diff --git a/store/storetest/mocks/OAuthStore.go b/store/storetest/mocks/OAuthStore.go index 92fe7ddcb9..a1af8e1cfc 100644 --- a/store/storetest/mocks/OAuthStore.go +++ b/store/storetest/mocks/OAuthStore.go @@ -74,13 +74,13 @@ func (_m *OAuthStore) GetAccessDataByRefreshToken(token string) (*model.AccessDa return r0, r1 } -// GetAccessDataByUserForApp provides a mock function with given fields: userId, clientId -func (_m *OAuthStore) GetAccessDataByUserForApp(userId string, clientId string) ([]*model.AccessData, error) { - ret := _m.Called(userId, clientId) +// GetAccessDataByUserForApp provides a mock function with given fields: userID, clientId +func (_m *OAuthStore) GetAccessDataByUserForApp(userID string, clientId string) ([]*model.AccessData, error) { + ret := _m.Called(userID, clientId) var r0 []*model.AccessData if rf, ok := ret.Get(0).(func(string, string) []*model.AccessData); ok { - r0 = rf(userId, clientId) + r0 = rf(userID, clientId) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.AccessData) @@ -89,7 +89,7 @@ func (_m *OAuthStore) GetAccessDataByUserForApp(userId string, clientId string) var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(userId, clientId) + r1 = rf(userID, clientId) } else { r1 = ret.Error(1) } @@ -120,13 +120,13 @@ func (_m *OAuthStore) GetApp(id string) (*model.OAuthApp, error) { return r0, r1 } -// GetAppByUser provides a mock function with given fields: userId, offset, limit -func (_m *OAuthStore) GetAppByUser(userId string, offset int, limit int) ([]*model.OAuthApp, error) { - ret := _m.Called(userId, offset, limit) +// GetAppByUser provides a mock function with given fields: userID, offset, limit +func (_m *OAuthStore) GetAppByUser(userID string, offset int, limit int) ([]*model.OAuthApp, error) { + ret := _m.Called(userID, offset, limit) var r0 []*model.OAuthApp if rf, ok := ret.Get(0).(func(string, int, int) []*model.OAuthApp); ok { - r0 = rf(userId, offset, limit) + r0 = rf(userID, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.OAuthApp) @@ -135,7 +135,7 @@ func (_m *OAuthStore) GetAppByUser(userId string, offset int, limit int) ([]*mod var r1 error if rf, ok := ret.Get(1).(func(string, int, int) error); ok { - r1 = rf(userId, offset, limit) + r1 = rf(userID, offset, limit) } else { r1 = ret.Error(1) } @@ -189,13 +189,13 @@ func (_m *OAuthStore) GetAuthData(code string) (*model.AuthData, error) { return r0, r1 } -// GetAuthorizedApps provides a mock function with given fields: userId, offset, limit -func (_m *OAuthStore) GetAuthorizedApps(userId string, offset int, limit int) ([]*model.OAuthApp, error) { - ret := _m.Called(userId, offset, limit) +// GetAuthorizedApps provides a mock function with given fields: userID, offset, limit +func (_m *OAuthStore) GetAuthorizedApps(userID string, offset int, limit int) ([]*model.OAuthApp, error) { + ret := _m.Called(userID, offset, limit) var r0 []*model.OAuthApp if rf, ok := ret.Get(0).(func(string, int, int) []*model.OAuthApp); ok { - r0 = rf(userId, offset, limit) + r0 = rf(userID, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.OAuthApp) @@ -204,7 +204,7 @@ func (_m *OAuthStore) GetAuthorizedApps(userId string, offset int, limit int) ([ var r1 error if rf, ok := ret.Get(1).(func(string, int, int) error); ok { - r1 = rf(userId, offset, limit) + r1 = rf(userID, offset, limit) } else { r1 = ret.Error(1) } @@ -212,13 +212,13 @@ func (_m *OAuthStore) GetAuthorizedApps(userId string, offset int, limit int) ([ return r0, r1 } -// GetPreviousAccessData provides a mock function with given fields: userId, clientId -func (_m *OAuthStore) GetPreviousAccessData(userId string, clientId string) (*model.AccessData, error) { - ret := _m.Called(userId, clientId) +// GetPreviousAccessData provides a mock function with given fields: userID, clientId +func (_m *OAuthStore) GetPreviousAccessData(userID string, clientId string) (*model.AccessData, error) { + ret := _m.Called(userID, clientId) var r0 *model.AccessData if rf, ok := ret.Get(0).(func(string, string) *model.AccessData); ok { - r0 = rf(userId, clientId) + r0 = rf(userID, clientId) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.AccessData) @@ -227,7 +227,7 @@ func (_m *OAuthStore) GetPreviousAccessData(userId string, clientId string) (*mo var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(userId, clientId) + r1 = rf(userID, clientId) } else { r1 = ret.Error(1) } @@ -235,13 +235,13 @@ func (_m *OAuthStore) GetPreviousAccessData(userId string, clientId string) (*mo return r0, r1 } -// PermanentDeleteAuthDataByUser provides a mock function with given fields: userId -func (_m *OAuthStore) PermanentDeleteAuthDataByUser(userId string) error { - ret := _m.Called(userId) +// PermanentDeleteAuthDataByUser provides a mock function with given fields: userID +func (_m *OAuthStore) PermanentDeleteAuthDataByUser(userID string) error { + ret := _m.Called(userID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(userId) + r0 = rf(userID) } else { r0 = ret.Error(0) } diff --git a/store/storetest/mocks/PostStore.go b/store/storetest/mocks/PostStore.go index 0c073ef4ca..2a1610bd74 100644 --- a/store/storetest/mocks/PostStore.go +++ b/store/storetest/mocks/PostStore.go @@ -162,13 +162,13 @@ func (_m *PostStore) GetEtag(channelID string, allowFromCache bool, collapsedThr return r0 } -// GetFlaggedPosts provides a mock function with given fields: userId, offset, limit -func (_m *PostStore) GetFlaggedPosts(userId string, offset int, limit int) (*model.PostList, error) { - ret := _m.Called(userId, offset, limit) +// GetFlaggedPosts provides a mock function with given fields: userID, offset, limit +func (_m *PostStore) GetFlaggedPosts(userID string, offset int, limit int) (*model.PostList, error) { + ret := _m.Called(userID, offset, limit) var r0 *model.PostList if rf, ok := ret.Get(0).(func(string, int, int) *model.PostList); ok { - r0 = rf(userId, offset, limit) + r0 = rf(userID, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.PostList) @@ -177,7 +177,7 @@ func (_m *PostStore) GetFlaggedPosts(userId string, offset int, limit int) (*mod var r1 error if rf, ok := ret.Get(1).(func(string, int, int) error); ok { - r1 = rf(userId, offset, limit) + r1 = rf(userID, offset, limit) } else { r1 = ret.Error(1) } @@ -185,13 +185,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) @@ -200,7 +200,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) } @@ -208,13 +208,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) @@ -223,7 +223,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) } @@ -700,13 +700,13 @@ func (_m *PostStore) PermanentDeleteByChannel(channelID string) error { return r0 } -// PermanentDeleteByUser provides a mock function with given fields: userId -func (_m *PostStore) PermanentDeleteByUser(userId string) error { - ret := _m.Called(userId) +// PermanentDeleteByUser provides a mock function with given fields: userID +func (_m *PostStore) PermanentDeleteByUser(userID string) error { + ret := _m.Called(userID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(userId) + r0 = rf(userID) } else { r0 = ret.Error(0) } @@ -767,13 +767,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) @@ -782,7 +782,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) } @@ -790,13 +790,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) @@ -805,7 +805,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/PreferenceStore.go b/store/storetest/mocks/PreferenceStore.go index 0cf5132c96..468aae8d5e 100644 --- a/store/storetest/mocks/PreferenceStore.go +++ b/store/storetest/mocks/PreferenceStore.go @@ -35,13 +35,13 @@ func (_m *PreferenceStore) CleanupFlagsBatch(limit int64) (int64, error) { return r0, r1 } -// Delete provides a mock function with given fields: userId, category, name -func (_m *PreferenceStore) Delete(userId string, category string, name string) error { - ret := _m.Called(userId, category, name) +// Delete provides a mock function with given fields: userID, category, name +func (_m *PreferenceStore) Delete(userID string, category string, name string) error { + ret := _m.Called(userID, category, name) var r0 error if rf, ok := ret.Get(0).(func(string, string, string) error); ok { - r0 = rf(userId, category, name) + r0 = rf(userID, category, name) } else { r0 = ret.Error(0) } @@ -49,13 +49,13 @@ func (_m *PreferenceStore) Delete(userId string, category string, name string) e return r0 } -// DeleteCategory provides a mock function with given fields: userId, category -func (_m *PreferenceStore) DeleteCategory(userId string, category string) error { - ret := _m.Called(userId, category) +// DeleteCategory provides a mock function with given fields: userID, category +func (_m *PreferenceStore) DeleteCategory(userID string, category string) error { + ret := _m.Called(userID, category) var r0 error if rf, ok := ret.Get(0).(func(string, string) error); ok { - r0 = rf(userId, category) + r0 = rf(userID, category) } else { r0 = ret.Error(0) } @@ -77,13 +77,13 @@ func (_m *PreferenceStore) DeleteCategoryAndName(category string, name string) e return r0 } -// Get provides a mock function with given fields: userId, category, name -func (_m *PreferenceStore) Get(userId string, category string, name string) (*model.Preference, error) { - ret := _m.Called(userId, category, name) +// Get provides a mock function with given fields: userID, category, name +func (_m *PreferenceStore) Get(userID string, category string, name string) (*model.Preference, error) { + ret := _m.Called(userID, category, name) var r0 *model.Preference if rf, ok := ret.Get(0).(func(string, string, string) *model.Preference); ok { - r0 = rf(userId, category, name) + r0 = rf(userID, category, name) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.Preference) @@ -92,7 +92,7 @@ func (_m *PreferenceStore) Get(userId string, category string, name string) (*mo var r1 error if rf, ok := ret.Get(1).(func(string, string, string) error); ok { - r1 = rf(userId, category, name) + r1 = rf(userID, category, name) } else { r1 = ret.Error(1) } @@ -100,13 +100,13 @@ func (_m *PreferenceStore) Get(userId string, category string, name string) (*mo return r0, r1 } -// GetAll provides a mock function with given fields: userId -func (_m *PreferenceStore) GetAll(userId string) (model.Preferences, error) { - ret := _m.Called(userId) +// GetAll provides a mock function with given fields: userID +func (_m *PreferenceStore) GetAll(userID string) (model.Preferences, error) { + ret := _m.Called(userID) var r0 model.Preferences if rf, ok := ret.Get(0).(func(string) model.Preferences); ok { - r0 = rf(userId) + r0 = rf(userID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(model.Preferences) @@ -115,7 +115,7 @@ func (_m *PreferenceStore) GetAll(userId string) (model.Preferences, error) { var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(userId) + r1 = rf(userID) } else { r1 = ret.Error(1) } @@ -123,13 +123,13 @@ func (_m *PreferenceStore) GetAll(userId string) (model.Preferences, error) { return r0, r1 } -// GetCategory provides a mock function with given fields: userId, category -func (_m *PreferenceStore) GetCategory(userId string, category string) (model.Preferences, error) { - ret := _m.Called(userId, category) +// GetCategory provides a mock function with given fields: userID, category +func (_m *PreferenceStore) GetCategory(userID string, category string) (model.Preferences, error) { + ret := _m.Called(userID, category) var r0 model.Preferences if rf, ok := ret.Get(0).(func(string, string) model.Preferences); ok { - r0 = rf(userId, category) + r0 = rf(userID, category) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(model.Preferences) @@ -138,7 +138,7 @@ func (_m *PreferenceStore) GetCategory(userId string, category string) (model.Pr var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(userId, category) + r1 = rf(userID, category) } else { r1 = ret.Error(1) } @@ -146,13 +146,13 @@ func (_m *PreferenceStore) GetCategory(userId string, category string) (model.Pr return r0, r1 } -// PermanentDeleteByUser provides a mock function with given fields: userId -func (_m *PreferenceStore) PermanentDeleteByUser(userId string) error { - ret := _m.Called(userId) +// PermanentDeleteByUser provides a mock function with given fields: userID +func (_m *PreferenceStore) PermanentDeleteByUser(userID string) error { + ret := _m.Called(userID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(userId) + r0 = rf(userID) } else { r0 = ret.Error(0) } diff --git a/store/storetest/mocks/ProductNoticesStore.go b/store/storetest/mocks/ProductNoticesStore.go index 77c26cfd61..2c2feddeb9 100644 --- a/store/storetest/mocks/ProductNoticesStore.go +++ b/store/storetest/mocks/ProductNoticesStore.go @@ -42,13 +42,13 @@ func (_m *ProductNoticesStore) ClearOldNotices(currentNotices *model.ProductNoti return r0 } -// GetViews provides a mock function with given fields: userId -func (_m *ProductNoticesStore) GetViews(userId string) ([]model.ProductNoticeViewState, error) { - ret := _m.Called(userId) +// GetViews provides a mock function with given fields: userID +func (_m *ProductNoticesStore) GetViews(userID string) ([]model.ProductNoticeViewState, error) { + ret := _m.Called(userID) var r0 []model.ProductNoticeViewState if rf, ok := ret.Get(0).(func(string) []model.ProductNoticeViewState); ok { - r0 = rf(userId) + r0 = rf(userID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]model.ProductNoticeViewState) @@ -57,7 +57,7 @@ func (_m *ProductNoticesStore) GetViews(userId string) ([]model.ProductNoticeVie var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(userId) + r1 = rf(userID) } else { r1 = ret.Error(1) } @@ -65,13 +65,13 @@ func (_m *ProductNoticesStore) GetViews(userId string) ([]model.ProductNoticeVie return r0, r1 } -// View provides a mock function with given fields: userId, notices -func (_m *ProductNoticesStore) View(userId string, notices []string) error { - ret := _m.Called(userId, notices) +// View provides a mock function with given fields: userID, notices +func (_m *ProductNoticesStore) View(userID string, notices []string) error { + ret := _m.Called(userID, notices) var r0 error if rf, ok := ret.Get(0).(func(string, []string) error); ok { - r0 = rf(userId, notices) + r0 = rf(userID, notices) } else { r0 = ret.Error(0) } diff --git a/store/storetest/mocks/SessionStore.go b/store/storetest/mocks/SessionStore.go index 2113886f51..5577fbf719 100644 --- a/store/storetest/mocks/SessionStore.go +++ b/store/storetest/mocks/SessionStore.go @@ -65,13 +65,13 @@ func (_m *SessionStore) Get(ctx context.Context, sessionIDOrToken string) (*mode return r0, r1 } -// GetSessions provides a mock function with given fields: userId -func (_m *SessionStore) GetSessions(userId string) ([]*model.Session, error) { - ret := _m.Called(userId) +// GetSessions provides a mock function with given fields: userID +func (_m *SessionStore) GetSessions(userID string) ([]*model.Session, error) { + ret := _m.Called(userID) var r0 []*model.Session if rf, ok := ret.Get(0).(func(string) []*model.Session); ok { - r0 = rf(userId) + r0 = rf(userID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.Session) @@ -80,7 +80,7 @@ func (_m *SessionStore) GetSessions(userId string) ([]*model.Session, error) { var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(userId) + r1 = rf(userID) } else { r1 = ret.Error(1) } @@ -111,13 +111,13 @@ func (_m *SessionStore) GetSessionsExpired(thresholdMillis int64, mobileOnly boo return r0, r1 } -// GetSessionsWithActiveDeviceIds provides a mock function with given fields: userId -func (_m *SessionStore) GetSessionsWithActiveDeviceIds(userId string) ([]*model.Session, error) { - ret := _m.Called(userId) +// GetSessionsWithActiveDeviceIds provides a mock function with given fields: userID +func (_m *SessionStore) GetSessionsWithActiveDeviceIds(userID string) ([]*model.Session, error) { + ret := _m.Called(userID) var r0 []*model.Session if rf, ok := ret.Get(0).(func(string) []*model.Session); ok { - r0 = rf(userId) + r0 = rf(userID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.Session) @@ -126,7 +126,7 @@ func (_m *SessionStore) GetSessionsWithActiveDeviceIds(userId string) ([]*model. var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(userId) + r1 = rf(userID) } else { r1 = ret.Error(1) } @@ -276,20 +276,20 @@ func (_m *SessionStore) UpdateProps(session *model.Session) error { return r0 } -// UpdateRoles provides a mock function with given fields: userId, roles -func (_m *SessionStore) UpdateRoles(userId string, roles string) (string, error) { - ret := _m.Called(userId, roles) +// UpdateRoles provides a mock function with given fields: userID, roles +func (_m *SessionStore) UpdateRoles(userID string, roles string) (string, error) { + ret := _m.Called(userID, roles) var r0 string if rf, ok := ret.Get(0).(func(string, string) string); ok { - r0 = rf(userId, roles) + r0 = rf(userID, roles) } else { r0 = ret.Get(0).(string) } var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(userId, roles) + r1 = rf(userID, roles) } else { r1 = ret.Error(1) } diff --git a/store/storetest/mocks/StatusStore.go b/store/storetest/mocks/StatusStore.go index 04a9b1113c..f80acd4b28 100644 --- a/store/storetest/mocks/StatusStore.go +++ b/store/storetest/mocks/StatusStore.go @@ -14,13 +14,13 @@ type StatusStore struct { mock.Mock } -// Get provides a mock function with given fields: userId -func (_m *StatusStore) Get(userId string) (*model.Status, error) { - ret := _m.Called(userId) +// Get provides a mock function with given fields: userID +func (_m *StatusStore) Get(userID string) (*model.Status, error) { + ret := _m.Called(userID) var r0 *model.Status if rf, ok := ret.Get(0).(func(string) *model.Status); ok { - r0 = rf(userId) + r0 = rf(userID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.Status) @@ -29,7 +29,7 @@ func (_m *StatusStore) Get(userId string) (*model.Status, error) { var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(userId) + r1 = rf(userID) } else { r1 = ret.Error(1) } @@ -109,13 +109,13 @@ func (_m *StatusStore) SaveOrUpdate(status *model.Status) error { return r0 } -// UpdateLastActivityAt provides a mock function with given fields: userId, lastActivityAt -func (_m *StatusStore) UpdateLastActivityAt(userId string, lastActivityAt int64) error { - ret := _m.Called(userId, lastActivityAt) +// UpdateLastActivityAt provides a mock function with given fields: userID, lastActivityAt +func (_m *StatusStore) UpdateLastActivityAt(userID string, lastActivityAt int64) error { + ret := _m.Called(userID, lastActivityAt) var r0 error if rf, ok := ret.Get(0).(func(string, int64) error); ok { - r0 = rf(userId, lastActivityAt) + r0 = rf(userID, lastActivityAt) } else { r0 = ret.Error(0) } diff --git a/store/storetest/mocks/TeamStore.go b/store/storetest/mocks/TeamStore.go index ac036aef26..b16571a575 100644 --- a/store/storetest/mocks/TeamStore.go +++ b/store/storetest/mocks/TeamStore.go @@ -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: ctx, teamID, userId -func (_m *TeamStore) GetMember(ctx context.Context, teamID string, userId string) (*model.TeamMember, error) { - ret := _m.Called(ctx, teamID, userId) +// GetMember provides a mock function with given fields: ctx, teamID, userID +func (_m *TeamStore) GetMember(ctx context.Context, teamID string, userID string) (*model.TeamMember, error) { + ret := _m.Called(ctx, teamID, userID) var r0 *model.TeamMember if rf, ok := ret.Get(0).(func(context.Context, string, string) *model.TeamMember); ok { - r0 = rf(ctx, teamID, userId) + r0 = rf(ctx, teamID, userID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.TeamMember) @@ -477,7 +477,7 @@ func (_m *TeamStore) GetMember(ctx context.Context, teamID string, userId string var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { - r1 = rf(ctx, teamID, userId) + r1 = rf(ctx, teamID, userID) } else { r1 = ret.Error(1) } @@ -531,13 +531,13 @@ func (_m *TeamStore) GetMembersByIds(teamID string, userIds []string, restrictio return r0, r1 } -// GetTeamMembersForExport provides a mock function with given fields: userId -func (_m *TeamStore) GetTeamMembersForExport(userId string) ([]*model.TeamMemberForExport, error) { - ret := _m.Called(userId) +// GetTeamMembersForExport provides a mock function with given fields: userID +func (_m *TeamStore) GetTeamMembersForExport(userID string) ([]*model.TeamMemberForExport, error) { + ret := _m.Called(userID) var r0 []*model.TeamMemberForExport if rf, ok := ret.Get(0).(func(string) []*model.TeamMemberForExport); ok { - r0 = rf(userId) + r0 = rf(userID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.TeamMemberForExport) @@ -546,7 +546,7 @@ func (_m *TeamStore) GetTeamMembersForExport(userId string) ([]*model.TeamMember var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(userId) + r1 = rf(userID) } else { r1 = ret.Error(1) } @@ -577,13 +577,13 @@ func (_m *TeamStore) GetTeamsByScheme(schemeID string, offset int, limit int) ([ return r0, r1 } -// GetTeamsByUserId provides a mock function with given fields: userId -func (_m *TeamStore) GetTeamsByUserId(userId string) ([]*model.Team, error) { - ret := _m.Called(userId) +// GetTeamsByUserId provides a mock function with given fields: userID +func (_m *TeamStore) GetTeamsByUserId(userID string) ([]*model.Team, error) { + ret := _m.Called(userID) var r0 []*model.Team if rf, ok := ret.Get(0).(func(string) []*model.Team); ok { - r0 = rf(userId) + r0 = rf(userID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.Team) @@ -592,7 +592,7 @@ func (_m *TeamStore) GetTeamsByUserId(userId string) ([]*model.Team, error) { var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(userId) + r1 = rf(userID) } else { r1 = ret.Error(1) } @@ -600,13 +600,13 @@ func (_m *TeamStore) GetTeamsByUserId(userId string) ([]*model.Team, error) { return r0, r1 } -// GetTeamsForUser provides a mock function with given fields: ctx, userId -func (_m *TeamStore) GetTeamsForUser(ctx context.Context, userId string) ([]*model.TeamMember, error) { - ret := _m.Called(ctx, userId) +// GetTeamsForUser provides a mock function with given fields: ctx, userID +func (_m *TeamStore) GetTeamsForUser(ctx context.Context, userID string) ([]*model.TeamMember, error) { + ret := _m.Called(ctx, userID) var r0 []*model.TeamMember if rf, ok := ret.Get(0).(func(context.Context, string) []*model.TeamMember); ok { - r0 = rf(ctx, userId) + r0 = rf(ctx, userID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.TeamMember) @@ -615,7 +615,7 @@ func (_m *TeamStore) GetTeamsForUser(ctx context.Context, userId string) ([]*mod var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { - r1 = rf(ctx, userId) + r1 = rf(ctx, userID) } else { r1 = ret.Error(1) } @@ -623,13 +623,13 @@ func (_m *TeamStore) GetTeamsForUser(ctx context.Context, userId string) ([]*mod return r0, r1 } -// GetTeamsForUserWithPagination provides a mock function with given fields: userId, page, perPage -func (_m *TeamStore) GetTeamsForUserWithPagination(userId string, page int, perPage int) ([]*model.TeamMember, error) { - ret := _m.Called(userId, page, perPage) +// GetTeamsForUserWithPagination provides a mock function with given fields: userID, page, perPage +func (_m *TeamStore) GetTeamsForUserWithPagination(userID string, page int, perPage int) ([]*model.TeamMember, error) { + ret := _m.Called(userID, page, perPage) var r0 []*model.TeamMember if rf, ok := ret.Get(0).(func(string, int, int) []*model.TeamMember); ok { - r0 = rf(userId, page, perPage) + r0 = rf(userID, page, perPage) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.TeamMember) @@ -638,7 +638,7 @@ func (_m *TeamStore) GetTeamsForUserWithPagination(userId string, page int, perP var r1 error if rf, ok := ret.Get(1).(func(string, int, int) error); ok { - r1 = rf(userId, page, perPage) + r1 = rf(userID, page, perPage) } else { r1 = ret.Error(1) } @@ -667,13 +667,13 @@ func (_m *TeamStore) GetTotalMemberCount(teamID string, restrictions *model.View return r0, r1 } -// GetUserTeamIds provides a mock function with given fields: userId, allowFromCache -func (_m *TeamStore) GetUserTeamIds(userId string, allowFromCache bool) ([]string, error) { - ret := _m.Called(userId, allowFromCache) +// GetUserTeamIds provides a mock function with given fields: userID, allowFromCache +func (_m *TeamStore) GetUserTeamIds(userID string, allowFromCache bool) ([]string, error) { + ret := _m.Called(userID, allowFromCache) var r0 []string if rf, ok := ret.Get(0).(func(string, bool) []string); ok { - r0 = rf(userId, allowFromCache) + r0 = rf(userID, allowFromCache) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]string) @@ -682,7 +682,7 @@ func (_m *TeamStore) GetUserTeamIds(userId string, allowFromCache bool) ([]strin var r1 error if rf, ok := ret.Get(1).(func(string, bool) error); ok { - r1 = rf(userId, allowFromCache) + r1 = rf(userID, allowFromCache) } else { r1 = ret.Error(1) } @@ -711,18 +711,18 @@ func (_m *TeamStore) GroupSyncedTeamCount() (int64, error) { return r0, r1 } -// InvalidateAllTeamIdsForUser provides a mock function with given fields: userId -func (_m *TeamStore) InvalidateAllTeamIdsForUser(userId string) { - _m.Called(userId) +// InvalidateAllTeamIdsForUser provides a mock function with given fields: userID +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) } @@ -767,13 +767,13 @@ func (_m *TeamStore) RemoveAllMembersByTeam(teamID string) error { return r0 } -// RemoveAllMembersByUser provides a mock function with given fields: userId -func (_m *TeamStore) RemoveAllMembersByUser(userId string) error { - ret := _m.Called(userId) +// RemoveAllMembersByUser provides a mock function with given fields: userID +func (_m *TeamStore) RemoveAllMembersByUser(userID string) error { + ret := _m.Called(userID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(userId) + r0 = rf(userID) } 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) } @@ -1088,20 +1088,20 @@ func (_m *TeamStore) UpdateMultipleMembers(members []*model.TeamMember) ([]*mode return r0, r1 } -// UserBelongsToTeams provides a mock function with given fields: userId, teamIds -func (_m *TeamStore) UserBelongsToTeams(userId string, teamIds []string) (bool, error) { - ret := _m.Called(userId, teamIds) +// UserBelongsToTeams provides a mock function with given fields: userID, teamIds +func (_m *TeamStore) UserBelongsToTeams(userID string, teamIds []string) (bool, error) { + ret := _m.Called(userID, teamIds) var r0 bool if rf, ok := ret.Get(0).(func(string, []string) bool); ok { - r0 = rf(userId, teamIds) + r0 = rf(userID, teamIds) } else { r0 = ret.Get(0).(bool) } var r1 error if rf, ok := ret.Get(1).(func(string, []string) error); ok { - r1 = rf(userId, teamIds) + r1 = rf(userID, teamIds) } else { r1 = ret.Error(1) } diff --git a/store/storetest/mocks/ThreadStore.go b/store/storetest/mocks/ThreadStore.go index 8a74f97c03..e551108efe 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 } -// Delete provides a mock function with given fields: postId -func (_m *ThreadStore) Delete(postId string) error { - ret := _m.Called(postId) +// Delete provides a mock function with given fields: postID +func (_m *ThreadStore) Delete(postID string) error { + ret := _m.Called(postID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(postId) + r0 = rf(postID) } else { r0 = ret.Error(0) } @@ -134,13 +134,13 @@ func (_m *ThreadStore) GetMembershipsForUser(userId string, teamID string) ([]*m return r0, r1 } -// GetPosts provides a mock function with given fields: threadId, since -func (_m *ThreadStore) GetPosts(threadId string, since int64) ([]*model.Post, error) { - ret := _m.Called(threadId, since) +// GetPosts provides a mock function with given fields: threadID, since +func (_m *ThreadStore) GetPosts(threadID string, since int64) ([]*model.Post, error) { + ret := _m.Called(threadID, since) var r0 []*model.Post if rf, ok := ret.Get(0).(func(string, int64) []*model.Post); ok { - r0 = rf(threadId, since) + r0 = rf(threadID, since) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.Post) @@ -149,7 +149,7 @@ func (_m *ThreadStore) GetPosts(threadId string, since int64) ([]*model.Post, er var r1 error if rf, ok := ret.Get(1).(func(string, int64) error); ok { - r1 = rf(threadId, since) + r1 = rf(threadID, since) } else { r1 = ret.Error(1) } @@ -157,13 +157,13 @@ func (_m *ThreadStore) GetPosts(threadId string, since int64) ([]*model.Post, er return r0, r1 } -// GetThreadForUser provides a mock function with given fields: userId, teamId, threadId, extended -func (_m *ThreadStore) GetThreadForUser(userId string, teamId string, threadId string, extended bool) (*model.ThreadResponse, error) { - ret := _m.Called(userId, teamId, threadId, extended) +// GetThreadForUser provides a mock function with given fields: userID, teamID, threadId, extended +func (_m *ThreadStore) GetThreadForUser(userID string, teamID string, threadId string, extended bool) (*model.ThreadResponse, error) { + ret := _m.Called(userID, teamID, threadId, extended) var r0 *model.ThreadResponse if rf, ok := ret.Get(0).(func(string, string, string, bool) *model.ThreadResponse); ok { - r0 = rf(userId, teamId, threadId, extended) + r0 = rf(userID, teamID, threadId, extended) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.ThreadResponse) @@ -172,7 +172,7 @@ func (_m *ThreadStore) GetThreadForUser(userId string, teamId string, threadId s var r1 error if rf, ok := ret.Get(1).(func(string, string, string, bool) error); ok { - r1 = rf(userId, teamId, threadId, extended) + r1 = rf(userID, teamID, threadId, extended) } else { r1 = ret.Error(1) } @@ -180,13 +180,13 @@ func (_m *ThreadStore) GetThreadForUser(userId string, teamId string, threadId s return r0, r1 } -// GetThreadsForUser provides a mock function with given fields: userId, teamId, opts -func (_m *ThreadStore) GetThreadsForUser(userId string, teamId string, opts model.GetUserThreadsOpts) (*model.Threads, error) { - ret := _m.Called(userId, teamId, opts) +// GetThreadsForUser provides a mock function with given fields: userId, teamID, opts +func (_m *ThreadStore) GetThreadsForUser(userId string, teamID string, opts model.GetUserThreadsOpts) (*model.Threads, error) { + ret := _m.Called(userId, teamID, opts) var r0 *model.Threads if rf, ok := ret.Get(0).(func(string, string, model.GetUserThreadsOpts) *model.Threads); ok { - r0 = rf(userId, teamId, opts) + r0 = rf(userId, teamID, opts) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.Threads) @@ -195,7 +195,7 @@ func (_m *ThreadStore) GetThreadsForUser(userId string, teamId string, opts mode var r1 error if rf, ok := ret.Get(1).(func(string, string, model.GetUserThreadsOpts) error); ok { - r1 = rf(userId, teamId, opts) + r1 = rf(userId, teamID, opts) } else { r1 = ret.Error(1) } @@ -203,13 +203,13 @@ func (_m *ThreadStore) GetThreadsForUser(userId string, teamId string, opts mode return r0, r1 } -// MaintainMembership provides a mock function with given fields: userId, postID, following, incrementMentions, updateFollowing, updateViewedTimestamp -func (_m *ThreadStore) MaintainMembership(userId string, postID string, following bool, incrementMentions bool, updateFollowing bool, updateViewedTimestamp bool) error { - ret := _m.Called(userId, postID, following, incrementMentions, updateFollowing, updateViewedTimestamp) +// MaintainMembership provides a mock function with given fields: userID, postID, following, incrementMentions, updateFollowing, updateViewedTimestamp +func (_m *ThreadStore) MaintainMembership(userID string, postID string, following bool, incrementMentions bool, updateFollowing bool, updateViewedTimestamp bool) error { + ret := _m.Called(userID, postID, following, incrementMentions, updateFollowing, updateViewedTimestamp) var r0 error if rf, ok := ret.Get(0).(func(string, string, bool, bool, bool, bool) error); ok { - r0 = rf(userId, postID, following, incrementMentions, updateFollowing, updateViewedTimestamp) + r0 = rf(userID, postID, following, incrementMentions, updateFollowing, updateViewedTimestamp) } else { r0 = ret.Error(0) } @@ -217,13 +217,13 @@ func (_m *ThreadStore) MaintainMembership(userId string, postID string, followin return r0 } -// 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) } @@ -231,13 +231,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/UploadSessionStore.go b/store/storetest/mocks/UploadSessionStore.go index 157b387f93..7d3f8c8e3c 100644 --- a/store/storetest/mocks/UploadSessionStore.go +++ b/store/storetest/mocks/UploadSessionStore.go @@ -51,13 +51,13 @@ func (_m *UploadSessionStore) Get(id string) (*model.UploadSession, error) { return r0, r1 } -// GetForUser provides a mock function with given fields: userId -func (_m *UploadSessionStore) GetForUser(userId string) ([]*model.UploadSession, error) { - ret := _m.Called(userId) +// GetForUser provides a mock function with given fields: userID +func (_m *UploadSessionStore) GetForUser(userID string) ([]*model.UploadSession, error) { + ret := _m.Called(userID) var r0 []*model.UploadSession if rf, ok := ret.Get(0).(func(string) []*model.UploadSession); ok { - r0 = rf(userId) + r0 = rf(userID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.UploadSession) @@ -66,7 +66,7 @@ func (_m *UploadSessionStore) GetForUser(userId string) ([]*model.UploadSession, var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(userId) + r1 = rf(userID) } else { r1 = ret.Error(1) } diff --git a/store/storetest/mocks/UserAccessTokenStore.go b/store/storetest/mocks/UserAccessTokenStore.go index 6ff2db6a35..287ae847e3 100644 --- a/store/storetest/mocks/UserAccessTokenStore.go +++ b/store/storetest/mocks/UserAccessTokenStore.go @@ -28,13 +28,13 @@ func (_m *UserAccessTokenStore) Delete(tokenID string) error { return r0 } -// DeleteAllForUser provides a mock function with given fields: userId -func (_m *UserAccessTokenStore) DeleteAllForUser(userId string) error { - ret := _m.Called(userId) +// DeleteAllForUser provides a mock function with given fields: userID +func (_m *UserAccessTokenStore) DeleteAllForUser(userID string) error { + ret := _m.Called(userID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(userId) + r0 = rf(userID) } else { r0 = ret.Error(0) } @@ -111,13 +111,13 @@ func (_m *UserAccessTokenStore) GetByToken(tokenString string) (*model.UserAcces return r0, r1 } -// GetByUser provides a mock function with given fields: userId, page, perPage -func (_m *UserAccessTokenStore) GetByUser(userId string, page int, perPage int) ([]*model.UserAccessToken, error) { - ret := _m.Called(userId, page, perPage) +// GetByUser provides a mock function with given fields: userID, page, perPage +func (_m *UserAccessTokenStore) GetByUser(userID string, page int, perPage int) ([]*model.UserAccessToken, error) { + ret := _m.Called(userID, page, perPage) var r0 []*model.UserAccessToken if rf, ok := ret.Get(0).(func(string, int, int) []*model.UserAccessToken); ok { - r0 = rf(userId, page, perPage) + r0 = rf(userID, page, perPage) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.UserAccessToken) @@ -126,7 +126,7 @@ func (_m *UserAccessTokenStore) GetByUser(userId string, page int, perPage int) var r1 error if rf, ok := ret.Get(1).(func(string, int, int) error); ok { - r1 = rf(userId, page, perPage) + r1 = rf(userID, page, perPage) } else { r1 = ret.Error(1) } diff --git a/store/storetest/mocks/UserStore.go b/store/storetest/mocks/UserStore.go index dd882b4df9..e1f3dce672 100644 --- a/store/storetest/mocks/UserStore.go +++ b/store/storetest/mocks/UserStore.go @@ -368,13 +368,13 @@ func (_m *UserStore) GetAllProfiles(options *model.UserGetOptions) ([]*model.Use return r0, r1 } -// GetAllProfilesInChannel provides a mock function with given fields: ctx, channelId, allowFromCache -func (_m *UserStore) GetAllProfilesInChannel(ctx context.Context, channelId string, allowFromCache bool) (map[string]*model.User, error) { - ret := _m.Called(ctx, channelId, allowFromCache) +// GetAllProfilesInChannel provides a mock function with given fields: ctx, channelID, allowFromCache +func (_m *UserStore) GetAllProfilesInChannel(ctx context.Context, channelID string, allowFromCache bool) (map[string]*model.User, error) { + ret := _m.Called(ctx, channelID, allowFromCache) var r0 map[string]*model.User if rf, ok := ret.Get(0).(func(context.Context, string, bool) map[string]*model.User); ok { - r0 = rf(ctx, channelId, allowFromCache) + r0 = rf(ctx, channelID, allowFromCache) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(map[string]*model.User) @@ -383,7 +383,7 @@ func (_m *UserStore) GetAllProfilesInChannel(ctx context.Context, channelId stri var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, bool) error); ok { - r1 = rf(ctx, channelId, allowFromCache) + r1 = rf(ctx, channelID, allowFromCache) } 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) } @@ -661,13 +661,13 @@ func (_m *UserStore) GetNewUsersForTeam(teamID string, offset int, limit int, vi return r0, r1 } -// GetProfileByGroupChannelIdsForUser provides a mock function with given fields: userId, channelIds -func (_m *UserStore) GetProfileByGroupChannelIdsForUser(userId string, channelIds []string) (map[string][]*model.User, error) { - ret := _m.Called(userId, channelIds) +// GetProfileByGroupChannelIdsForUser provides a mock function with given fields: userID, channelIds +func (_m *UserStore) GetProfileByGroupChannelIdsForUser(userID string, channelIds []string) (map[string][]*model.User, error) { + ret := _m.Called(userID, channelIds) var r0 map[string][]*model.User if rf, ok := ret.Get(0).(func(string, []string) map[string][]*model.User); ok { - r0 = rf(userId, channelIds) + r0 = rf(userID, channelIds) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(map[string][]*model.User) @@ -676,7 +676,7 @@ func (_m *UserStore) GetProfileByGroupChannelIdsForUser(userId string, channelId var r1 error if rf, ok := ret.Get(1).(func(string, []string) error); ok { - r1 = rf(userId, channelIds) + r1 = rf(userID, channelIds) } else { r1 = ret.Error(1) } @@ -799,13 +799,13 @@ func (_m *UserStore) GetProfilesInChannelByStatus(options *model.UserGetOptions) return r0, r1 } -// GetProfilesNotInChannel provides a mock function with given fields: teamId, channelId, groupConstrained, offset, limit, viewRestrictions -func (_m *UserStore) GetProfilesNotInChannel(teamId string, channelId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { - ret := _m.Called(teamId, channelId, groupConstrained, offset, limit, viewRestrictions) +// GetProfilesNotInChannel provides a mock function with given fields: teamID, channelId, groupConstrained, offset, limit, viewRestrictions +func (_m *UserStore) GetProfilesNotInChannel(teamID string, channelId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { + ret := _m.Called(teamID, channelId, groupConstrained, offset, limit, viewRestrictions) var r0 []*model.User if rf, ok := ret.Get(0).(func(string, string, bool, int, int, *model.ViewUsersRestrictions) []*model.User); ok { - r0 = rf(teamId, channelId, groupConstrained, offset, limit, viewRestrictions) + r0 = rf(teamID, channelId, groupConstrained, offset, limit, viewRestrictions) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.User) @@ -814,7 +814,7 @@ func (_m *UserStore) GetProfilesNotInChannel(teamId string, channelId string, gr var r1 error if rf, ok := ret.Get(1).(func(string, string, bool, int, int, *model.ViewUsersRestrictions) error); ok { - r1 = rf(teamId, channelId, groupConstrained, offset, limit, viewRestrictions) + r1 = rf(teamID, channelId, groupConstrained, offset, limit, viewRestrictions) } else { r1 = ret.Error(1) } @@ -937,20 +937,20 @@ func (_m *UserStore) GetTeamGroupUsers(teamID string) ([]*model.User, error) { return r0, r1 } -// GetUnreadCount provides a mock function with given fields: userId -func (_m *UserStore) GetUnreadCount(userId string) (int64, error) { - ret := _m.Called(userId) +// GetUnreadCount provides a mock function with given fields: userID +func (_m *UserStore) GetUnreadCount(userID string) (int64, error) { + ret := _m.Called(userID) var r0 int64 if rf, ok := ret.Get(0).(func(string) int64); ok { - r0 = rf(userId) + r0 = rf(userID) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(userId) + r1 = rf(userID) } 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) } @@ -1023,9 +1023,9 @@ func (_m *UserStore) InferSystemInstallDate() (int64, error) { return r0, r1 } -// InvalidateProfileCacheForUser provides a mock function with given fields: userId -func (_m *UserStore) InvalidateProfileCacheForUser(userId string) { - _m.Called(userId) +// InvalidateProfileCacheForUser provides a mock function with given fields: userID +func (_m *UserStore) InvalidateProfileCacheForUser(userID string) { + _m.Called(userID) } // InvalidateProfilesInChannelCache provides a mock function with given fields: channelID @@ -1033,18 +1033,18 @@ func (_m *UserStore) InvalidateProfilesInChannelCache(channelID string) { _m.Called(channelID) } -// InvalidateProfilesInChannelCacheByUser provides a mock function with given fields: userId -func (_m *UserStore) InvalidateProfilesInChannelCacheByUser(userId string) { - _m.Called(userId) +// InvalidateProfilesInChannelCacheByUser provides a mock function with given fields: userID +func (_m *UserStore) InvalidateProfilesInChannelCacheByUser(userID string) { + _m.Called(userID) } -// PermanentDelete provides a mock function with given fields: userId -func (_m *UserStore) PermanentDelete(userId string) error { - ret := _m.Called(userId) +// PermanentDelete provides a mock function with given fields: userID +func (_m *UserStore) PermanentDelete(userID string) error { + ret := _m.Called(userID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(userId) + r0 = rf(userID) } else { r0 = ret.Error(0) } @@ -1066,13 +1066,13 @@ func (_m *UserStore) PromoteGuestToUser(userID string) error { return r0 } -// ResetLastPictureUpdate provides a mock function with given fields: userId -func (_m *UserStore) ResetLastPictureUpdate(userId string) error { - ret := _m.Called(userId) +// ResetLastPictureUpdate provides a mock function with given fields: userID +func (_m *UserStore) ResetLastPictureUpdate(userID string) error { + ret := _m.Called(userID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(userId) + r0 = rf(userID) } else { r0 = ret.Error(0) } @@ -1195,13 +1195,13 @@ func (_m *UserStore) SearchNotInChannel(teamID string, channelID string, term st return r0, r1 } -// SearchNotInTeam provides a mock function with given fields: notInTeamId, term, options -func (_m *UserStore) SearchNotInTeam(notInTeamId string, term string, options *model.UserSearchOptions) ([]*model.User, error) { - ret := _m.Called(notInTeamId, term, options) +// SearchNotInTeam provides a mock function with given fields: notInTeamID, term, options +func (_m *UserStore) SearchNotInTeam(notInTeamID string, term string, options *model.UserSearchOptions) ([]*model.User, error) { + ret := _m.Called(notInTeamID, term, options) var r0 []*model.User if rf, ok := ret.Get(0).(func(string, string, *model.UserSearchOptions) []*model.User); ok { - r0 = rf(notInTeamId, term, options) + r0 = rf(notInTeamID, term, options) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.User) @@ -1210,7 +1210,7 @@ func (_m *UserStore) SearchNotInTeam(notInTeamId string, term string, options *m var r1 error if rf, ok := ret.Get(1).(func(string, string, *model.UserSearchOptions) error); ok { - r1 = rf(notInTeamId, term, options) + r1 = rf(notInTeamID, term, options) } else { r1 = ret.Error(1) } @@ -1264,20 +1264,20 @@ func (_m *UserStore) Update(user *model.User, allowRoleUpdate bool) (*model.User return r0, r1 } -// UpdateAuthData provides a mock function with given fields: userId, service, authData, email, resetMfa -func (_m *UserStore) UpdateAuthData(userId string, service string, authData *string, email string, resetMfa bool) (string, error) { - ret := _m.Called(userId, service, authData, email, resetMfa) +// UpdateAuthData provides a mock function with given fields: userID, service, authData, email, resetMfa +func (_m *UserStore) UpdateAuthData(userID string, service string, authData *string, email string, resetMfa bool) (string, error) { + ret := _m.Called(userID, service, authData, email, resetMfa) var r0 string if rf, ok := ret.Get(0).(func(string, string, *string, string, bool) string); ok { - r0 = rf(userId, service, authData, email, resetMfa) + r0 = rf(userID, service, authData, email, resetMfa) } else { r0 = ret.Get(0).(string) } var r1 error if rf, ok := ret.Get(1).(func(string, string, *string, string, bool) error); ok { - r1 = rf(userId, service, authData, email, resetMfa) + r1 = rf(userID, service, authData, email, resetMfa) } else { r1 = ret.Error(1) } @@ -1285,13 +1285,13 @@ func (_m *UserStore) UpdateAuthData(userId string, service string, authData *str return r0, r1 } -// UpdateFailedPasswordAttempts provides a mock function with given fields: userId, attempts -func (_m *UserStore) UpdateFailedPasswordAttempts(userId string, attempts int) error { - ret := _m.Called(userId, attempts) +// UpdateFailedPasswordAttempts provides a mock function with given fields: userID, attempts +func (_m *UserStore) UpdateFailedPasswordAttempts(userID string, attempts int) error { + ret := _m.Called(userID, attempts) var r0 error if rf, ok := ret.Get(0).(func(string, int) error); ok { - r0 = rf(userId, attempts) + r0 = rf(userID, attempts) } else { r0 = ret.Error(0) } @@ -1299,13 +1299,13 @@ func (_m *UserStore) UpdateFailedPasswordAttempts(userId string, attempts int) e return r0 } -// UpdateLastPictureUpdate provides a mock function with given fields: userId -func (_m *UserStore) UpdateLastPictureUpdate(userId string) error { - ret := _m.Called(userId) +// UpdateLastPictureUpdate provides a mock function with given fields: userID +func (_m *UserStore) UpdateLastPictureUpdate(userID string) error { + ret := _m.Called(userID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(userId) + r0 = rf(userID) } else { r0 = ret.Error(0) } @@ -1313,13 +1313,13 @@ func (_m *UserStore) UpdateLastPictureUpdate(userId string) error { return r0 } -// UpdateMfaActive provides a mock function with given fields: userId, active -func (_m *UserStore) UpdateMfaActive(userId string, active bool) error { - ret := _m.Called(userId, active) +// UpdateMfaActive provides a mock function with given fields: userID, active +func (_m *UserStore) UpdateMfaActive(userID string, active bool) error { + ret := _m.Called(userID, active) var r0 error if rf, ok := ret.Get(0).(func(string, bool) error); ok { - r0 = rf(userId, active) + r0 = rf(userID, active) } else { r0 = ret.Error(0) } @@ -1327,13 +1327,13 @@ func (_m *UserStore) UpdateMfaActive(userId string, active bool) error { return r0 } -// UpdateMfaSecret provides a mock function with given fields: userId, secret -func (_m *UserStore) UpdateMfaSecret(userId string, secret string) error { - ret := _m.Called(userId, secret) +// UpdateMfaSecret provides a mock function with given fields: userID, secret +func (_m *UserStore) UpdateMfaSecret(userID string, secret string) error { + ret := _m.Called(userID, secret) var r0 error if rf, ok := ret.Get(0).(func(string, string) error); ok { - r0 = rf(userId, secret) + r0 = rf(userID, secret) } else { r0 = ret.Error(0) } @@ -1341,13 +1341,13 @@ func (_m *UserStore) UpdateMfaSecret(userId string, secret string) error { return r0 } -// UpdatePassword provides a mock function with given fields: userId, newPassword -func (_m *UserStore) UpdatePassword(userId string, newPassword string) error { - ret := _m.Called(userId, newPassword) +// UpdatePassword provides a mock function with given fields: userID, newPassword +func (_m *UserStore) UpdatePassword(userID string, newPassword string) error { + ret := _m.Called(userID, newPassword) var r0 error if rf, ok := ret.Get(0).(func(string, string) error); ok { - r0 = rf(userId, newPassword) + r0 = rf(userID, newPassword) } else { r0 = ret.Error(0) } @@ -1355,20 +1355,20 @@ func (_m *UserStore) UpdatePassword(userId string, newPassword string) error { return r0 } -// UpdateUpdateAt provides a mock function with given fields: userId -func (_m *UserStore) UpdateUpdateAt(userId string) (int64, error) { - ret := _m.Called(userId) +// UpdateUpdateAt provides a mock function with given fields: userID +func (_m *UserStore) UpdateUpdateAt(userID string) (int64, error) { + ret := _m.Called(userID) var r0 int64 if rf, ok := ret.Get(0).(func(string) int64); ok { - r0 = rf(userId) + r0 = rf(userID) } else { r0 = ret.Get(0).(int64) } var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(userId) + r1 = rf(userID) } else { r1 = ret.Error(1) } @@ -1376,20 +1376,20 @@ func (_m *UserStore) UpdateUpdateAt(userId string) (int64, error) { return r0, r1 } -// VerifyEmail provides a mock function with given fields: userId, email -func (_m *UserStore) VerifyEmail(userId string, email string) (string, error) { - ret := _m.Called(userId, email) +// VerifyEmail provides a mock function with given fields: userID, email +func (_m *UserStore) VerifyEmail(userID string, email string) (string, error) { + ret := _m.Called(userID, email) var r0 string if rf, ok := ret.Get(0).(func(string, string) string); ok { - r0 = rf(userId, email) + r0 = rf(userID, email) } else { r0 = ret.Get(0).(string) } var r1 error if rf, ok := ret.Get(1).(func(string, string) error); ok { - r1 = rf(userId, email) + r1 = rf(userID, email) } else { r1 = ret.Error(1) } diff --git a/store/storetest/mocks/UserTermsOfServiceStore.go b/store/storetest/mocks/UserTermsOfServiceStore.go index 2fce026a93..a9aeb08149 100644 --- a/store/storetest/mocks/UserTermsOfServiceStore.go +++ b/store/storetest/mocks/UserTermsOfServiceStore.go @@ -14,13 +14,13 @@ type UserTermsOfServiceStore struct { mock.Mock } -// Delete provides a mock function with given fields: userId, termsOfServiceId -func (_m *UserTermsOfServiceStore) Delete(userId string, termsOfServiceId string) error { - ret := _m.Called(userId, termsOfServiceId) +// Delete provides a mock function with given fields: userID, termsOfServiceId +func (_m *UserTermsOfServiceStore) Delete(userID string, termsOfServiceId string) error { + ret := _m.Called(userID, termsOfServiceId) var r0 error if rf, ok := ret.Get(0).(func(string, string) error); ok { - r0 = rf(userId, termsOfServiceId) + r0 = rf(userID, termsOfServiceId) } else { r0 = ret.Error(0) } @@ -28,13 +28,13 @@ func (_m *UserTermsOfServiceStore) Delete(userId string, termsOfServiceId string return r0 } -// GetByUser provides a mock function with given fields: userId -func (_m *UserTermsOfServiceStore) GetByUser(userId string) (*model.UserTermsOfService, error) { - ret := _m.Called(userId) +// GetByUser provides a mock function with given fields: userID +func (_m *UserTermsOfServiceStore) GetByUser(userID string) (*model.UserTermsOfService, error) { + ret := _m.Called(userID) var r0 *model.UserTermsOfService if rf, ok := ret.Get(0).(func(string) *model.UserTermsOfService); ok { - r0 = rf(userId) + r0 = rf(userID) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.UserTermsOfService) @@ -43,7 +43,7 @@ func (_m *UserTermsOfServiceStore) GetByUser(userId string) (*model.UserTermsOfS var r1 error if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(userId) + r1 = rf(userID) } else { r1 = ret.Error(1) } diff --git a/store/storetest/mocks/WebhookStore.go b/store/storetest/mocks/WebhookStore.go index f73f5204ab..dfaf5dff39 100644 --- a/store/storetest/mocks/WebhookStore.go +++ b/store/storetest/mocks/WebhookStore.go @@ -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) } @@ -204,13 +204,13 @@ func (_m *WebhookStore) GetIncomingList(offset int, limit int) ([]*model.Incomin return r0, r1 } -// GetIncomingListByUser provides a mock function with given fields: userId, offset, limit -func (_m *WebhookStore) GetIncomingListByUser(userId string, offset int, limit int) ([]*model.IncomingWebhook, error) { - ret := _m.Called(userId, offset, limit) +// GetIncomingListByUser provides a mock function with given fields: userID, offset, limit +func (_m *WebhookStore) GetIncomingListByUser(userID string, offset int, limit int) ([]*model.IncomingWebhook, error) { + ret := _m.Called(userID, offset, limit) var r0 []*model.IncomingWebhook if rf, ok := ret.Get(0).(func(string, int, int) []*model.IncomingWebhook); ok { - r0 = rf(userId, offset, limit) + r0 = rf(userID, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.IncomingWebhook) @@ -219,7 +219,7 @@ func (_m *WebhookStore) GetIncomingListByUser(userId string, offset int, limit i var r1 error if rf, ok := ret.Get(1).(func(string, int, int) error); ok { - r1 = rf(userId, offset, limit) + r1 = rf(userID, 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) } @@ -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) } @@ -365,13 +365,13 @@ func (_m *WebhookStore) GetOutgoingList(offset int, limit int) ([]*model.Outgoin return r0, r1 } -// GetOutgoingListByUser provides a mock function with given fields: userId, offset, limit -func (_m *WebhookStore) GetOutgoingListByUser(userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { - ret := _m.Called(userId, offset, limit) +// GetOutgoingListByUser provides a mock function with given fields: userID, offset, limit +func (_m *WebhookStore) GetOutgoingListByUser(userID string, offset int, limit int) ([]*model.OutgoingWebhook, error) { + ret := _m.Called(userID, offset, limit) var r0 []*model.OutgoingWebhook if rf, ok := ret.Get(0).(func(string, int, int) []*model.OutgoingWebhook); ok { - r0 = rf(userId, offset, limit) + r0 = rf(userID, offset, limit) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]*model.OutgoingWebhook) @@ -380,7 +380,7 @@ func (_m *WebhookStore) GetOutgoingListByUser(userId string, offset int, limit i var r1 error if rf, ok := ret.Get(1).(func(string, int, int) error); ok { - r1 = rf(userId, offset, limit) + r1 = rf(userID, offset, limit) } else { r1 = ret.Error(1) } @@ -407,13 +407,13 @@ func (_m *WebhookStore) PermanentDeleteIncomingByChannel(channelID string) error return r0 } -// PermanentDeleteIncomingByUser provides a mock function with given fields: userId -func (_m *WebhookStore) PermanentDeleteIncomingByUser(userId string) error { - ret := _m.Called(userId) +// PermanentDeleteIncomingByUser provides a mock function with given fields: userID +func (_m *WebhookStore) PermanentDeleteIncomingByUser(userID string) error { + ret := _m.Called(userID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(userId) + r0 = rf(userID) } else { r0 = ret.Error(0) } @@ -435,13 +435,13 @@ func (_m *WebhookStore) PermanentDeleteOutgoingByChannel(channelID string) error return r0 } -// PermanentDeleteOutgoingByUser provides a mock function with given fields: userId -func (_m *WebhookStore) PermanentDeleteOutgoingByUser(userId string) error { - ret := _m.Called(userId) +// PermanentDeleteOutgoingByUser provides a mock function with given fields: userID +func (_m *WebhookStore) PermanentDeleteOutgoingByUser(userID string) error { + ret := _m.Called(userID) var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(userId) + r0 = rf(userID) } else { r0 = ret.Error(0) } diff --git a/store/timerlayer/timerlayer.go b/store/timerlayer/timerlayer.go index 5329b326c4..4ab4c12413 100644 --- a/store/timerlayer/timerlayer.go +++ b/store/timerlayer/timerlayer.go @@ -396,10 +396,10 @@ func (s *TimerLayerAuditStore) Get(user_id string, offset int, limit int) (model return result, err } -func (s *TimerLayerAuditStore) PermanentDeleteByUser(userId string) error { +func (s *TimerLayerAuditStore) PermanentDeleteByUser(userID string) error { start := timemodule.Now() - err := s.AuditStore.PermanentDeleteByUser(userId) + err := s.AuditStore.PermanentDeleteByUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -428,10 +428,10 @@ func (s *TimerLayerAuditStore) Save(audit *model.Audit) error { return err } -func (s *TimerLayerBotStore) Get(userId string, includeDeleted bool) (*model.Bot, error) { +func (s *TimerLayerBotStore) Get(userID string, includeDeleted bool) (*model.Bot, error) { start := timemodule.Now() - result, err := s.BotStore.Get(userId, includeDeleted) + result, err := s.BotStore.Get(userID, includeDeleted) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -460,10 +460,10 @@ func (s *TimerLayerBotStore) GetAll(options *model.BotGetOptions) ([]*model.Bot, return result, err } -func (s *TimerLayerBotStore) PermanentDelete(userId string) error { +func (s *TimerLayerBotStore) PermanentDelete(userID string) error { start := timemodule.Now() - err := s.BotStore.PermanentDelete(userId) + err := s.BotStore.PermanentDelete(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -556,10 +556,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 { @@ -603,10 +603,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 { @@ -619,10 +619,10 @@ func (s *TimerLayerChannelStore) ClearSidebarOnTeamLeave(userId string, teamID s return err } -func (s *TimerLayerChannelStore) CountPostsAfter(channelID string, timestamp int64, userId string) (int, int, error) { +func (s *TimerLayerChannelStore) CountPostsAfter(channelID string, timestamp int64, userID string) (int, int, error) { start := timemodule.Now() - result, resultVar1, err := s.ChannelStore.CountPostsAfter(channelID, timestamp, userId) + result, resultVar1, err := s.ChannelStore.CountPostsAfter(channelID, timestamp, userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -635,10 +635,10 @@ func (s *TimerLayerChannelStore) CountPostsAfter(channelID string, timestamp int return result, resultVar1, err } -func (s *TimerLayerChannelStore) CreateDirectChannel(userId *model.User, otherUserId *model.User, channelOptions ...model.ChannelOption) (*model.Channel, error) { +func (s *TimerLayerChannelStore) CreateDirectChannel(userID *model.User, otherUserID *model.User, channelOptions ...model.ChannelOption) (*model.Channel, error) { start := timemodule.Now() - result, err := s.ChannelStore.CreateDirectChannel(userId, otherUserId, channelOptions...) + result, err := s.ChannelStore.CreateDirectChannel(userID, otherUserID, channelOptions...) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -651,10 +651,10 @@ func (s *TimerLayerChannelStore) CreateDirectChannel(userId *model.User, otherUs return result, err } -func (s *TimerLayerChannelStore) CreateInitialSidebarCategories(userId string, teamID string) (*model.OrderedSidebarCategories, error) { +func (s *TimerLayerChannelStore) CreateInitialSidebarCategories(userID string, teamID string) (*model.OrderedSidebarCategories, error) { start := timemodule.Now() - result, err := s.ChannelStore.CreateInitialSidebarCategories(userId, teamID) + result, err := s.ChannelStore.CreateInitialSidebarCategories(userID, teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -667,10 +667,10 @@ func (s *TimerLayerChannelStore) CreateInitialSidebarCategories(userId string, t return result, 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 { @@ -763,10 +763,10 @@ func (s *TimerLayerChannelStore) GetAll(teamID string) ([]*model.Channel, error) return result, err } -func (s *TimerLayerChannelStore) GetAllChannelMembersForUser(userId string, allowFromCache bool, includeDeleted bool) (map[string]string, error) { +func (s *TimerLayerChannelStore) GetAllChannelMembersForUser(userID string, allowFromCache bool, includeDeleted bool) (map[string]string, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetAllChannelMembersForUser(userId, allowFromCache, includeDeleted) + result, err := s.ChannelStore.GetAllChannelMembersForUser(userID, allowFromCache, includeDeleted) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -907,10 +907,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 { @@ -923,10 +923,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 { @@ -955,10 +955,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 { @@ -971,10 +971,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 { @@ -1035,10 +1035,10 @@ func (s *TimerLayerChannelStore) GetChannelsByScheme(schemeID string, offset int return result, err } -func (s *TimerLayerChannelStore) GetDeleted(team_id string, offset int, limit int, userId string) (*model.ChannelList, error) { +func (s *TimerLayerChannelStore) GetDeleted(team_id string, offset int, limit int, userID string) (*model.ChannelList, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetDeleted(team_id, offset, limit, userId) + result, err := s.ChannelStore.GetDeleted(team_id, offset, limit, userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1115,10 +1115,10 @@ func (s *TimerLayerChannelStore) GetGuestCount(channelID string, allowFromCache return result, err } -func (s *TimerLayerChannelStore) GetMember(ctx context.Context, channelID string, userId string) (*model.ChannelMember, error) { +func (s *TimerLayerChannelStore) GetMember(ctx context.Context, channelID string, userID string) (*model.ChannelMember, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetMember(ctx, channelID, userId) + result, err := s.ChannelStore.GetMember(ctx, channelID, userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1179,10 +1179,10 @@ func (s *TimerLayerChannelStore) GetMemberCountsByGroup(ctx context.Context, cha 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 { @@ -1211,10 +1211,10 @@ func (s *TimerLayerChannelStore) GetMembers(channelID string, offset int, limit return result, err } -func (s *TimerLayerChannelStore) GetMembersByChannelIds(channelIds []string, userId string) (*model.ChannelMembers, error) { +func (s *TimerLayerChannelStore) GetMembersByChannelIds(channelIds []string, userID string) (*model.ChannelMembers, error) { start := timemodule.Now() - result, err := s.ChannelStore.GetMembersByChannelIds(channelIds, userId) + result, err := s.ChannelStore.GetMembersByChannelIds(channelIds, userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1243,10 +1243,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 { @@ -1259,10 +1259,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 { @@ -1275,10 +1275,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 { @@ -1371,10 +1371,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 { @@ -1403,10 +1403,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 { @@ -1467,10 +1467,10 @@ func (s *TimerLayerChannelStore) GroupSyncedChannelCount() (int64, error) { return result, err } -func (s *TimerLayerChannelStore) IncrementMentionCount(channelID string, userId string, updateThreads bool, isRoot bool) error { +func (s *TimerLayerChannelStore) IncrementMentionCount(channelID string, userID string, updateThreads bool, isRoot bool) error { start := timemodule.Now() - err := s.ChannelStore.IncrementMentionCount(channelID, userId, updateThreads, isRoot) + err := s.ChannelStore.IncrementMentionCount(channelID, userID, updateThreads, isRoot) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1483,10 +1483,10 @@ func (s *TimerLayerChannelStore) IncrementMentionCount(channelID string, userId return err } -func (s *TimerLayerChannelStore) InvalidateAllChannelMembersForUser(userId string) { +func (s *TimerLayerChannelStore) InvalidateAllChannelMembersForUser(userID string) { start := timemodule.Now() - s.ChannelStore.InvalidateAllChannelMembersForUser(userId) + s.ChannelStore.InvalidateAllChannelMembersForUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1588,10 +1588,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 { @@ -1604,10 +1604,10 @@ func (s *TimerLayerChannelStore) IsUserInChannelUseCache(userId string, channelI return result } -func (s *TimerLayerChannelStore) MigrateChannelMembers(fromChannelId string, fromUserId string) (map[string]string, error) { +func (s *TimerLayerChannelStore) MigrateChannelMembers(fromChannelID string, fromUserID string) (map[string]string, error) { start := timemodule.Now() - result, err := s.ChannelStore.MigrateChannelMembers(fromChannelId, fromUserId) + result, err := s.ChannelStore.MigrateChannelMembers(fromChannelID, fromUserID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1684,10 +1684,10 @@ func (s *TimerLayerChannelStore) PermanentDeleteMembersByChannel(channelID strin return err } -func (s *TimerLayerChannelStore) PermanentDeleteMembersByUser(userId string) error { +func (s *TimerLayerChannelStore) PermanentDeleteMembersByUser(userID string) error { start := timemodule.Now() - err := s.ChannelStore.PermanentDeleteMembersByUser(userId) + err := s.ChannelStore.PermanentDeleteMembersByUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1716,10 +1716,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 { @@ -1860,10 +1860,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 { @@ -1876,10 +1876,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 { @@ -1892,10 +1892,10 @@ func (s *TimerLayerChannelStore) SearchForUserInTeam(userId string, teamID strin return result, err } -func (s *TimerLayerChannelStore) SearchGroupChannels(userId string, term string) (*model.ChannelList, error) { +func (s *TimerLayerChannelStore) SearchGroupChannels(userID string, term string) (*model.ChannelList, error) { start := timemodule.Now() - result, err := s.ChannelStore.SearchGroupChannels(userId, term) + result, err := s.ChannelStore.SearchGroupChannels(userID, term) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1924,10 +1924,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 { @@ -1988,10 +1988,10 @@ func (s *TimerLayerChannelStore) Update(channel *model.Channel) (*model.Channel, return result, err } -func (s *TimerLayerChannelStore) UpdateLastViewedAt(channelIds []string, userId string, updateThreads bool) (map[string]int64, error) { +func (s *TimerLayerChannelStore) UpdateLastViewedAt(channelIds []string, userID string, updateThreads bool) (map[string]int64, error) { start := timemodule.Now() - result, err := s.ChannelStore.UpdateLastViewedAt(channelIds, userId, updateThreads) + result, err := s.ChannelStore.UpdateLastViewedAt(channelIds, userID, updateThreads) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2068,10 +2068,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 { @@ -2084,10 +2084,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 { @@ -2132,10 +2132,10 @@ func (s *TimerLayerChannelStore) UpdateSidebarChannelsByPreferences(preferences return err } -func (s *TimerLayerChannelStore) UserBelongsToChannels(userId string, channelIds []string) (bool, error) { +func (s *TimerLayerChannelStore) UserBelongsToChannels(userID string, channelIds []string) (bool, error) { start := timemodule.Now() - result, err := s.ChannelStore.UserBelongsToChannels(userId, channelIds) + result, err := s.ChannelStore.UserBelongsToChannels(userID, channelIds) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2164,10 +2164,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 { @@ -2180,10 +2180,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 { @@ -2404,10 +2404,10 @@ func (s *TimerLayerCommandStore) PermanentDeleteByTeam(teamID string) error { return err } -func (s *TimerLayerCommandStore) PermanentDeleteByUser(userId string) error { +func (s *TimerLayerCommandStore) PermanentDeleteByUser(userID string) error { start := timemodule.Now() - err := s.CommandStore.PermanentDeleteByUser(userId) + err := s.CommandStore.PermanentDeleteByUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2723,10 +2723,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 { @@ -2866,10 +2866,10 @@ func (s *TimerLayerFileInfoStore) GetForPost(postID string, readFromMaster bool, return result, err } -func (s *TimerLayerFileInfoStore) GetForUser(userId string) ([]*model.FileInfo, error) { +func (s *TimerLayerFileInfoStore) GetForUser(userID string) ([]*model.FileInfo, error) { start := timemodule.Now() - result, err := s.FileInfoStore.GetForUser(userId) + result, err := s.FileInfoStore.GetForUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2945,10 +2945,10 @@ func (s *TimerLayerFileInfoStore) PermanentDeleteBatch(endTime int64, limit int6 return result, err } -func (s *TimerLayerFileInfoStore) PermanentDeleteByUser(userId string) (int64, error) { +func (s *TimerLayerFileInfoStore) PermanentDeleteByUser(userID string) (int64, error) { start := timemodule.Now() - result, err := s.FileInfoStore.PermanentDeleteByUser(userId) + result, err := s.FileInfoStore.PermanentDeleteByUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -2977,10 +2977,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 { @@ -3345,10 +3345,10 @@ func (s *TimerLayerGroupStore) GetByRemoteID(remoteID string, groupSource model. return result, err } -func (s *TimerLayerGroupStore) GetByUser(userId string) ([]*model.Group, error) { +func (s *TimerLayerGroupStore) GetByUser(userID string) ([]*model.Group, error) { start := timemodule.Now() - result, err := s.GroupStore.GetByUser(userId) + result, err := s.GroupStore.GetByUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -3601,10 +3601,10 @@ func (s *TimerLayerGroupStore) GroupTeamCount() (int64, error) { return result, err } -func (s *TimerLayerGroupStore) PermanentDeleteMembersByUser(userId string) error { +func (s *TimerLayerGroupStore) PermanentDeleteMembersByUser(userID string) error { start := timemodule.Now() - err := s.GroupStore.PermanentDeleteMembersByUser(userId) + err := s.GroupStore.PermanentDeleteMembersByUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4049,10 +4049,10 @@ func (s *TimerLayerOAuthStore) GetAccessDataByRefreshToken(token string) (*model return result, err } -func (s *TimerLayerOAuthStore) GetAccessDataByUserForApp(userId string, clientId string) ([]*model.AccessData, error) { +func (s *TimerLayerOAuthStore) GetAccessDataByUserForApp(userID string, clientId string) ([]*model.AccessData, error) { start := timemodule.Now() - result, err := s.OAuthStore.GetAccessDataByUserForApp(userId, clientId) + result, err := s.OAuthStore.GetAccessDataByUserForApp(userID, clientId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4081,10 +4081,10 @@ func (s *TimerLayerOAuthStore) GetApp(id string) (*model.OAuthApp, error) { return result, err } -func (s *TimerLayerOAuthStore) GetAppByUser(userId string, offset int, limit int) ([]*model.OAuthApp, error) { +func (s *TimerLayerOAuthStore) GetAppByUser(userID string, offset int, limit int) ([]*model.OAuthApp, error) { start := timemodule.Now() - result, err := s.OAuthStore.GetAppByUser(userId, offset, limit) + result, err := s.OAuthStore.GetAppByUser(userID, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4129,10 +4129,10 @@ func (s *TimerLayerOAuthStore) GetAuthData(code string) (*model.AuthData, error) return result, err } -func (s *TimerLayerOAuthStore) GetAuthorizedApps(userId string, offset int, limit int) ([]*model.OAuthApp, error) { +func (s *TimerLayerOAuthStore) GetAuthorizedApps(userID string, offset int, limit int) ([]*model.OAuthApp, error) { start := timemodule.Now() - result, err := s.OAuthStore.GetAuthorizedApps(userId, offset, limit) + result, err := s.OAuthStore.GetAuthorizedApps(userID, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4145,10 +4145,10 @@ func (s *TimerLayerOAuthStore) GetAuthorizedApps(userId string, offset int, limi return result, err } -func (s *TimerLayerOAuthStore) GetPreviousAccessData(userId string, clientId string) (*model.AccessData, error) { +func (s *TimerLayerOAuthStore) GetPreviousAccessData(userID string, clientId string) (*model.AccessData, error) { start := timemodule.Now() - result, err := s.OAuthStore.GetPreviousAccessData(userId, clientId) + result, err := s.OAuthStore.GetPreviousAccessData(userID, clientId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4161,10 +4161,10 @@ func (s *TimerLayerOAuthStore) GetPreviousAccessData(userId string, clientId str return result, err } -func (s *TimerLayerOAuthStore) PermanentDeleteAuthDataByUser(userId string) error { +func (s *TimerLayerOAuthStore) PermanentDeleteAuthDataByUser(userID string) error { start := timemodule.Now() - err := s.OAuthStore.PermanentDeleteAuthDataByUser(userId) + err := s.OAuthStore.PermanentDeleteAuthDataByUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4576,10 +4576,10 @@ func (s *TimerLayerPostStore) GetEtag(channelID string, allowFromCache bool, col return result } -func (s *TimerLayerPostStore) GetFlaggedPosts(userId string, offset int, limit int) (*model.PostList, error) { +func (s *TimerLayerPostStore) GetFlaggedPosts(userID string, offset int, limit int) (*model.PostList, error) { start := timemodule.Now() - result, err := s.PostStore.GetFlaggedPosts(userId, offset, limit) + result, err := s.PostStore.GetFlaggedPosts(userID, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4592,10 +4592,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 { @@ -4608,10 +4608,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 { @@ -4975,10 +4975,10 @@ func (s *TimerLayerPostStore) PermanentDeleteByChannel(channelID string) error { return err } -func (s *TimerLayerPostStore) PermanentDeleteByUser(userId string) error { +func (s *TimerLayerPostStore) PermanentDeleteByUser(userID string) error { start := timemodule.Now() - err := s.PostStore.PermanentDeleteByUser(userId) + err := s.PostStore.PermanentDeleteByUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5023,10 +5023,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 { @@ -5039,10 +5039,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 { @@ -5087,10 +5087,10 @@ func (s *TimerLayerPreferenceStore) CleanupFlagsBatch(limit int64) (int64, error return result, err } -func (s *TimerLayerPreferenceStore) Delete(userId string, category string, name string) error { +func (s *TimerLayerPreferenceStore) Delete(userID string, category string, name string) error { start := timemodule.Now() - err := s.PreferenceStore.Delete(userId, category, name) + err := s.PreferenceStore.Delete(userID, category, name) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5103,10 +5103,10 @@ func (s *TimerLayerPreferenceStore) Delete(userId string, category string, name return err } -func (s *TimerLayerPreferenceStore) DeleteCategory(userId string, category string) error { +func (s *TimerLayerPreferenceStore) DeleteCategory(userID string, category string) error { start := timemodule.Now() - err := s.PreferenceStore.DeleteCategory(userId, category) + err := s.PreferenceStore.DeleteCategory(userID, category) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5135,10 +5135,10 @@ func (s *TimerLayerPreferenceStore) DeleteCategoryAndName(category string, name return err } -func (s *TimerLayerPreferenceStore) Get(userId string, category string, name string) (*model.Preference, error) { +func (s *TimerLayerPreferenceStore) Get(userID string, category string, name string) (*model.Preference, error) { start := timemodule.Now() - result, err := s.PreferenceStore.Get(userId, category, name) + result, err := s.PreferenceStore.Get(userID, category, name) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5151,10 +5151,10 @@ func (s *TimerLayerPreferenceStore) Get(userId string, category string, name str return result, err } -func (s *TimerLayerPreferenceStore) GetAll(userId string) (model.Preferences, error) { +func (s *TimerLayerPreferenceStore) GetAll(userID string) (model.Preferences, error) { start := timemodule.Now() - result, err := s.PreferenceStore.GetAll(userId) + result, err := s.PreferenceStore.GetAll(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5167,10 +5167,10 @@ func (s *TimerLayerPreferenceStore) GetAll(userId string) (model.Preferences, er return result, err } -func (s *TimerLayerPreferenceStore) GetCategory(userId string, category string) (model.Preferences, error) { +func (s *TimerLayerPreferenceStore) GetCategory(userID string, category string) (model.Preferences, error) { start := timemodule.Now() - result, err := s.PreferenceStore.GetCategory(userId, category) + result, err := s.PreferenceStore.GetCategory(userID, category) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5183,10 +5183,10 @@ func (s *TimerLayerPreferenceStore) GetCategory(userId string, category string) return result, err } -func (s *TimerLayerPreferenceStore) PermanentDeleteByUser(userId string) error { +func (s *TimerLayerPreferenceStore) PermanentDeleteByUser(userID string) error { start := timemodule.Now() - err := s.PreferenceStore.PermanentDeleteByUser(userId) + err := s.PreferenceStore.PermanentDeleteByUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5247,10 +5247,10 @@ func (s *TimerLayerProductNoticesStore) ClearOldNotices(currentNotices *model.Pr return err } -func (s *TimerLayerProductNoticesStore) GetViews(userId string) ([]model.ProductNoticeViewState, error) { +func (s *TimerLayerProductNoticesStore) GetViews(userID string) ([]model.ProductNoticeViewState, error) { start := timemodule.Now() - result, err := s.ProductNoticesStore.GetViews(userId) + result, err := s.ProductNoticesStore.GetViews(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5263,10 +5263,10 @@ func (s *TimerLayerProductNoticesStore) GetViews(userId string) ([]model.Product return result, err } -func (s *TimerLayerProductNoticesStore) View(userId string, notices []string) error { +func (s *TimerLayerProductNoticesStore) View(userID string, notices []string) error { start := timemodule.Now() - err := s.ProductNoticesStore.View(userId, notices) + err := s.ProductNoticesStore.View(userID, notices) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5838,10 +5838,10 @@ func (s *TimerLayerSessionStore) Get(ctx context.Context, sessionIDOrToken strin return result, err } -func (s *TimerLayerSessionStore) GetSessions(userId string) ([]*model.Session, error) { +func (s *TimerLayerSessionStore) GetSessions(userID string) ([]*model.Session, error) { start := timemodule.Now() - result, err := s.SessionStore.GetSessions(userId) + result, err := s.SessionStore.GetSessions(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -5870,10 +5870,10 @@ func (s *TimerLayerSessionStore) GetSessionsExpired(thresholdMillis int64, mobil return result, err } -func (s *TimerLayerSessionStore) GetSessionsWithActiveDeviceIds(userId string) ([]*model.Session, error) { +func (s *TimerLayerSessionStore) GetSessionsWithActiveDeviceIds(userID string) ([]*model.Session, error) { start := timemodule.Now() - result, err := s.SessionStore.GetSessionsWithActiveDeviceIds(userId) + result, err := s.SessionStore.GetSessionsWithActiveDeviceIds(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6030,10 +6030,10 @@ func (s *TimerLayerSessionStore) UpdateProps(session *model.Session) error { return err } -func (s *TimerLayerSessionStore) UpdateRoles(userId string, roles string) (string, error) { +func (s *TimerLayerSessionStore) UpdateRoles(userID string, roles string) (string, error) { start := timemodule.Now() - result, err := s.SessionStore.UpdateRoles(userId, roles) + result, err := s.SessionStore.UpdateRoles(userID, roles) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6430,10 +6430,10 @@ func (s *TimerLayerSharedChannelStore) UpsertAttachment(remote *model.SharedChan return result, err } -func (s *TimerLayerStatusStore) Get(userId string) (*model.Status, error) { +func (s *TimerLayerStatusStore) Get(userID string) (*model.Status, error) { start := timemodule.Now() - result, err := s.StatusStore.Get(userId) + result, err := s.StatusStore.Get(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6510,10 +6510,10 @@ func (s *TimerLayerStatusStore) SaveOrUpdate(status *model.Status) error { return err } -func (s *TimerLayerStatusStore) UpdateLastActivityAt(userId string, lastActivityAt int64) error { +func (s *TimerLayerStatusStore) UpdateLastActivityAt(userID string, lastActivityAt int64) error { start := timemodule.Now() - err := s.StatusStore.UpdateLastActivityAt(userId, lastActivityAt) + err := s.StatusStore.UpdateLastActivityAt(userID, lastActivityAt) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -6957,10 +6957,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 { @@ -6973,10 +6973,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 { @@ -6989,10 +6989,10 @@ func (s *TimerLayerTeamStore) GetChannelUnreadsForTeam(teamID string, userId str return result, err } -func (s *TimerLayerTeamStore) GetMember(ctx context.Context, teamID string, userId string) (*model.TeamMember, error) { +func (s *TimerLayerTeamStore) GetMember(ctx context.Context, teamID string, userID string) (*model.TeamMember, error) { start := timemodule.Now() - result, err := s.TeamStore.GetMember(ctx, teamID, userId) + result, err := s.TeamStore.GetMember(ctx, teamID, userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7037,10 +7037,10 @@ func (s *TimerLayerTeamStore) GetMembersByIds(teamID string, userIds []string, r return result, err } -func (s *TimerLayerTeamStore) GetTeamMembersForExport(userId string) ([]*model.TeamMemberForExport, error) { +func (s *TimerLayerTeamStore) GetTeamMembersForExport(userID string) ([]*model.TeamMemberForExport, error) { start := timemodule.Now() - result, err := s.TeamStore.GetTeamMembersForExport(userId) + result, err := s.TeamStore.GetTeamMembersForExport(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7069,10 +7069,10 @@ func (s *TimerLayerTeamStore) GetTeamsByScheme(schemeID string, offset int, limi return result, err } -func (s *TimerLayerTeamStore) GetTeamsByUserId(userId string) ([]*model.Team, error) { +func (s *TimerLayerTeamStore) GetTeamsByUserId(userID string) ([]*model.Team, error) { start := timemodule.Now() - result, err := s.TeamStore.GetTeamsByUserId(userId) + result, err := s.TeamStore.GetTeamsByUserId(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7085,10 +7085,10 @@ func (s *TimerLayerTeamStore) GetTeamsByUserId(userId string) ([]*model.Team, er return result, err } -func (s *TimerLayerTeamStore) GetTeamsForUser(ctx context.Context, userId string) ([]*model.TeamMember, error) { +func (s *TimerLayerTeamStore) GetTeamsForUser(ctx context.Context, userID string) ([]*model.TeamMember, error) { start := timemodule.Now() - result, err := s.TeamStore.GetTeamsForUser(ctx, userId) + result, err := s.TeamStore.GetTeamsForUser(ctx, userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7101,10 +7101,10 @@ func (s *TimerLayerTeamStore) GetTeamsForUser(ctx context.Context, userId string return result, err } -func (s *TimerLayerTeamStore) GetTeamsForUserWithPagination(userId string, page int, perPage int) ([]*model.TeamMember, error) { +func (s *TimerLayerTeamStore) GetTeamsForUserWithPagination(userID string, page int, perPage int) ([]*model.TeamMember, error) { start := timemodule.Now() - result, err := s.TeamStore.GetTeamsForUserWithPagination(userId, page, perPage) + result, err := s.TeamStore.GetTeamsForUserWithPagination(userID, page, perPage) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7133,10 +7133,10 @@ func (s *TimerLayerTeamStore) GetTotalMemberCount(teamID string, restrictions *m return result, err } -func (s *TimerLayerTeamStore) GetUserTeamIds(userId string, allowFromCache bool) ([]string, error) { +func (s *TimerLayerTeamStore) GetUserTeamIds(userID string, allowFromCache bool) ([]string, error) { start := timemodule.Now() - result, err := s.TeamStore.GetUserTeamIds(userId, allowFromCache) + result, err := s.TeamStore.GetUserTeamIds(userID, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7165,10 +7165,10 @@ func (s *TimerLayerTeamStore) GroupSyncedTeamCount() (int64, error) { return result, err } -func (s *TimerLayerTeamStore) InvalidateAllTeamIdsForUser(userId string) { +func (s *TimerLayerTeamStore) InvalidateAllTeamIdsForUser(userID string) { start := timemodule.Now() - s.TeamStore.InvalidateAllTeamIdsForUser(userId) + s.TeamStore.InvalidateAllTeamIdsForUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7180,10 +7180,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 { @@ -7228,10 +7228,10 @@ func (s *TimerLayerTeamStore) RemoveAllMembersByTeam(teamID string) error { return err } -func (s *TimerLayerTeamStore) RemoveAllMembersByUser(userId string) error { +func (s *TimerLayerTeamStore) RemoveAllMembersByUser(userID string) error { start := timemodule.Now() - err := s.TeamStore.RemoveAllMembersByUser(userId) + err := s.TeamStore.RemoveAllMembersByUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7244,10 +7244,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 { @@ -7484,10 +7484,10 @@ func (s *TimerLayerTeamStore) UpdateMultipleMembers(members []*model.TeamMember) return result, err } -func (s *TimerLayerTeamStore) UserBelongsToTeams(userId string, teamIds []string) (bool, error) { +func (s *TimerLayerTeamStore) UserBelongsToTeams(userID string, teamIds []string) (bool, error) { start := timemodule.Now() - result, err := s.TeamStore.UserBelongsToTeams(userId, teamIds) + result, err := s.TeamStore.UserBelongsToTeams(userID, teamIds) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7564,10 +7564,10 @@ func (s *TimerLayerThreadStore) CollectThreadsWithNewerReplies(userId string, ch return result, err } -func (s *TimerLayerThreadStore) Delete(postId string) error { +func (s *TimerLayerThreadStore) Delete(postID string) error { start := timemodule.Now() - err := s.ThreadStore.Delete(postId) + err := s.ThreadStore.Delete(postID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7644,10 +7644,10 @@ func (s *TimerLayerThreadStore) GetMembershipsForUser(userId string, teamID stri return result, err } -func (s *TimerLayerThreadStore) GetPosts(threadId string, since int64) ([]*model.Post, error) { +func (s *TimerLayerThreadStore) GetPosts(threadID string, since int64) ([]*model.Post, error) { start := timemodule.Now() - result, err := s.ThreadStore.GetPosts(threadId, since) + result, err := s.ThreadStore.GetPosts(threadID, since) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7660,10 +7660,10 @@ func (s *TimerLayerThreadStore) GetPosts(threadId string, since int64) ([]*model return result, err } -func (s *TimerLayerThreadStore) GetThreadForUser(userId string, teamId string, threadId string, extended bool) (*model.ThreadResponse, error) { +func (s *TimerLayerThreadStore) GetThreadForUser(userID string, teamID string, threadId string, extended bool) (*model.ThreadResponse, error) { start := timemodule.Now() - result, err := s.ThreadStore.GetThreadForUser(userId, teamId, threadId, extended) + result, err := s.ThreadStore.GetThreadForUser(userID, teamID, threadId, extended) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7676,10 +7676,10 @@ func (s *TimerLayerThreadStore) GetThreadForUser(userId string, teamId string, t return result, err } -func (s *TimerLayerThreadStore) GetThreadsForUser(userId string, teamId string, opts model.GetUserThreadsOpts) (*model.Threads, error) { +func (s *TimerLayerThreadStore) GetThreadsForUser(userId string, teamID string, opts model.GetUserThreadsOpts) (*model.Threads, error) { start := timemodule.Now() - result, err := s.ThreadStore.GetThreadsForUser(userId, teamId, opts) + result, err := s.ThreadStore.GetThreadsForUser(userId, teamID, opts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7692,10 +7692,10 @@ func (s *TimerLayerThreadStore) GetThreadsForUser(userId string, teamId string, return result, err } -func (s *TimerLayerThreadStore) MaintainMembership(userId string, postID string, following bool, incrementMentions bool, updateFollowing bool, updateViewedTimestamp bool) error { +func (s *TimerLayerThreadStore) MaintainMembership(userID string, postID string, following bool, incrementMentions bool, updateFollowing bool, updateViewedTimestamp bool) error { start := timemodule.Now() - err := s.ThreadStore.MaintainMembership(userId, postID, following, incrementMentions, updateFollowing, updateViewedTimestamp) + err := s.ThreadStore.MaintainMembership(userID, postID, following, incrementMentions, updateFollowing, updateViewedTimestamp) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7708,10 +7708,10 @@ func (s *TimerLayerThreadStore) MaintainMembership(userId string, postID string, return 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 { @@ -7724,10 +7724,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 { @@ -7947,10 +7947,10 @@ func (s *TimerLayerUploadSessionStore) Get(id string) (*model.UploadSession, err return result, err } -func (s *TimerLayerUploadSessionStore) GetForUser(userId string) ([]*model.UploadSession, error) { +func (s *TimerLayerUploadSessionStore) GetForUser(userID string) ([]*model.UploadSession, error) { start := timemodule.Now() - result, err := s.UploadSessionStore.GetForUser(userId) + result, err := s.UploadSessionStore.GetForUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8266,10 +8266,10 @@ func (s *TimerLayerUserStore) GetAllProfiles(options *model.UserGetOptions) ([]* return result, err } -func (s *TimerLayerUserStore) GetAllProfilesInChannel(ctx context.Context, channelId string, allowFromCache bool) (map[string]*model.User, error) { +func (s *TimerLayerUserStore) GetAllProfilesInChannel(ctx context.Context, channelID string, allowFromCache bool) (map[string]*model.User, error) { start := timemodule.Now() - result, err := s.UserStore.GetAllProfilesInChannel(ctx, channelId, allowFromCache) + result, err := s.UserStore.GetAllProfilesInChannel(ctx, channelID, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8298,10 +8298,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 { @@ -8490,10 +8490,10 @@ func (s *TimerLayerUserStore) GetNewUsersForTeam(teamID string, offset int, limi return result, err } -func (s *TimerLayerUserStore) GetProfileByGroupChannelIdsForUser(userId string, channelIds []string) (map[string][]*model.User, error) { +func (s *TimerLayerUserStore) GetProfileByGroupChannelIdsForUser(userID string, channelIds []string) (map[string][]*model.User, error) { start := timemodule.Now() - result, err := s.UserStore.GetProfileByGroupChannelIdsForUser(userId, channelIds) + result, err := s.UserStore.GetProfileByGroupChannelIdsForUser(userID, channelIds) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8586,10 +8586,10 @@ func (s *TimerLayerUserStore) GetProfilesInChannelByStatus(options *model.UserGe return result, err } -func (s *TimerLayerUserStore) GetProfilesNotInChannel(teamId string, channelId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { +func (s *TimerLayerUserStore) GetProfilesNotInChannel(teamID string, channelId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, error) { start := timemodule.Now() - result, err := s.UserStore.GetProfilesNotInChannel(teamId, channelId, groupConstrained, offset, limit, viewRestrictions) + result, err := s.UserStore.GetProfilesNotInChannel(teamID, channelId, groupConstrained, offset, limit, viewRestrictions) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8682,10 +8682,10 @@ func (s *TimerLayerUserStore) GetTeamGroupUsers(teamID string) ([]*model.User, e return result, err } -func (s *TimerLayerUserStore) GetUnreadCount(userId string) (int64, error) { +func (s *TimerLayerUserStore) GetUnreadCount(userID string) (int64, error) { start := timemodule.Now() - result, err := s.UserStore.GetUnreadCount(userId) + result, err := s.UserStore.GetUnreadCount(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8698,10 +8698,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 { @@ -8746,10 +8746,10 @@ func (s *TimerLayerUserStore) InferSystemInstallDate() (int64, error) { return result, err } -func (s *TimerLayerUserStore) InvalidateProfileCacheForUser(userId string) { +func (s *TimerLayerUserStore) InvalidateProfileCacheForUser(userID string) { start := timemodule.Now() - s.UserStore.InvalidateProfileCacheForUser(userId) + s.UserStore.InvalidateProfileCacheForUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8776,10 +8776,10 @@ func (s *TimerLayerUserStore) InvalidateProfilesInChannelCache(channelID string) } } -func (s *TimerLayerUserStore) InvalidateProfilesInChannelCacheByUser(userId string) { +func (s *TimerLayerUserStore) InvalidateProfilesInChannelCacheByUser(userID string) { start := timemodule.Now() - s.UserStore.InvalidateProfilesInChannelCacheByUser(userId) + s.UserStore.InvalidateProfilesInChannelCacheByUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8791,10 +8791,10 @@ func (s *TimerLayerUserStore) InvalidateProfilesInChannelCacheByUser(userId stri } } -func (s *TimerLayerUserStore) PermanentDelete(userId string) error { +func (s *TimerLayerUserStore) PermanentDelete(userID string) error { start := timemodule.Now() - err := s.UserStore.PermanentDelete(userId) + err := s.UserStore.PermanentDelete(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8823,10 +8823,10 @@ func (s *TimerLayerUserStore) PromoteGuestToUser(userID string) error { return err } -func (s *TimerLayerUserStore) ResetLastPictureUpdate(userId string) error { +func (s *TimerLayerUserStore) ResetLastPictureUpdate(userID string) error { start := timemodule.Now() - err := s.UserStore.ResetLastPictureUpdate(userId) + err := s.UserStore.ResetLastPictureUpdate(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8919,10 +8919,10 @@ func (s *TimerLayerUserStore) SearchNotInChannel(teamID string, channelID string return result, err } -func (s *TimerLayerUserStore) SearchNotInTeam(notInTeamId string, term string, options *model.UserSearchOptions) ([]*model.User, error) { +func (s *TimerLayerUserStore) SearchNotInTeam(notInTeamID string, term string, options *model.UserSearchOptions) ([]*model.User, error) { start := timemodule.Now() - result, err := s.UserStore.SearchNotInTeam(notInTeamId, term, options) + result, err := s.UserStore.SearchNotInTeam(notInTeamID, term, options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8967,10 +8967,10 @@ func (s *TimerLayerUserStore) Update(user *model.User, allowRoleUpdate bool) (*m return result, err } -func (s *TimerLayerUserStore) UpdateAuthData(userId string, service string, authData *string, email string, resetMfa bool) (string, error) { +func (s *TimerLayerUserStore) UpdateAuthData(userID string, service string, authData *string, email string, resetMfa bool) (string, error) { start := timemodule.Now() - result, err := s.UserStore.UpdateAuthData(userId, service, authData, email, resetMfa) + result, err := s.UserStore.UpdateAuthData(userID, service, authData, email, resetMfa) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8983,10 +8983,10 @@ func (s *TimerLayerUserStore) UpdateAuthData(userId string, service string, auth return result, err } -func (s *TimerLayerUserStore) UpdateFailedPasswordAttempts(userId string, attempts int) error { +func (s *TimerLayerUserStore) UpdateFailedPasswordAttempts(userID string, attempts int) error { start := timemodule.Now() - err := s.UserStore.UpdateFailedPasswordAttempts(userId, attempts) + err := s.UserStore.UpdateFailedPasswordAttempts(userID, attempts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -8999,10 +8999,10 @@ func (s *TimerLayerUserStore) UpdateFailedPasswordAttempts(userId string, attemp return err } -func (s *TimerLayerUserStore) UpdateLastPictureUpdate(userId string) error { +func (s *TimerLayerUserStore) UpdateLastPictureUpdate(userID string) error { start := timemodule.Now() - err := s.UserStore.UpdateLastPictureUpdate(userId) + err := s.UserStore.UpdateLastPictureUpdate(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -9015,10 +9015,10 @@ func (s *TimerLayerUserStore) UpdateLastPictureUpdate(userId string) error { return err } -func (s *TimerLayerUserStore) UpdateMfaActive(userId string, active bool) error { +func (s *TimerLayerUserStore) UpdateMfaActive(userID string, active bool) error { start := timemodule.Now() - err := s.UserStore.UpdateMfaActive(userId, active) + err := s.UserStore.UpdateMfaActive(userID, active) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -9031,10 +9031,10 @@ func (s *TimerLayerUserStore) UpdateMfaActive(userId string, active bool) error return err } -func (s *TimerLayerUserStore) UpdateMfaSecret(userId string, secret string) error { +func (s *TimerLayerUserStore) UpdateMfaSecret(userID string, secret string) error { start := timemodule.Now() - err := s.UserStore.UpdateMfaSecret(userId, secret) + err := s.UserStore.UpdateMfaSecret(userID, secret) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -9047,10 +9047,10 @@ func (s *TimerLayerUserStore) UpdateMfaSecret(userId string, secret string) erro return err } -func (s *TimerLayerUserStore) UpdatePassword(userId string, newPassword string) error { +func (s *TimerLayerUserStore) UpdatePassword(userID string, newPassword string) error { start := timemodule.Now() - err := s.UserStore.UpdatePassword(userId, newPassword) + err := s.UserStore.UpdatePassword(userID, newPassword) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -9063,10 +9063,10 @@ func (s *TimerLayerUserStore) UpdatePassword(userId string, newPassword string) return err } -func (s *TimerLayerUserStore) UpdateUpdateAt(userId string) (int64, error) { +func (s *TimerLayerUserStore) UpdateUpdateAt(userID string) (int64, error) { start := timemodule.Now() - result, err := s.UserStore.UpdateUpdateAt(userId) + result, err := s.UserStore.UpdateUpdateAt(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -9079,10 +9079,10 @@ func (s *TimerLayerUserStore) UpdateUpdateAt(userId string) (int64, error) { return result, err } -func (s *TimerLayerUserStore) VerifyEmail(userId string, email string) (string, error) { +func (s *TimerLayerUserStore) VerifyEmail(userID string, email string) (string, error) { start := timemodule.Now() - result, err := s.UserStore.VerifyEmail(userId, email) + result, err := s.UserStore.VerifyEmail(userID, email) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -9111,10 +9111,10 @@ func (s *TimerLayerUserAccessTokenStore) Delete(tokenID string) error { return err } -func (s *TimerLayerUserAccessTokenStore) DeleteAllForUser(userId string) error { +func (s *TimerLayerUserAccessTokenStore) DeleteAllForUser(userID string) error { start := timemodule.Now() - err := s.UserAccessTokenStore.DeleteAllForUser(userId) + err := s.UserAccessTokenStore.DeleteAllForUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -9175,10 +9175,10 @@ func (s *TimerLayerUserAccessTokenStore) GetByToken(tokenString string) (*model. return result, err } -func (s *TimerLayerUserAccessTokenStore) GetByUser(userId string, page int, perPage int) ([]*model.UserAccessToken, error) { +func (s *TimerLayerUserAccessTokenStore) GetByUser(userID string, page int, perPage int) ([]*model.UserAccessToken, error) { start := timemodule.Now() - result, err := s.UserAccessTokenStore.GetByUser(userId, page, perPage) + result, err := s.UserAccessTokenStore.GetByUser(userID, page, perPage) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -9255,10 +9255,10 @@ func (s *TimerLayerUserAccessTokenStore) UpdateTokenEnable(tokenID string) error return err } -func (s *TimerLayerUserTermsOfServiceStore) Delete(userId string, termsOfServiceId string) error { +func (s *TimerLayerUserTermsOfServiceStore) Delete(userID string, termsOfServiceId string) error { start := timemodule.Now() - err := s.UserTermsOfServiceStore.Delete(userId, termsOfServiceId) + err := s.UserTermsOfServiceStore.Delete(userID, termsOfServiceId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -9271,10 +9271,10 @@ func (s *TimerLayerUserTermsOfServiceStore) Delete(userId string, termsOfService return err } -func (s *TimerLayerUserTermsOfServiceStore) GetByUser(userId string) (*model.UserTermsOfService, error) { +func (s *TimerLayerUserTermsOfServiceStore) GetByUser(userID string) (*model.UserTermsOfService, error) { start := timemodule.Now() - result, err := s.UserTermsOfServiceStore.GetByUser(userId) + result, err := s.UserTermsOfServiceStore.GetByUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -9430,10 +9430,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 { @@ -9462,10 +9462,10 @@ func (s *TimerLayerWebhookStore) GetIncomingList(offset int, limit int) ([]*mode return result, err } -func (s *TimerLayerWebhookStore) GetIncomingListByUser(userId string, offset int, limit int) ([]*model.IncomingWebhook, error) { +func (s *TimerLayerWebhookStore) GetIncomingListByUser(userID string, offset int, limit int) ([]*model.IncomingWebhook, error) { start := timemodule.Now() - result, err := s.WebhookStore.GetIncomingListByUser(userId, offset, limit) + result, err := s.WebhookStore.GetIncomingListByUser(userID, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -9510,10 +9510,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 { @@ -9542,10 +9542,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 { @@ -9574,10 +9574,10 @@ func (s *TimerLayerWebhookStore) GetOutgoingList(offset int, limit int) ([]*mode return result, err } -func (s *TimerLayerWebhookStore) GetOutgoingListByUser(userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { +func (s *TimerLayerWebhookStore) GetOutgoingListByUser(userID string, offset int, limit int) ([]*model.OutgoingWebhook, error) { start := timemodule.Now() - result, err := s.WebhookStore.GetOutgoingListByUser(userId, offset, limit) + result, err := s.WebhookStore.GetOutgoingListByUser(userID, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -9621,10 +9621,10 @@ func (s *TimerLayerWebhookStore) PermanentDeleteIncomingByChannel(channelID stri return err } -func (s *TimerLayerWebhookStore) PermanentDeleteIncomingByUser(userId string) error { +func (s *TimerLayerWebhookStore) PermanentDeleteIncomingByUser(userID string) error { start := timemodule.Now() - err := s.WebhookStore.PermanentDeleteIncomingByUser(userId) + err := s.WebhookStore.PermanentDeleteIncomingByUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -9653,10 +9653,10 @@ func (s *TimerLayerWebhookStore) PermanentDeleteOutgoingByChannel(channelID stri return err } -func (s *TimerLayerWebhookStore) PermanentDeleteOutgoingByUser(userId string) error { +func (s *TimerLayerWebhookStore) PermanentDeleteOutgoingByUser(userID string) error { start := timemodule.Now() - err := s.WebhookStore.PermanentDeleteOutgoingByUser(userId) + err := s.WebhookStore.PermanentDeleteOutgoingByUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { diff --git a/utils/merge_test.go b/utils/merge_test.go index 68ebffbead..b9ff2c444a 100644 --- a/utils/merge_test.go +++ b/utils/merge_test.go @@ -854,7 +854,7 @@ type simple struct { I int f float64 fp *float64 - Ip *int + IP *int B *bool Sli []int Msi map[string]int @@ -981,8 +981,8 @@ func TestMergeWithSimpleStruct(t *testing.T) { assert.NotEqual(t, *t1.S2.S, *t2.S2.S) // changes in merged (on pointers that were cloned from base or patch) do not affect base or patch - *merged.Ip = 0 - assert.Equal(t, 99, *t1.Ip) + *merged.IP = 0 + assert.Equal(t, 99, *t1.IP) *merged.S2.S = "testMERGED" assert.NotEqual(t, *t2.S2.S, *merged.S2.S) }) @@ -1096,7 +1096,7 @@ func TestMergeWithVeryComplexStruct(t *testing.T) { base.F = 1342.12 base.Struct1.Pi = newInt(937) - base.Struct1p.Ui = 734 + base.Struct1p.UI = 734 base.Struct1.Struct2.Sli = []int{123123, 1243123} merged, err := mergeTestStructs(base, patch) @@ -1203,11 +1203,11 @@ type testStruct struct { F float64 F32 float32 S string - Ui uint - Ui8 uint8 - Ui16 uint32 - Ui32 uint32 - Ui64 uint64 + UI uint + UI8 uint8 + UI16 uint32 + UI32 uint32 + UI64 uint64 Pi *int Pi8 *int8 Pi16 *int16 @@ -1241,11 +1241,11 @@ type testStructEmbed struct { F float64 F32 float32 S string - Ui uint - Ui8 uint8 - Ui16 uint32 - Ui32 uint32 - Ui64 uint64 + UI uint + UI8 uint8 + UI16 uint32 + UI32 uint32 + UI64 uint64 Pi *int Pi8 *int8 Pi16 *int16 @@ -1279,11 +1279,11 @@ type testStructEmbed2 struct { F float64 F32 float32 S string - Ui uint - Ui8 uint8 - Ui16 uint32 - Ui32 uint32 - Ui64 uint64 + UI uint + UI8 uint8 + UI16 uint32 + UI32 uint32 + UI64 uint64 Pi *int Pi8 *int8 Pi16 *int16 diff --git a/utils/subpath_test.go b/utils/subpath_test.go index f7b7866f5a..cf3746e215 100644 --- a/utils/subpath_test.go +++ b/utils/subpath_test.go @@ -106,12 +106,12 @@ func TestUpdateAssetsSubpath(t *testing.T) { }, { "content security policy not found (missing quotes)", - contentSecurityPolicyNotFoundHtml, + contentSecurityPolicyNotFoundHTML, baseCss, baseManifestJSON, "/subpath", fmt.Errorf("failed to find 'Content-Security-Policy' meta tag to rewrite"), - contentSecurityPolicyNotFoundHtml, + contentSecurityPolicyNotFoundHTML, baseCss, baseManifestJSON, }, @@ -135,18 +135,18 @@ func TestUpdateAssetsSubpath(t *testing.T) { nil, subpathRootHtml, subpathCSS, - subpathManifestJson, + subpathManifestJSON, }, { "new subpath from old", subpathRootHtml, subpathCSS, - subpathManifestJson, + subpathManifestJSON, "/nested/subpath", nil, newSubpathRootHTML, newSubpathCSS, - newSubpathManifestJson, + newSubpathManifestJSON, }, { "resetting to /", @@ -268,7 +268,7 @@ func sToP(s string) *string { return &s } -const contentSecurityPolicyNotFoundHtml = ` 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 contentSecurityPolicyNotFoundHTML = ` 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 contentSecurityPolicyNotFound2Html = ` 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.


` @@ -352,7 +352,7 @@ const baseManifestJSON = `{ } ` -const subpathManifestJson = `{ +const subpathManifestJSON = `{ "icons": [ { "src": "/subpath/static/icon_96x96.png", @@ -420,7 +420,7 @@ const subpathManifestJson = `{ } ` -const newSubpathManifestJson = `{ +const newSubpathManifestJSON = `{ "icons": [ { "src": "/nested/subpath/static/icon_96x96.png", diff --git a/utils/utils.go b/utils/utils.go index 3fe9511eeb..39244b93f4 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -177,8 +177,8 @@ func GetURLWithCache(url string, cache *RequestCache, skip bool) ([]byte, error) } // Append tokens to passed baseUrl as query params -func AppendQueryParamsToURL(baseUrl string, params map[string]string) string { - u, err := url.Parse(baseUrl) +func AppendQueryParamsToURL(baseURL string, params map[string]string) string { + u, err := url.Parse(baseURL) if err != nil { return "" } diff --git a/utils/utils_test.go b/utils/utils_test.go index f50ec3afc0..80d5be8d70 100644 --- a/utils/utils_test.go +++ b/utils/utils_test.go @@ -163,10 +163,10 @@ func TestRemoveStringFromSlice(t *testing.T) { func TestAppendQueryParamsToURL(t *testing.T) { url := "mattermost://callback" - redirectUrl := AppendQueryParamsToURL(url, map[string]string{ + redirectURL := AppendQueryParamsToURL(url, map[string]string{ "key1": "value1", "key2": "value2", }) expected := url + "?key1=value1&key2=value2" - assert.Equal(t, redirectUrl, expected) + assert.Equal(t, redirectURL, expected) }