GitHub
/
ergo
mirror of https://github.com/ergochat/ergo.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1247 from slingamn/config_cleanup 

remove stray references to timeout enforcement
This commit is contained in:
Shivaram Lingamneni 2020-08-25 17:34:24 -07:00 committed by GitHub
parent 75a0e18580 20fcbe5147
commit fda23264ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conventional.yaml
View File

@ -359,8 +359,6 @@ accounts:
additional-nick-limit: 2 additional-nick-limit: 2
# method describes how nickname reservation is handled # method describes how nickname reservation is handled
# timeout: let the user change to the registered nickname, give them X seconds
# to login and then rename them if they haven't done so
# strict: don't let the user change to the registered nickname unless they're # strict: don't let the user change to the registered nickname unless they're
# already logged-in using SASL or NickServ # already logged-in using SASL or NickServ
# optional: no enforcement by default, but allow users to opt in to # optional: no enforcement by default, but allow users to opt in to
@ -374,9 +372,6 @@ accounts:
# to opt out of strict enforcement # to opt out of strict enforcement
allow-custom-enforcement: true allow-custom-enforcement: true
# rename-timeout - this is how long users have 'til they're renamed
rename-timeout: 30s
# format for guest nicknames: # format for guest nicknames:
# 1. these nicknames cannot be registered or reserved # 1. these nicknames cannot be registered or reserved
# 2. if a client is automatically renamed by the server, # 2. if a client is automatically renamed by the server,

5
default.yaml
View File

@ -387,8 +387,6 @@ accounts:
additional-nick-limit: 2 additional-nick-limit: 2
# method describes how nickname reservation is handled # method describes how nickname reservation is handled
# timeout: let the user change to the registered nickname, give them X seconds
# to login and then rename them if they haven't done so
# strict: don't let the user change to the registered nickname unless they're # strict: don't let the user change to the registered nickname unless they're
# already logged-in using SASL or NickServ # already logged-in using SASL or NickServ
# optional: no enforcement by default, but allow users to opt in to # optional: no enforcement by default, but allow users to opt in to
@ -402,9 +400,6 @@ accounts:
# to opt out of strict enforcement # to opt out of strict enforcement
allow-custom-enforcement: false allow-custom-enforcement: false
# rename-timeout - this is how long users have 'til they're renamed
rename-timeout: 30s
# format for guest nicknames: # format for guest nicknames:
# 1. these nicknames cannot be registered or reserved # 1. these nicknames cannot be registered or reserved
# 2. if a client is automatically renamed by the server, # 2. if a client is automatically renamed by the server,

3
irc/config.go
View File

@ -267,8 +267,7 @@ type AccountConfig struct {
Enabled bool Enabled bool
AdditionalNickLimit int `yaml:"additional-nick-limit"` AdditionalNickLimit int `yaml:"additional-nick-limit"`
Method NickEnforcementMethod Method NickEnforcementMethod
AllowCustomEnforcement bool `yaml:"allow-custom-enforcement"` AllowCustomEnforcement bool `yaml:"allow-custom-enforcement"`
RenameTimeout time.Duration `yaml:"rename-timeout"`
// RenamePrefix is the legacy field, GuestFormat is the new version // RenamePrefix is the legacy field, GuestFormat is the new version
RenamePrefix string `yaml:"rename-prefix"` RenamePrefix string `yaml:"rename-prefix"`
GuestFormat string `yaml:"guest-nickname-format"` GuestFormat string `yaml:"guest-nickname-format"`