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 d791dca365ab363378a21d965fddffd15ac76f05..af14c73ec14fa8e4ebc623f27b7339822f29b2df 100644 (file)
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -20,51 +20,69 @@
 
 
 #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
 {
-       NoCTCP nc;
+       CheckExemption::EventProvider exemptionprov;
+       SimpleChannelModeHandler nc;
+       NoCTCPUser ncu;
 
  public:
        ModuleNoCTCP()
-               : nc(this)
-       {
-       }
-
-       void init() CXX11_OVERRIDE
+               : exemptionprov(this)
+               , nc(this, "noctcp", 'C')
+               , ncu(this)
        {
-               ServerInstance->Modules->AddService(nc);
        }
 
        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)))
-               {
-                       Channel* c = (Channel*)dest;
-                       if ((text.empty()) || (text[0] != '\001') || (!strncmp(text.c_str(),"\1ACTION ",8)))
-                               return MOD_RES_PASSTHRU;
+               if (!IS_LOCAL(user))
+                       return MOD_RES_PASSTHRU;
 
-                       ModResult res = ServerInstance->OnCheckExemption(user,c,"noctcp");
+               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>();
+                       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)))
                        {
-                               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;
        }