summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2021-05-08 17:17:29 +0100
committerSadie Powell <sadie@witchery.services>2021-05-08 17:21:04 +0100
commit1288e9e593bfa014548b1aa48aac4afda98002c8 (patch)
tree2ff15cfda39a538cf9d0655104005a164e4ed7d0
parenta1db12cb2e7024981291cbd7e51b73c9a684d76c (diff)
Send ERR_BADCHANMASK when trying to OJOIN/SAJOIN an invalid channel.
-rw-r--r--src/modules/m_ojoin.cpp2
-rw-r--r--src/modules/m_sajoin.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index 8bc264622..8b0683700 100644
--- 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 05229efb9..62783d901 100644
--- 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;
}