Extbans can be VF_OPTCOMMON as they do not desync on module add/remove

[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 a1092ab7ced6cbe73e57aa3405524828695297f4..fe1e0a46d33690162dc7c2da61ab08379e52135b 100644 (file)
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -18,21 +18,18 @@
 class NoNotice : public SimpleChannelModeHandler
 {
  public:
-       NoNotice(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'T') { }
+       NoNotice(Module* Creator) : SimpleChannelModeHandler(Creator, "nonotice", 'T') { }
 };
 
 class ModuleNoNotice : public Module
 {
-
-       NoNotice* nt;
+       NoNotice nt;
  public:
 
-       ModuleNoNotice(InspIRCd* Me)
-               : Module(Me)
+       ModuleNoNotice()
+               : nt(this)
        {
-
-               nt = new NoNotice(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(nt))
+               if (!ServerInstance->Modes->AddMode(&nt))
                        throw ModuleException("Could not add new modes!");
                Implementation eventlist[] = { I_OnUserPreNotice, I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, 2);
@@ -43,42 +40,39 @@ class ModuleNoNotice : public Module
                ServerInstance->AddExtBanChar('T');
        }
 
-       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       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;
-                       if (c->IsModeSet('T') || c->GetExtBanStatus(user, 'T') < 0)
+                       if (!c->GetExtBanStatus(user, 'T').check(!c->IsModeSet('T')))
                        {
                                if (ServerInstance->ULine(user->server))
                                {
                                        // ulines are exempt.
-                                       return 0;
-                               }
-                               else if (CHANOPS_EXEMPT(ServerInstance, 'T') && c->GetStatus(user) == STATUS_OP)
-                               {
-                                       // channel ops are exempt if set in conf.
-                                       return 0;
+                                       return MOD_RES_PASSTHRU;
                                }
+                               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());
-                                       return 1;
+                                       return MOD_RES_DENY;
                                }
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual ~ModuleNoNotice()
        {
-               ServerInstance->Modes->DelMode(nt);
-               delete nt;
        }
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for unreal-style channel mode +T", VF_VENDOR);
        }
 };