From 514a2e613f291e738e05d242a5805f38ba750f5c Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Mon, 21 Dec 2020 21:59:46 -0500 Subject: [PATCH 1/2] fix #1468 --- irc/caps/constants.go | 2 ++ irc/handlers.go | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/irc/caps/constants.go b/irc/caps/constants.go index 324f443c..f8a3d5d1 100644 --- a/irc/caps/constants.go +++ b/irc/caps/constants.go @@ -58,6 +58,8 @@ const ( // More draft names associated with draft/multiline: MultilineBatchType = "draft/multiline" MultilineConcatTag = "draft/multiline-concat" + // draft/relaymsg: + RelaymsgTagName = "draft/relaymsg" ) func init() { diff --git a/irc/handlers.go b/irc/handlers.go index 4b3464b0..a1756a25 100644 --- a/irc/handlers.go +++ b/irc/handlers.go @@ -2587,7 +2587,10 @@ func relaymsgHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb * // send msg channelName := channel.Name() relayTags := map[string]string{ - "relaymsg": client.Nick(), + caps.RelaymsgTagName: client.Nick(), + } + for t, v := range msg.ClientOnlyTags() { + relayTags[t] = v } for _, member := range channel.Members() { for _, session := range member.Sessions() { From b3f2058d47b0fc0934b0933d85b3681cf6714705 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Mon, 21 Dec 2020 22:08:00 -0500 Subject: [PATCH 2/2] bump irctest --- irctest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/irctest b/irctest index 307722fb..b58fe44b 160000 --- a/irctest +++ b/irctest @@ -1 +1 @@ -Subproject commit 307722fbecc5ab69ee3246153b8f8f91ad830830 +Subproject commit b58fe44b5b36e9bf07af9b5a0033455524e2b456