Merge remote-tracking branch 'origin/master' into issue996_proto.1

This commit is contained in:
Shivaram Lingamneni 2020-05-11 02:04:20 -04:00
commit 548a2f814a
5 changed files with 29 additions and 31 deletions

View file

@ -326,9 +326,7 @@ func (server *Server) RunClient(conn IRCConn) {
session.idletimer.Initialize(session)
session.resetFakelag()
for _, defaultMode := range config.Accounts.defaultUserModes {
client.SetMode(defaultMode, true)
}
ApplyUserModeChanges(client, config.Accounts.defaultUserModes, false, nil)
if proxiedConn.Secure {
client.SetMode(modes.TLS, true)
}
@ -374,9 +372,7 @@ func (server *Server) AddAlwaysOnClient(account ClientAccount, chnames []string,
alwaysOn: true,
}
for _, defaultMode := range config.Accounts.defaultUserModes {
client.SetMode(defaultMode, true)
}
ApplyUserModeChanges(client, config.Accounts.defaultUserModes, false, nil)
client.SetMode(modes.TLS, true)
client.writerSemaphore.Initialize(1)