1 files changed, 39 insertions, 36 deletions

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index c934a05c6..af14c73ec 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -20,72 +20,75 @@
 
 
 #include "inspircd.h"
+#include "modules/exemption.h"
 
-/* $ModDesc: Provides channel mode +C to block CTCPs */
-
-class NoCTCP : public SimpleChannelModeHandler
+class NoCTCPUser : public SimpleUserModeHandler
 {
- public:
-	NoCTCP(Module* Creator) : SimpleChannelModeHandler(Creator, "noctcp", 'C') { }
+public:
+	NoCTCPUser(Module* Creator)
+		: SimpleUserModeHandler(Creator, "u_noctcp", 'T')
+	{
+		if (!ServerInstance->Config->ConfValue("noctcp")->getBool("enableumode"))
+			DisableAutoRegister();
+	}
 };
 
 class ModuleNoCTCP : public Module
 {
-
-	NoCTCP nc;
+	CheckExemption::EventProvider exemptionprov;
+	SimpleChannelModeHandler nc;
+	NoCTCPUser ncu;
 
  public:
-
 	ModuleNoCTCP()
-		: nc(this)
+		: exemptionprov(this)
+		, nc(this, "noctcp", 'C')
+		, ncu(this)
 	{
 	}
 
-	void init()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		ServerInstance->Modules->AddService(nc);
-		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+		return Version("Provides user mode +T and channel mode +C to block CTCPs", VF_VENDOR);
 	}
 
-	virtual ~ModuleNoCTCP()
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
-	}
-
-	virtual Version GetVersion()
-	{
-		return Version("Provides channel mode +C to block CTCPs", VF_VENDOR);
-	}
+		if (!IS_LOCAL(user))
+			return MOD_RES_PASSTHRU;
 
-	virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
-	{
-		return OnUserPreNotice(user,dest,target_type,text,status,exempt_list);
-	}
+		std::string ctcpname;
+		if (!details.IsCTCP(ctcpname) || irc::equals(ctcpname, "ACTION"))
+			return MOD_RES_PASSTHRU;
 
-	virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
-	{
-		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
+		if (target.type == MessageTarget::TYPE_CHANNEL)
 		{
-			Channel* c = (Channel*)dest;
-			if ((text.empty()) || (text[0] != '\001') || (!strncmp(text.c_str(),"\1ACTION ", 8)) || (text == "\1ACTION\1") || (text == "\1ACTION"))
-				return MOD_RES_PASSTHRU;
-
-			ModResult res = ServerInstance->OnCheckExemption(user,c,"noctcp");
+			Channel* c = target.Get<Channel>();
+			ModResult res = CheckExemption::Call(exemptionprov, user, c, "noctcp");
 			if (res == MOD_RES_ALLOW)
 				return MOD_RES_PASSTHRU;
 
-			if (!c->GetExtBanStatus(user, 'C').check(!c->IsModeSet('C')))
+			if (!c->GetExtBanStatus(user, 'C').check(!c->IsModeSet(nc)))
 			{
-				user->WriteNumeric(ERR_NOCTCPALLOWED, "%s %s :Can't send CTCP to channel (+C set)",user->nick.c_str(), c->name.c_str());
+				user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send CTCP to channel (+C set)");
 				return MOD_RES_DENY;
 			}
 		}
+		else if (target.type == MessageTarget::TYPE_USER)
+		{
+			User* u = target.Get<User>();
+			if (u->IsModeSet(ncu))
+			{
+				user->WriteNumeric(ERR_CANTSENDTOUSER, u->nick, "Can't send CTCP to user (+T set)");
+				return MOD_RES_PASSTHRU;
+			}
+		}
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void On005Numeric(std::string &output)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		ServerInstance->AddExtBanChar('C');
+		tokens["EXTBAN"].push_back('C');
 	}
 };