diff options
| author | Peter Powell <petpow@saberuk.com> | 2017-12-20 10:44:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-20 10:44:04 +0000 |
| commit | 51d9f02be92236f0b9c50682c22a2254d228509a (patch) | |
| tree | 01fbdcf82d55223722d9b3e527a199c56c7f3c44 /src | |
| parent | 4f3aaaef9f8b111452ffa4498aaefeae3fcb6675 (diff) | |
| parent | bb7b2fc9e76f7a0894afd9bb88c9c326cf20fe6f (diff) | |
Merge pull request #1445 from B00mX0r/master+nickmsg
Clarify error message when attempting to /NICK while banned
Diffstat (limited to 'src')
| -rw-r--r-- | src/coremods/core_user/cmd_nick.cpp | 3 | ||||
| -rw-r--r-- | src/modules/m_nonicks.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/coremods/core_user/cmd_nick.cpp b/src/coremods/core_user/cmd_nick.cpp index cedafbbf4..672155741 100644 --- a/src/coremods/core_user/cmd_nick.cpp +++ b/src/coremods/core_user/cmd_nick.cpp @@ -77,7 +77,8 @@ CmdResult CommandNick::HandleLocal(const std::vector<std::string>& parameters, L Channel* chan = (*i)->chan; if (chan->GetPrefixValue(user) < VOICE_VALUE && chan->IsBanned(user)) { - user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (you're banned)"); + user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("Cannot change nickname while on %s (you're banned)", + chan->name.c_str())); return CMD_FAILURE; } } diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp index fbf772e0c..c82107be8 100644 --- a/src/modules/m_nonicks.cpp +++ b/src/modules/m_nonicks.cpp @@ -60,7 +60,7 @@ class ModuleNoNickChange : public Module if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet(nn))) { - user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("Can't change nickname while on %s (+N is set)", + user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("Cannot change nickname while on %s (+N is set)", curr->name.c_str())); return MOD_RES_DENY; } |