From 48509ea852ba3cad9b0ff5999846e151ad39b474 Mon Sep 17 00:00:00 2001 From: Daniel Oaks Date: Tue, 9 Jun 2020 02:05:29 +1000 Subject: [PATCH] Review fixes --- irc/handlers.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/irc/handlers.go b/irc/handlers.go index 542db35d..af282dd5 100644 --- a/irc/handlers.go +++ b/irc/handlers.go @@ -1899,7 +1899,7 @@ func messageHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *R } if isForRelayClient { if histType == history.Privmsg { - rb.Add(nil, server.name, ERR_NOSUCHNICK, client.Nick(), targetString, client.t("Relayed users cannot be sent private messages")) + rb.Add(nil, server.name, ERR_NOSUCHNICK, client.Nick(), targetString, client.t("Relayed users cannot receive private messages")) } // TAGMSG/NOTICEs are intentionally silently dropped continue @@ -2334,6 +2334,7 @@ func relaymsgHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb * }, "") // send msg + channelName := channel.Name() for _, member := range channel.Members() { for _, session := range member.Sessions() { var tagsToUse map[string]string @@ -2343,7 +2344,7 @@ func relaymsgHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb * } } - session.sendSplitMsgFromClientInternal(false, nick, "", tagsToUse, "PRIVMSG", channel.Name(), message) + session.sendSplitMsgFromClientInternal(false, nick, "", tagsToUse, "PRIVMSG", channelName, message) } } return false