Merge m_noctcp_user into m_noctcp.

[user/henk/code/inspircd.git] / src / modules / m_noctcp.cpp

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index dbfe55eac137aa2400c7e51ff1c6c5d78c7327e9..af14c73ec14fa8e4ebc623f27b7339822f29b2df 100644 (file)
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -22,31 +22,48 @@
 #include "inspircd.h"
 #include "modules/exemption.h"
 
+class NoCTCPUser : public SimpleUserModeHandler
+{
+public:
+       NoCTCPUser(Module* Creator)
+               : SimpleUserModeHandler(Creator, "u_noctcp", 'T')
+       {
+               if (!ServerInstance->Config->ConfValue("noctcp")->getBool("enableumode"))
+                       DisableAutoRegister();
+       }
+};
+
 class ModuleNoCTCP : public Module
 {
        CheckExemption::EventProvider exemptionprov;
        SimpleChannelModeHandler nc;
+       NoCTCPUser ncu;
 
  public:
        ModuleNoCTCP()
                : exemptionprov(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, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
        {
-               if ((target.type == MessageTarget::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;
+
+               if (target.type == MessageTarget::TYPE_CHANNEL)
                {
                        Channel* c = target.Get<Channel>();
-                       if ((details.text.empty()) || (details.text[0] != '\001') || (!strncmp(details.text.c_str(),"\1ACTION ", 8)) || (details.text == "\1ACTION\1") || (details.text == "\1ACTION"))
-                               return MOD_RES_PASSTHRU;
-
                        ModResult res = CheckExemption::Call(exemptionprov, user, c, "noctcp");
                        if (res == MOD_RES_ALLOW)
                                return MOD_RES_PASSTHRU;
@@ -57,6 +74,15 @@ class ModuleNoCTCP : public Module
                                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;
        }