Improve the message sent when a mode does not exist.

diff --git a/src/mode.cpp b/src/mode.cpp
index 306d39c5d00a7033dd621a3d84420f82405e1d38..3ce7ee10ffc3a59b72ad712f266fa94eb2de37f9 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -388,7 +388,9 @@ void ModeParser::ModeParamsToChangeList(User* user, ModeType type, const std::ve
                if (!mh)
                {
                        /* No mode handler? Unknown mode character then. */
-                       user->WriteNumeric(type == MODETYPE_CHANNEL ? ERR_UNKNOWNMODE : ERR_UNKNOWNSNOMASK, modechar, "is an unknown mode character");
+                       int numeric = (type == MODETYPE_CHANNEL ? ERR_UNKNOWNMODE : ERR_UNKNOWNSNOMASK);
+                       const char* typestr = (type == MODETYPE_CHANNEL ? "channel" : "user");
+                       user->WriteNumeric(numeric, modechar, InspIRCd::Format("is not a recognised %s mode.", typestr));
                        continue;
                }
 

diff --git a/src/modules/m_disable.cpp b/src/modules/m_disable.cpp
index 95fcd8b4cb1fe49c90f8905b9fc68dbe2409efef..6ba5243c92962cfd9021db4cf05839f7beacac40 100644 (file)
--- a/src/modules/m_disable.cpp
+++ b/src/modules/m_disable.cpp
@@ -171,8 +171,9 @@ class ModuleDisable : public Module
                {
                        // The server administrator has specified that disabled modes should be
                        // treated as if they do not exist.
-                       user->WriteNumeric(mh->GetModeType() == MODETYPE_CHANNEL ? ERR_UNKNOWNMODE : ERR_UNKNOWNSNOMASK,
-                               mh->GetModeChar(), "is an unknown mode character");
+                       int numeric = (mh->GetModeType() == MODETYPE_CHANNEL ? ERR_UNKNOWNMODE : ERR_UNKNOWNSNOMASK);
+                       const char* typestr = (mh->GetModeType() == MODETYPE_CHANNEL ? "channel" : "user");
+                       user->WriteNumeric(numeric, mh->GetModeChar(), InspIRCd::Format("is not a recognised %s mode.", typestr));
                        return MOD_RES_DENY;
                }