Browse Source

Merge pull request #445 from slingamn/issue300_regression

fix a regression introduced by #444
tags/v1.1.0-rc1
Daniel Oaks 5 years ago
parent
commit
29db70fa7b
No account linked to committer's email address
1 changed files with 9 additions and 7 deletions
  1. 9
    7
      irc/handlers.go

+ 9
- 7
irc/handlers.go View File

2244
 	go server.channelRegistry.Rename(channel, casefoldedOldName)
2244
 	go server.channelRegistry.Rename(channel, casefoldedOldName)
2245
 
2245
 
2246
 	// send RENAME messages
2246
 	// send RENAME messages
2247
+	clientPrefix := client.NickMaskString()
2247
 	for _, mcl := range channel.Members() {
2248
 	for _, mcl := range channel.Members() {
2248
 		targetRb := rb
2249
 		targetRb := rb
2250
+		targetPrefix := clientPrefix
2249
 		if mcl != client {
2251
 		if mcl != client {
2250
 			targetRb = NewResponseBuffer(mcl)
2252
 			targetRb = NewResponseBuffer(mcl)
2253
+			targetPrefix = mcl.NickMaskString()
2251
 		}
2254
 		}
2252
-		prefix := mcl.NickMaskString()
2253
 		if mcl.capabilities.Has(caps.Rename) {
2255
 		if mcl.capabilities.Has(caps.Rename) {
2254
 			if reason != "" {
2256
 			if reason != "" {
2255
-				targetRb.Add(nil, prefix, "RENAME", oldName, newName, reason)
2257
+				targetRb.Add(nil, clientPrefix, "RENAME", oldName, newName, reason)
2256
 			} else {
2258
 			} else {
2257
-				targetRb.Add(nil, prefix, "RENAME", oldName, newName)
2259
+				targetRb.Add(nil, clientPrefix, "RENAME", oldName, newName)
2258
 			}
2260
 			}
2259
 		} else {
2261
 		} else {
2260
 			if reason != "" {
2262
 			if reason != "" {
2261
-				targetRb.Add(nil, prefix, "PART", oldName, fmt.Sprintf(mcl.t("Channel renamed: %s"), reason))
2263
+				targetRb.Add(nil, targetPrefix, "PART", oldName, fmt.Sprintf(mcl.t("Channel renamed: %s"), reason))
2262
 			} else {
2264
 			} else {
2263
-				targetRb.Add(nil, prefix, "PART", oldName, fmt.Sprintf(mcl.t("Channel renamed")))
2265
+				targetRb.Add(nil, targetPrefix, "PART", oldName, fmt.Sprintf(mcl.t("Channel renamed")))
2264
 			}
2266
 			}
2265
 			if mcl.capabilities.Has(caps.ExtendedJoin) {
2267
 			if mcl.capabilities.Has(caps.ExtendedJoin) {
2266
-				targetRb.Add(nil, prefix, "JOIN", newName, mcl.AccountName(), mcl.Realname())
2268
+				targetRb.Add(nil, targetPrefix, "JOIN", newName, mcl.AccountName(), mcl.Realname())
2267
 			} else {
2269
 			} else {
2268
-				targetRb.Add(nil, prefix, "JOIN", newName)
2270
+				targetRb.Add(nil, targetPrefix, "JOIN", newName)
2269
 			}
2271
 			}
2270
 			channel.SendTopic(mcl, targetRb, false)
2272
 			channel.SendTopic(mcl, targetRb, false)
2271
 			channel.Names(mcl, targetRb)
2273
 			channel.Names(mcl, targetRb)

Loading…
Cancel
Save