X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_noctcp.cpp;h=37e7841666d12abd16e4eaf8fcc5ae77519fe31a;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=f6877f6790ff0c82d7e2944e030891e8897d279a;hpb=aa692dc1039b63deef7886e914ec499abe7facaf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index f6877f679..37e784166 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -3,7 +3,7 @@
  *
  *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
  *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
- *   Copyright (C) 2013, 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2017-2018, 2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
@@ -56,7 +56,7 @@ class ModuleNoCTCP : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides user mode +T and channel mode +C to block CTCPs", VF_VENDOR);
+		return Version("Adds channel mode C (noctcp) which allows channels to block messages which contain CTCPs.", VF_VENDOR);
 	}
 
 	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
@@ -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;