Untested! New m_watch that should be hundreds of times faster (im not joking either)

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

diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp
index 11a4e9493daa73794deff82f6d067556de7a5013..34f33f40af86b113dcb53db17af6efd50cbc3048 100644 (file)
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -16,18 +16,17 @@
 
 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 +V */
 
 class NoInvite : public ModeHandler
 {
  public:
-       NoInvite() : ModeHandler('V', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       NoInvite(InspIRCd* Instance) : ModeHandler(Instance, 'V', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
@@ -54,67 +53,58 @@ class NoInvite : public ModeHandler
 
 class ModuleNoInvite : public Module
 {
-       Server *Srv;
        NoInvite *ni;
-       
-       public:
- 
-               ModuleNoInvite(Server* Me) : Module::Module(Me)
-               {
-                       Srv = Me;
-                       ni = new NoInvite();
-                       Srv->AddMode(ni, 'V');
-               }
-
-               void Implements(char* List)
-               {
-                       List[I_On005Numeric] = List[I_OnUserPreInvite] = 1;
-               }
+ public:
 
-               virtual void On005Numeric(std::string &output)
-               {
-                       InsertMode(output,"V",4);
-               }
+       ModuleNoInvite(InspIRCd* Me) : Module::Module(Me)
+       {
+               ni = new NoInvite(ServerInstance);
+               ServerInstance->AddMode(ni, 'V');
+       }
 
+       void Implements(char* List)
+       {
+               List[I_OnUserPreInvite] = 1;
+       }
 
-               virtual int OnUserPreInvite(userrec* user,userrec* dest,chanrec* channel)
+       virtual int OnUserPreInvite(userrec* user,userrec* dest,chanrec* channel)
+       {
+               if (channel->IsModeSet('V'))
                {
-                       if (channel->IsModeSet('V'))
-                       {
-                               user->WriteServ("492 %s %s :Can't invite %s to channel (+V set)",user->nick, channel->name, dest->nick);
-                               return 1;
-                       }
-                       return 0;
+                       user->WriteServ("492 %s %s :Can't invite %s to channel (+V set)",user->nick, channel->name, dest->nick);
+                       return 1;
                }
+               return 0;
+       }
 
-               virtual ~ModuleNoInvite()
-               {
-                       DELETE(ni);
-               }
+       virtual ~ModuleNoInvite()
+       {
+               ServerInstance->Modes->DelMode(ni);
+               DELETE(ni);
+       }
        
-               virtual Version GetVersion()
-               {
-                       return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
-               }
+       virtual Version GetVersion()
+       {
+               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+       }
 };
 
 
 class ModuleNoInviteFactory : public ModuleFactory
 {
-       public:
-               ModuleNoInviteFactory()
-               {
-               }
-       
-               ~ModuleNoInviteFactory()
-               {
-               }
-       
-               virtual Module * CreateModule(Server* Me)
-               {
-                       return new ModuleNoInvite(Me);
-               }
-       
+ public:
+       ModuleNoInviteFactory()
+       {
+       }
+
+       ~ModuleNoInviteFactory()
+       {
+       }
+
+       virtual Module * CreateModule(InspIRCd* Me)
+       {
+               return new ModuleNoInvite(Me);
+       }
 };