LogalDeveloper/owncast
0
Fork 0
Code Activity

Migrate forbidden and suggested usernames list to string slice. Closes #1873

Browse Source
This commit is contained in:
Gabe Kangas
2022-04-25 14:10:20 -07:00
parent a29d6450cb
commit b2b791b365
7 changed files with 119 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/data/config.go
View File

@@ -630,44 +630,39 @@ func FindHighestVideoQualityIndex(qualities []models.StreamOutputVariant) int {
// GetForbiddenUsernameList will return the blocked usernames as a comma separated string.
func GetForbiddenUsernameList() []string {
usernameString, err := _datastore.GetString(blockedUsernamesKey)
usernames, err := _datastore.GetStringSlice(blockedUsernamesKey)
if err != nil {
return config.DefaultForbiddenUsernames
}
if usernameString == "" {
if len(usernames) == 0 {
return config.DefaultForbiddenUsernames
}
blocklist := strings.Split(usernameString, ",")
return blocklist
return usernames
}
// SetForbiddenUsernameList set the username blocklist as a comma separated string.
func SetForbiddenUsernameList(usernames []string) error {
usernameListString := strings.Join(usernames, ",")
return _datastore.SetString(blockedUsernamesKey, usernameListString)
return _datastore.SetStringSlice(blockedUsernamesKey, usernames)
}
// GetSuggestedUsernamesList will return the suggested usernames as a comma separated string.
// If the number of suggested usernames is smaller than 10, the number pool is not used (see code in the CreateAnonymousUser function).
// GetSuggestedUsernamesList will return the suggested usernames.
// If the number of suggested usernames is smaller than 10, the number pool is
// not used (see code in the CreateAnonymousUser function).
func GetSuggestedUsernamesList() []string {
usernameString, err := _datastore.GetString(suggestedUsernamesKey)
usernames, err := _datastore.GetStringSlice(suggestedUsernamesKey)
if err != nil || usernameString == "" {
if err != nil || len(usernames) == 0 {
return []string{}
}
suggestionList := strings.Split(usernameString, ",")
return suggestionList
return usernames
}
// SetSuggestedUsernamesList sets the username suggestion list as a comma separated string.
// SetSuggestedUsernamesList sets the username suggestion list.
func SetSuggestedUsernamesList(usernames []string) error {
usernameListString := strings.Join(usernames, ",")
return _datastore.SetString(suggestedUsernamesKey, usernameListString)
return _datastore.SetStringSlice(suggestedUsernamesKey, usernames)
}
// GetServerInitTime will return when the server was first setup.