From 8500727b711aea36747fff24697c897e470d53a8 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Mon, 5 Oct 2020 06:27:05 -0400 Subject: [PATCH 1/2] bump irctest --- irctest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/irctest b/irctest index 616785ea..0c069b74 160000 --- a/irctest +++ b/irctest @@ -1 +1 @@ -Subproject commit 616785eae403536954f1b1181f74ef51343e33f7 +Subproject commit 0c069b7418e623b6d64d55e46e3fc82b03a1219c From 32fc9f226f8050bfd6d07aa8f43d6d8f1252cf93 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Mon, 5 Oct 2020 06:28:19 -0400 Subject: [PATCH 2/2] fix #1303 --- irc/server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/irc/server.go b/irc/server.go index 11e8ddd7..bd83423e 100644 --- a/irc/server.go +++ b/irc/server.go @@ -301,6 +301,9 @@ func (server *Server) tryRegister(c *Client, session *Session) (exiting bool) { return false } + // count new user in statistics (before checking KLINEs, see #1303) + server.stats.Register(c.HasMode(modes.Invisible)) + // check KLINEs isBanned, info := server.klines.CheckMasks(c.AllNickmasks()...) if isBanned { @@ -315,9 +318,6 @@ func (server *Server) tryRegister(c *Client, session *Session) (exiting bool) { c.SetMode(defaultMode, true) } - // count new user in statistics - server.stats.Register(c.HasMode(modes.Invisible)) - server.playRegistrationBurst(session) return false }