From a54dcb9057562e07d6ce79a51e79cbabdefd911b Mon Sep 17 00:00:00 2001 From: vegax87 Date: Fri, 13 Jan 2017 02:05:58 +0100 Subject: [PATCH] Fixed WHOIS Command --- irc/server.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/irc/server.go b/irc/server.go index b64b95a0..0f3c6ef6 100644 --- a/irc/server.go +++ b/irc/server.go @@ -952,9 +952,10 @@ func whoisHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool { func (client *Client) getWhoisOf(target *Client) { client.Send(nil, client.server.name, RPL_WHOISUSER, client.nick, target.nick, target.username, target.hostname, "*", target.realname) - //TODO(dan): ...one channel per reply? really? - for _, line := range client.WhoisChannelsNames(target) { - client.Send(nil, client.server.name, RPL_WHOISCHANNELS, client.nick, target.nick, line) + + whoischannels := client.WhoisChannelsNames(target) + if whoischannels != nil { + client.Send(nil, client.server.name, RPL_WHOISCHANNELS, client.nick, target.nick, fmt.Sprintf(": %s", strings.Join(whoischannels, " "))) } if target.class != nil { client.Send(nil, client.server.name, RPL_WHOISOPERATOR, client.nick, target.nick, target.whoisLine)