GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2025-02-19 23:20:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #445 from slingamn/issue300_regression

Browse Source 
fix a regression introduced by #444
This commit is contained in:
Daniel Oaks 2019-03-12 09:04:00 +10:00 committed by GitHub
commit 29db70fa7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
irc/handlers.go
View File

@ -2244,28 +2244,30 @@ func renameHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Re
go server.channelRegistry.Rename(channel, casefoldedOldName) go server.channelRegistry.Rename(channel, casefoldedOldName)
// send RENAME messages // send RENAME messages
clientPrefix := client.NickMaskString()
for _, mcl := range channel.Members() { for _, mcl := range channel.Members() {
targetRb := rb targetRb := rb
targetPrefix := clientPrefix
if mcl != client { if mcl != client {
targetRb = NewResponseBuffer(mcl) targetRb = NewResponseBuffer(mcl)
targetPrefix = mcl.NickMaskString()
} }
prefix := mcl.NickMaskString()
if mcl.capabilities.Has(caps.Rename) { if mcl.capabilities.Has(caps.Rename) {
if reason != "" { if reason != "" {
targetRb.Add(nil, prefix, "RENAME", oldName, newName, reason) targetRb.Add(nil, clientPrefix, "RENAME", oldName, newName, reason)
} else { } else {
targetRb.Add(nil, prefix, "RENAME", oldName, newName) targetRb.Add(nil, clientPrefix, "RENAME", oldName, newName)
} }
} else { } else {
if reason != "" { 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 { } 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) { 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 { } else {
targetRb.Add(nil, prefix, "JOIN", newName) targetRb.Add(nil, targetPrefix, "JOIN", newName)
} }
channel.SendTopic(mcl, targetRb, false) channel.SendTopic(mcl, targetRb, false)
channel.Names(mcl, targetRb) channel.Names(mcl, targetRb)