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 9dd9bf852d25e1dd3da1e4ed88079ad2f1aba315..26077759a6ba56e2f3be0bcd52c6f2cbabf08630 100644 (file)
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -22,21 +22,15 @@
 #include "inspircd.h"
 #include "modules/exemption.h"
 
-class NoCTCP : public SimpleChannelModeHandler
-{
- public:
-       NoCTCP(Module* Creator) : SimpleChannelModeHandler(Creator, "noctcp", 'C') { }
-};
-
 class ModuleNoCTCP : public Module
 {
        CheckExemption::EventProvider exemptionprov;
-       NoCTCP nc;
+       SimpleChannelModeHandler nc;
 
  public:
        ModuleNoCTCP()
                : exemptionprov(this)
-               , nc(this)
+               , nc(this, "noctcp", 'C')
        {
        }
 
@@ -45,16 +39,15 @@ 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;
-                       FIRST_MOD_RESULT_CUSTOM(exemptionprov, CheckExemption::EventListener, OnCheckExemption, res, (user, c, "noctcp"));
+                       ModResult res = CheckExemption::Call(exemptionprov, user, c, "noctcp");
                        if (res == MOD_RES_ALLOW)
                                return MOD_RES_PASSTHRU;