Add the Numerics::CannotSendTo class and switch stuff to use it.

1 files changed, 9 insertions, 5 deletions

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index f6877f679..4f6545700 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -88,11 +88,15 @@ class ModuleNoCTCP : public Module
 				if (res == MOD_RES_ALLOW)
 					return MOD_RES_PASSTHRU;
 
-				bool modeset = c->IsModeSet(nc);
-				if (!c->GetExtBanStatus(user, 'C').check(!modeset))
+				if (c->IsModeSet(nc))
 				{
-					user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, InspIRCd::Format("Can't send CTCP to channel (%s)",
-						modeset ? "+C is set" : "you're extbanned"));
+					user->WriteNumeric(Numerics::CannotSendTo(c, "CTCPs", &nc));
+					return MOD_RES_DENY;
+				}
+
+				if (c->GetExtBanStatus(user, 'C') == MOD_RES_DENY)
+				{
+					user->WriteNumeric(Numerics::CannotSendTo(c, "CTCPs", 'C', "noctcp"));
 					return MOD_RES_DENY;
 				}
 				break;
@@ -105,7 +109,7 @@ class ModuleNoCTCP : public Module
 				User* u = target.Get<User>();
 				if (u->IsModeSet(ncu))
 				{
-					user->WriteNumeric(ERR_CANTSENDTOUSER, u->nick, "Can't send CTCP to user (+T is set)");
+					user->WriteNumeric(Numerics::CannotSendTo(u, "CTCPs", &ncu));
 					return MOD_RES_DENY;
 				}
 				break;