Use an oper priv instead of a config flag for overriding nonicks.

[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 29b548e1c65a399ede9f2ff23eaede3b83c43823..26077759a6ba56e2f3be0bcd52c6f2cbabf08630 100644 (file)
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -20,30 +20,18 @@
 
 
 #include "inspircd.h"
-
-/* $ModDesc: Provides channel mode +C to block CTCPs */
-
-class NoCTCP : public SimpleChannelModeHandler
-{
- public:
-       NoCTCP(Module* Creator) : SimpleChannelModeHandler(Creator, "noctcp", 'C') { }
-};
+#include "modules/exemption.h"
 
 class ModuleNoCTCP : public Module
 {
-       NoCTCP nc;
+       CheckExemption::EventProvider exemptionprov;
+       SimpleChannelModeHandler nc;
 
  public:
        ModuleNoCTCP()
-               : nc(this)
-       {
-       }
-
-       void init() CXX11_OVERRIDE
+               : exemptionprov(this)
+               , nc(this, "noctcp", 'C')
        {
-               ServerInstance->Modules->AddService(nc);
-               Implementation eventlist[] = { I_OnUserPreMessage, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        Version GetVersion() CXX11_OVERRIDE
@@ -51,21 +39,21 @@ class ModuleNoCTCP : public Module
                return Version("Provides 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 ((target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
-                       Channel* c = (Channel*)dest;
-                       if ((text.empty()) || (text[0] != '\001') || (!strncmp(text.c_str(),"\1ACTION ",8)))
+                       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 = ServerInstance->OnCheckExemption(user,c,"noctcp");
+                       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_NOCTCPALLOWED, c->name, "Can't send CTCP to channel (+C set)");
                                return MOD_RES_DENY;
                        }
                }