From 26cddf2f59b5eb4eb7d0e89f3ad8b50335dd107e Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Mon, 11 Mar 2019 18:58:28 -0400 Subject: [PATCH] fix a regression introduced by #444 --- irc/handlers.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/irc/handlers.go b/irc/handlers.go index bbc9a0e9..03e0cc22 100644 --- a/irc/handlers.go +++ b/irc/handlers.go @@ -2244,28 +2244,30 @@ func renameHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Re go server.channelRegistry.Rename(channel, casefoldedOldName) // send RENAME messages + clientPrefix := client.NickMaskString() for _, mcl := range channel.Members() { targetRb := rb + targetPrefix := clientPrefix if mcl != client { targetRb = NewResponseBuffer(mcl) + targetPrefix = mcl.NickMaskString() } - prefix := mcl.NickMaskString() if mcl.capabilities.Has(caps.Rename) { if reason != "" { - targetRb.Add(nil, prefix, "RENAME", oldName, newName, reason) + targetRb.Add(nil, clientPrefix, "RENAME", oldName, newName, reason) } else { - targetRb.Add(nil, prefix, "RENAME", oldName, newName) + targetRb.Add(nil, clientPrefix, "RENAME", oldName, newName) } } else { if reason != "" { - targetRb.Add(nil, prefix, "PART", oldName, fmt.Sprintf(mcl.t("Channel renamed: %s"), reason)) + targetRb.Add(nil, targetPrefix, "PART", oldName, fmt.Sprintf(mcl.t("Channel renamed: %s"), reason)) } else { - targetRb.Add(nil, prefix, "PART", oldName, fmt.Sprintf(mcl.t("Channel renamed"))) + targetRb.Add(nil, targetPrefix, "PART", oldName, fmt.Sprintf(mcl.t("Channel renamed"))) } if mcl.capabilities.Has(caps.ExtendedJoin) { - targetRb.Add(nil, prefix, "JOIN", newName, mcl.AccountName(), mcl.Realname()) + targetRb.Add(nil, targetPrefix, "JOIN", newName, mcl.AccountName(), mcl.Realname()) } else { - targetRb.Add(nil, prefix, "JOIN", newName) + targetRb.Add(nil, targetPrefix, "JOIN", newName) } channel.SendTopic(mcl, targetRb, false) channel.Names(mcl, targetRb)