X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_noctcp.cpp;h=f288820b8b12f3b1e238274a9db550f32b2cfb22;hb=9cf381330eab69d7e5bf26684d1ec8075aee60a2;hp=7139643286741bc87bce63476ce34a4602b218db;hpb=a3e0768758ca68429a29d9c78ce672f2d938c6e7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 713964328..f288820b8 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -22,47 +22,79 @@
 #include "inspircd.h"
 #include "modules/exemption.h"
 
-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
 {
 	CheckExemption::EventProvider exemptionprov;
-	NoCTCP nc;
+	SimpleChannelModeHandler nc;
+	NoCTCPUser ncu;
 
  public:
 	ModuleNoCTCP()
 		: exemptionprov(this)
-		, nc(this)
+		, nc(this, "noctcp", 'C')
+		, ncu(this)
 	{
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides channel mode +C to block CTCPs", VF_VENDOR);
+		return Version("Provides user mode +T and channel mode +C to block CTCPs", VF_VENDOR);
 	}
 
-	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
-		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
+		if (!IS_LOCAL(user))
+			return MOD_RES_PASSTHRU;
+
+		std::string ctcpname;
+		if (!details.IsCTCP(ctcpname) || irc::equals(ctcpname, "ACTION"))
+			return MOD_RES_PASSTHRU;
+
+		switch (target.type)
 		{
-			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;
+			case MessageTarget::TYPE_CHANNEL:
+			{
+				if (user->HasPrivPermission("channels/ignore-noctcp"))
+					return MOD_RES_PASSTHRU;
 
-			ModResult res;
-			FIRST_MOD_RESULT_CUSTOM(exemptionprov, CheckExemption::EventListener, OnCheckExemption, res, (user, c, "noctcp"));
-			if (res == MOD_RES_ALLOW)
-				return MOD_RES_PASSTHRU;
+				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(nc)))
+				if (!c->GetExtBanStatus(user, 'C').check(!c->IsModeSet(nc)))
+				{
+					user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send CTCP to channel (+C is set)");
+					return MOD_RES_DENY;
+				}
+				break;
+			}
+			case MessageTarget::TYPE_USER:
 			{
-				user->WriteNumeric(ERR_NOCTCPALLOWED, c->name, "Can't send CTCP to channel (+C set)");
-				return MOD_RES_DENY;
+				if (user->HasPrivPermission("users/ignore-noctcp"))
+					return MOD_RES_PASSTHRU;
+
+				User* u = target.Get<User>();
+				if (u->IsModeSet(ncu))
+				{
+					user->WriteNumeric(ERR_CANTSENDTOUSER, u->nick, "Can't send CTCP to user (+T is set)");
+					return MOD_RES_DENY;
+				}
+				break;
 			}
+			case MessageTarget::TYPE_SERVER:
+				break;
 		}
 		return MOD_RES_PASSTHRU;
 	}