Send ERR_BADCHANMASK when trying to OJOIN/SAJOIN an invalid channel.

diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index 8bc264622da870e16d9ac1fbb2710a4d8f6ce450..8b0683700e4b2e3f858e68207d69ee652d5a25a3 100644 (file)
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -49,7 +49,7 @@ class CommandOjoin : public SplitCommand
                // Make sure the channel name is allowable.
                if (!ServerInstance->IsChannel(parameters[0]))
                {
-                       user->WriteNotice("*** Invalid characters in channel name or name too long");
+                       user->WriteNumeric(ERR_BADCHANMASK, parameters[0], "Invalid channel name");
                        return CMD_FAILURE;
                }
 

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 05229efb9257e017b748ca3ebcbda0a9ff15a4e5..62783d9016e7286aa418aa800c2d23bd8d2ffe36 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -66,7 +66,7 @@ class CommandSajoin : public Command
                        if (IS_LOCAL(user) && !ServerInstance->IsChannel(channel))
                        {
                                /* we didn't need to check this for each character ;) */
-                               user->WriteNotice("*** Invalid characters in channel name or name too long");
+                               user->WriteNumeric(ERR_BADCHANMASK, channel, "Invalid channel name");
                                return CMD_FAILURE;
                        }