MetaData rework

[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 8424be8974c2bfd74f52e6e1211ac0865b700b91..854de29017aed1ef6fa06e59ec8f1909ed5dcebc 100644 (file)
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -23,28 +23,29 @@ class NoNotice : public SimpleChannelModeHandler
 
 class ModuleNoNotice : public Module
 {
-
-       NoNotice* nt;
+       NoNotice nt;
  public:
 
        ModuleNoNotice(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), nt(Me)
        {
-
-               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 };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               Implementation eventlist[] = { I_OnUserPreNotice, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
+       virtual void On005Numeric(std::string &output)
+       {
+               ServerInstance->AddExtBanChar('T');
+       }
 
        virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
                        Channel* c = (Channel*)dest;
-                       if (c->IsModeSet('T'))
+                       if (c->IsModeSet('T') || c->GetExtBanStatus(user, 'T') < 0)
                        {
                                if (ServerInstance->ULine(user->server))
                                {
@@ -68,13 +69,12 @@ class ModuleNoNotice : public Module
 
        virtual ~ModuleNoNotice()
        {
-               ServerInstance->Modes->DelMode(nt);
-               delete nt;
+               ServerInstance->Modes->DelMode(&nt);
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };