GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-12-22 18:52:41 +01:00
Code Issues Projects Releases Wiki Activity

fix #572

Browse Source
This commit is contained in:
Shivaram Lingamneni 2019-07-08 20:51:14 -04:00
parent ab7f8de66d
commit bbf6c4a269
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
irc/nickname.go
View File

@ -86,12 +86,10 @@ func performNickChange(server *Server, client *Client, target *Client, session *
channel.history.Add(histItem) channel.history.Add(histItem)
} }
target.nickTimer.Touch(rb)
if target.Registered() { if target.Registered() {
client.server.monitorManager.AlertAbout(target, true) client.server.monitorManager.AlertAbout(target, true)
} target.nickTimer.Touch(rb)
// else: Run() will attempt registration immediately after this } // else: these will be deferred to the end of registration (see #572)
return true return true
} }

3
irc/server.go
View File

@ -421,6 +421,9 @@ func (server *Server) playRegistrationBurst(session *Session) {
if server.logger.IsLoggingRawIO() { if server.logger.IsLoggingRawIO() {
session.Send(nil, c.server.name, "NOTICE", d.nick, c.t("This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.")) session.Send(nil, c.server.name, "NOTICE", d.nick, c.t("This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect."))
} }
// #572: defer nick warnings to the end of the registration burst
session.client.nickTimer.Touch(nil)
} }
// t returns the translated version of the given string, based on the languages configured by the client. // t returns the translated version of the given string, based on the languages configured by the client.