Browse Source

Merge pull request #1727 from kylef/kylef/mode-missing-nick

Include nick in ERR_LISTMODEALREADYSET and ERR_LISTMODENOTSET
tags/v2.8.0-rc1
Shivaram Lingamneni 3 years ago
parent
commit
62d78a64cb
No account linked to committer's email address
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      irc/modes.go

+ 2
- 2
irc/modes.go View File

232
 				} else if err != nil {
232
 				} else if err != nil {
233
 					rb.Add(nil, client.server.name, ERR_INVALIDMODEPARAM, details.nick, string(change.Mode), utils.SafeErrorParam(mask), fmt.Sprintf(client.t("Invalid mode %[1]s parameter: %[2]s"), string(change.Mode), mask))
233
 					rb.Add(nil, client.server.name, ERR_INVALIDMODEPARAM, details.nick, string(change.Mode), utils.SafeErrorParam(mask), fmt.Sprintf(client.t("Invalid mode %[1]s parameter: %[2]s"), string(change.Mode), mask))
234
 				} else {
234
 				} else {
235
-					rb.Add(nil, client.server.name, ERR_LISTMODEALREADYSET, chname, mask, string(change.Mode), fmt.Sprintf(client.t("Channel %[1]s list already contains %[2]s"), chname, mask))
235
+					rb.Add(nil, client.server.name, ERR_LISTMODEALREADYSET, details.nick, chname, mask, string(change.Mode), fmt.Sprintf(client.t("Channel %[1]s list already contains %[2]s"), chname, mask))
236
 				}
236
 				}
237
 
237
 
238
 			case modes.Remove:
238
 			case modes.Remove:
244
 				} else if err != nil {
244
 				} else if err != nil {
245
 					rb.Add(nil, client.server.name, ERR_INVALIDMODEPARAM, details.nick, string(change.Mode), utils.SafeErrorParam(mask), fmt.Sprintf(client.t("Invalid mode %[1]s parameter: %[2]s"), string(change.Mode), mask))
245
 					rb.Add(nil, client.server.name, ERR_INVALIDMODEPARAM, details.nick, string(change.Mode), utils.SafeErrorParam(mask), fmt.Sprintf(client.t("Invalid mode %[1]s parameter: %[2]s"), string(change.Mode), mask))
246
 				} else {
246
 				} else {
247
-					rb.Add(nil, client.server.name, ERR_LISTMODENOTSET, chname, mask, string(change.Mode), fmt.Sprintf(client.t("Channel %[1]s list does not contain %[2]s"), chname, mask))
247
+					rb.Add(nil, client.server.name, ERR_LISTMODENOTSET, details.nick, chname, mask, string(change.Mode), fmt.Sprintf(client.t("Channel %[1]s list does not contain %[2]s"), chname, mask))
248
 				}
248
 				}
249
 			}
249
 			}
250
 
250
 

Loading…
Cancel
Save