From: Sadie Powell <sadie@witchery.services>
Date: Sat, 8 May 2021 16:17:29 +0000 (+0100)
Subject: Send ERR_BADCHANMASK when trying to OJOIN/SAJOIN an invalid channel.
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=1288e9e593bfa014548b1aa48aac4afda98002c8;p=user%2Fhenk%2Fcode%2Finspircd.git

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 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;
 			}