From a0c97542eeaeb474fbe9915ecbdb3ca568222991 Mon Sep 17 00:00:00 2001 From: Daniel Oaks Date: Tue, 17 Jan 2017 22:52:19 +1000 Subject: [PATCH] LUSERS: minor chan cleanup to avoid counting --- irc/server.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/irc/server.go b/irc/server.go index f2db47b0..0bc1887d 100644 --- a/irc/server.go +++ b/irc/server.go @@ -1681,10 +1681,7 @@ func whowasHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool { // LUSERS [ []] func lusersHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool { //TODO(vegax87) Fix network statistics and additional parameters - var totalcount int - var invisiblecount int - var opercount int - var chancount int + var totalcount, invisiblecount, opercount int server.clients.ByNickMutex.RLock() defer server.clients.ByNickMutex.RUnlock() @@ -1698,12 +1695,9 @@ func lusersHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool { opercount++ } } - for range server.channels { - chancount++ - } client.Send(nil, server.name, RPL_LUSERCLIENT, client.nick, fmt.Sprintf("There are %d users and %d invisible on %d server(s)", totalcount, invisiblecount, 1)) client.Send(nil, server.name, RPL_LUSEROP, client.nick, fmt.Sprintf("%d operators online", opercount)) - client.Send(nil, server.name, RPL_LUSERCHANNELS, client.nick, fmt.Sprintf("%d channels formed", chancount)) + client.Send(nil, server.name, RPL_LUSERCHANNELS, client.nick, fmt.Sprintf("%d channels formed", len(server.channels))) client.Send(nil, server.name, RPL_LUSERME, client.nick, fmt.Sprintf("I have %d clients and %d servers", totalcount, 1)) return false }