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

fix the analogous issue for vhosts

This commit is contained in:
Shivaram Lingamneni 2019-12-21 20:26:40 -05:00
parent 25c4eb2996
commit 26ca016c66
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
irc/accounts.go
View File

@ -65,8 +65,9 @@ func (am *AccountManager) Initialize(server *Server) {
am.accountToMethod = make(map[string]NickEnforcementMethod)
am.server = server
am.buildNickToAccountIndex(server.Config())
am.initVHostRequestQueue()
config := server.Config()
am.buildNickToAccountIndex(config)
am.initVHostRequestQueue(config)
}
func (am *AccountManager) buildNickToAccountIndex(config *Config) {
@ -135,8 +136,8 @@ func (am *AccountManager) buildNickToAccountIndex(config *Config) {
}
}
func (am *AccountManager) initVHostRequestQueue() {
if !am.server.AccountConfig().VHosts.Enabled {
func (am *AccountManager) initVHostRequestQueue(config *Config) {
if !config.Accounts.VHosts.Enabled {
return
}

2
irc/server.go
View File

@ -664,7 +664,7 @@ func (server *Server) applyConfig(config *Config, initial bool) (err error) {
hsPreviouslyDisabled := oldConfig != nil && !oldConfig.Accounts.VHosts.Enabled
hsNowEnabled := config.Accounts.VHosts.Enabled
if hsPreviouslyDisabled && hsNowEnabled {
server.accounts.initVHostRequestQueue()
server.accounts.initVHostRequestQueue(config)
}
chanRegPreviouslyDisabled := oldConfig != nil && !oldConfig.Channels.Registration.Enabled