From 2bb36e6cb844a61009f8e73aa65ae4750123f250 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Thu, 19 Mar 2020 12:19:42 -0400 Subject: [PATCH] fix roleplay messages not being relayed See #865. --- irc/roleplay.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/irc/roleplay.go b/irc/roleplay.go index 2a419cbe..37790225 100644 --- a/irc/roleplay.go +++ b/irc/roleplay.go @@ -47,11 +47,12 @@ func sendRoleplayMessage(server *Server, client *Client, source string, targetSt for _, member := range channel.Members() { for _, session := range member.Sessions() { - if member == client && !session.capabilities.Has(caps.EchoMessage) { - continue - } else if rb.session == session { + // see discussion on #865: clients do not understand how to do local echo + // of roleplay commands, so send them a copy whether they have echo-message + // or not + if rb.session == session { rb.Add(nil, source, "PRIVMSG", channel.name, message) - } else if member == client || session.capabilities.Has(caps.EchoMessage) { + } else { session.Send(nil, source, "PRIVMSG", channel.name, message) } }