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

Merge pull request #598 from slingamn/issue572.2 

fix #572
This commit is contained in:
Daniel Oaks 2019-07-12 23:26:32 +10:00 committed by GitHub
parent dbde0e0b3e bbf6c4a269
commit 8974cffe2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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.