Move static map of extensions into ServerInstance, add const-correctness

[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 72426646f95c681aa991038318893bfb541378c7..b7571f35fe2eb377b98dc21008edf1c977411c5c 100644 (file)
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -18,7 +18,7 @@
 class NoNotice : public SimpleChannelModeHandler
 {
  public:
-       NoNotice(InspIRCd* Instance, Module* Creator) : SimpleChannelModeHandler(Instance, Creator, 'T') { }
+       NoNotice(Module* Creator) : SimpleChannelModeHandler(Creator, "nonotice", 'T') { }
 };
 
 class ModuleNoNotice : public Module
@@ -26,8 +26,8 @@ class ModuleNoNotice : public Module
        NoNotice nt;
  public:
 
-       ModuleNoNotice(InspIRCd* Me)
-               : Module(Me), nt(Me, this)
+       ModuleNoNotice()
+               : nt(this)
        {
                if (!ServerInstance->Modes->AddMode(&nt))
                        throw ModuleException("Could not add new modes!");
@@ -42,6 +42,7 @@ class ModuleNoNotice : public Module
 
        virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
+               ModResult res;
                if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
                        Channel* c = (Channel*)dest;
@@ -52,11 +53,9 @@ class ModuleNoNotice : public Module
                                        // ulines are exempt.
                                        return MOD_RES_PASSTHRU;
                                }
-                               else if (CHANOPS_EXEMPT(ServerInstance, 'T') && c->GetStatus(user) == STATUS_OP)
-                               {
-                                       // channel ops are exempt if set in conf.
+                               FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,c,"nonotice"));
+                               if (res == MOD_RES_ALLOW)
                                        return MOD_RES_PASSTHRU;
-                               }
                                else
                                {
                                        user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s %s :Can't send NOTICE to channel (+T set)",user->nick.c_str(), c->name.c_str());
@@ -69,12 +68,11 @@ class ModuleNoNotice : public Module
 
        virtual ~ModuleNoNotice()
        {
-               ServerInstance->Modes->DelMode(&nt);
        }
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for unreal-style channel mode +T", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };