From 1288e9e593bfa014548b1aa48aac4afda98002c8 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sat, 8 May 2021 17:17:29 +0100 Subject: Send ERR_BADCHANMASK when trying to OJOIN/SAJOIN an invalid channel. --- src/modules/m_ojoin.cpp | 2 +- src/modules/m_sajoin.cpp | 2 +- 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; } -- cgit v1.2.3