Convert InspIRCd::SetSignals to a static function.

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

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index cab367ad9e6abe49e879a275911a1feb79d57c3a..2883a3c6dced7820bf5c725b64ae426627ca6376 100644 (file)
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -20,20 +20,17 @@
 
 
 #include "inspircd.h"
-
-class NoNotice : public SimpleChannelModeHandler
-{
- public:
-       NoNotice(Module* Creator) : SimpleChannelModeHandler(Creator, "nonotice", 'T') { }
-};
+#include "modules/exemption.h"
 
 class ModuleNoNotice : public Module
 {
-       NoNotice nt;
+       CheckExemption::EventProvider exemptionprov;
+       SimpleChannelModeHandler nt;
  public:
 
        ModuleNoNotice()
-               : nt(this)
+               : exemptionprov(this)
+               , nt(this, "nonotice", 'T')
        {
        }
 
@@ -42,22 +39,22 @@ class ModuleNoNotice : public Module
                tokens["EXTBAN"].push_back('T');
        }
 
-       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
        {
-               ModResult res;
-               if ((msgtype == MSG_NOTICE) && (target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
+               if ((details.type == MSG_NOTICE) && (target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
-                       Channel* c = (Channel*)dest;
-                       if (!c->GetExtBanStatus(user, 'T').check(!c->IsModeSet(nt)))
+                       Channel* c = target.Get<Channel>();
+
+                       ModResult res = CheckExemption::Call(exemptionprov, user, c, "nonotice");
+                       if (res == MOD_RES_ALLOW)
+                               return MOD_RES_PASSTHRU;
+
+                       bool modeset = c->IsModeSet(nt);
+                       if (!c->GetExtBanStatus(user, 'T').check(!modeset))
                        {
-                               res = ServerInstance->OnCheckExemption(user,c,"nonotice");
-                               if (res == MOD_RES_ALLOW)
-                                       return MOD_RES_PASSTHRU;
-                               else
-                               {
-                                       user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s :Can't send NOTICE to channel (+T set)", c->name.c_str());
-                                       return MOD_RES_DENY;
-                               }
+                               user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, InspIRCd::Format("Can't send NOTICE to channel (%s)",
+                                       modeset ? "+T is set" : "you're extbanned"));
+                               return MOD_RES_DENY;
                        }
                }
                return MOD_RES_PASSTHRU;