From 20fcbe514766bdae33b3b8e853e50f03b52909a5 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Tue, 25 Aug 2020 14:11:13 -0400 Subject: [PATCH] remove stray references to timeout enforcement These should have been removed in #1027. --- conventional.yaml | 5 ----- default.yaml | 5 ----- irc/config.go | 3 +-- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/conventional.yaml b/conventional.yaml index 35d4b115..a0e688b5 100644 --- a/conventional.yaml +++ b/conventional.yaml @@ -359,8 +359,6 @@ accounts: additional-nick-limit: 2 # 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 # already logged-in using SASL or NickServ # optional: no enforcement by default, but allow users to opt in to @@ -374,9 +372,6 @@ accounts: # to opt out of strict enforcement allow-custom-enforcement: true - # rename-timeout - this is how long users have 'til they're renamed - rename-timeout: 30s - # format for guest nicknames: # 1. these nicknames cannot be registered or reserved # 2. if a client is automatically renamed by the server, diff --git a/default.yaml b/default.yaml index b80bd423..e4b2bb83 100644 --- a/default.yaml +++ b/default.yaml @@ -387,8 +387,6 @@ accounts: additional-nick-limit: 2 # 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 # already logged-in using SASL or NickServ # optional: no enforcement by default, but allow users to opt in to @@ -402,9 +400,6 @@ accounts: # to opt out of strict enforcement allow-custom-enforcement: false - # rename-timeout - this is how long users have 'til they're renamed - rename-timeout: 30s - # format for guest nicknames: # 1. these nicknames cannot be registered or reserved # 2. if a client is automatically renamed by the server, diff --git a/irc/config.go b/irc/config.go index f5b6c83a..d2fb4a44 100644 --- a/irc/config.go +++ b/irc/config.go @@ -267,8 +267,7 @@ type AccountConfig struct { Enabled bool AdditionalNickLimit int `yaml:"additional-nick-limit"` Method NickEnforcementMethod - AllowCustomEnforcement bool `yaml:"allow-custom-enforcement"` - RenameTimeout time.Duration `yaml:"rename-timeout"` + AllowCustomEnforcement bool `yaml:"allow-custom-enforcement"` // RenamePrefix is the legacy field, GuestFormat is the new version RenamePrefix string `yaml:"rename-prefix"` GuestFormat string `yaml:"guest-nickname-format"`