Merge pull request #598 from slingamn/issue572.2

fix #572

irc/nickname.go

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

irc/server.go

@@ -421,6 +421,9 @@ func (server *Server) playRegistrationBurst(session *Session) {
 	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."))
 	}
+
+	// #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.