MM-31063: Change constants to use CamelCase (#16608)
* MM-31063: Change constants to use CamelCase * store package * change allcaps to camel case (#16615) * New tools.mod Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
8b6ac5f5d2
Коммит
c1dd23a3c8
@@ -20,14 +20,14 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
MAX_GROUP_CHANNELS_FOR_PROFILES = 50
|
||||
MaxGroupChannelsForProfiles = 50
|
||||
)
|
||||
|
||||
var (
|
||||
USER_SEARCH_TYPE_NAMES_NO_FULL_NAME = []string{"Username", "Nickname"}
|
||||
USER_SEARCH_TYPE_NAMES = []string{"Username", "FirstName", "LastName", "Nickname"}
|
||||
USER_SEARCH_TYPE_ALL_NO_FULL_NAME = []string{"Username", "Nickname", "Email"}
|
||||
USER_SEARCH_TYPE_ALL = []string{"Username", "FirstName", "LastName", "Nickname", "Email"}
|
||||
UserSearchTypeNames_NO_FULL_NAME = []string{"Username", "Nickname"}
|
||||
UserSearchTypeNames = []string{"Username", "FirstName", "LastName", "Nickname"}
|
||||
UserSearchTypeAll_NO_FULL_NAME = []string{"Username", "Nickname", "Email"}
|
||||
UserSearchTypeAll = []string{"Username", "FirstName", "LastName", "Nickname", "Email"}
|
||||
)
|
||||
|
||||
type SqlUserStore struct {
|
||||
@@ -92,10 +92,10 @@ func (us SqlUserStore) createIndexesIfNotExists() {
|
||||
us.CreateIndexIfNotExists("idx_users_lastname_lower_textpattern", "Users", "lower(LastName) text_pattern_ops")
|
||||
}
|
||||
|
||||
us.CreateFullTextIndexIfNotExists("idx_users_all_txt", "Users", strings.Join(USER_SEARCH_TYPE_ALL, ", "))
|
||||
us.CreateFullTextIndexIfNotExists("idx_users_all_no_full_name_txt", "Users", strings.Join(USER_SEARCH_TYPE_ALL_NO_FULL_NAME, ", "))
|
||||
us.CreateFullTextIndexIfNotExists("idx_users_names_txt", "Users", strings.Join(USER_SEARCH_TYPE_NAMES, ", "))
|
||||
us.CreateFullTextIndexIfNotExists("idx_users_names_no_full_name_txt", "Users", strings.Join(USER_SEARCH_TYPE_NAMES_NO_FULL_NAME, ", "))
|
||||
us.CreateFullTextIndexIfNotExists("idx_users_all_txt", "Users", strings.Join(UserSearchTypeAll, ", "))
|
||||
us.CreateFullTextIndexIfNotExists("idx_users_all_no_full_name_txt", "Users", strings.Join(UserSearchTypeAll_NO_FULL_NAME, ", "))
|
||||
us.CreateFullTextIndexIfNotExists("idx_users_names_txt", "Users", strings.Join(UserSearchTypeNames, ", "))
|
||||
us.CreateFullTextIndexIfNotExists("idx_users_names_no_full_name_txt", "Users", strings.Join(UserSearchTypeNames_NO_FULL_NAME, ", "))
|
||||
}
|
||||
|
||||
func (us SqlUserStore) Save(user *model.User) (*model.User, error) {
|
||||
@@ -936,8 +936,8 @@ type UserWithChannel struct {
|
||||
}
|
||||
|
||||
func (us SqlUserStore) GetProfileByGroupChannelIdsForUser(userId string, channelIds []string) (map[string][]*model.User, error) {
|
||||
if len(channelIds) > MAX_GROUP_CHANNELS_FOR_PROFILES {
|
||||
channelIds = channelIds[0:MAX_GROUP_CHANNELS_FOR_PROFILES]
|
||||
if len(channelIds) > MaxGroupChannelsForProfiles {
|
||||
channelIds = channelIds[0:MaxGroupChannelsForProfiles]
|
||||
}
|
||||
|
||||
isMemberQuery := fmt.Sprintf(`
|
||||
@@ -1402,15 +1402,15 @@ func (us SqlUserStore) performSearch(query sq.SelectBuilder, term string, option
|
||||
var searchType []string
|
||||
if options.AllowEmails {
|
||||
if options.AllowFullNames {
|
||||
searchType = USER_SEARCH_TYPE_ALL
|
||||
searchType = UserSearchTypeAll
|
||||
} else {
|
||||
searchType = USER_SEARCH_TYPE_ALL_NO_FULL_NAME
|
||||
searchType = UserSearchTypeAll_NO_FULL_NAME
|
||||
}
|
||||
} else {
|
||||
if options.AllowFullNames {
|
||||
searchType = USER_SEARCH_TYPE_NAMES
|
||||
searchType = UserSearchTypeNames
|
||||
} else {
|
||||
searchType = USER_SEARCH_TYPE_NAMES_NO_FULL_NAME
|
||||
searchType = UserSearchTypeNames_NO_FULL_NAME
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user