Remove a redundant method here, call the mode manager directly

[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 a92b327d7dcabb52f090039a344c2d66513a264d..11b57e09be9d2530f320750f0231dfb3c4b89b61 100644 (file)
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -2,25 +2,15 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +T */
@@ -28,9 +18,9 @@ using namespace std;
 class NoNotice : public ModeHandler
 {
  public:
-       NoNotice() : ModeHandler('T', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       NoNotice(InspIRCd* Instance) : ModeHandler(Instance, 'T', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -55,31 +45,30 @@ class NoNotice : public ModeHandler
 
 class ModuleNoNotice : public Module
 {
-       Server *Srv;
+       
        NoNotice* nt;
  public:
  
-       ModuleNoNotice(Server* Me)
-               : Module::Module(Me)
+       ModuleNoNotice(InspIRCd* Me)
+               : Module(Me)
        {
-               Srv = Me;
-               nt = new NoNotice();
-               Srv->AddMode(nt, 'T');
+               
+               nt = new NoNotice(ServerInstance);
+               if (!ServerInstance->Modes->AddMode(nt))
+                       throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnUserPreNotice };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserPreNotice] = List[I_On005Numeric] = 1;
-       }
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               if (target_type == TYPE_CHANNEL)
+               if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
-                       chanrec* c = (chanrec*)dest;
+                       Channel* c = (Channel*)dest;
                        if (c->IsModeSet('T'))
                        {
-                               if ((Srv->IsUlined(user->server)) || (Srv->ChanMode(user,c) == "@") || (Srv->ChanMode(user,c) == "%"))
+                               if ((ServerInstance->ULine(user->server)) || (c->GetStatus(user) == STATUS_OP) || (c->GetStatus(user) == STATUS_HOP))
                                {
                                        // ops and halfops can still /NOTICE the channel
                                        return 0;
@@ -94,44 +83,16 @@ class ModuleNoNotice : public Module
                return 0;
        }
 
-       virtual void On005Numeric(std::string &output)
-       {
-               InsertMode(output,"T",4);
-       }
-
        virtual ~ModuleNoNotice()
        {
-               DELETE(nt);
+               ServerInstance->Modes->DelMode(nt);
+               delete nt;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 };
 
-
-class ModuleNoNoticeFactory : public ModuleFactory
-{
- public:
-       ModuleNoNoticeFactory()
-       {
-       }
-       
-       ~ModuleNoNoticeFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleNoNotice(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleNoNoticeFactory;
-}
-
+MODULE_INIT(ModuleNoNotice)