No idea why this wasn't using MODULE_INIT. Thanks Om.

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

diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index 7400d2212c409b61ce85dfbd685301bb32ff05dc..f2c47cc9afe22e27e2990b17edf631314489101b 100644 (file)
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -18,10 +18,6 @@
 
 /* $ModDesc: Provides voiced users with the ability to devoice themselves. */
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /** Handle /DEVOICE
@@ -33,6 +29,7 @@ class cmd_devoice : public command_t
        {
                this->source = "m_devoice.so";
                syntax = "<channel>";
+               TRANSLATE2(TR_TEXT, TR_END);
        }
 
        CmdResult Handle (const char** parameters, int pcnt, userrec *user)
@@ -45,12 +42,9 @@ class cmd_devoice : public command_t
                        modes[1] = "-v";
                        modes[2] = user->nick;
 
-                       userrec* n = new userrec(ServerInstance);
-                       n->SetFd(FD_MAGIC_NUMBER);
-                       ServerInstance->SendMode(modes,3,n);
-                       delete n;
+                       ServerInstance->SendMode(modes, 3, ServerInstance->FakeClient);
 
-                       /* route it */
+                       /* route it -- SendMode doesn't distribute over the whole network */
                        return CMD_SUCCESS;
                }
 
@@ -62,7 +56,7 @@ class ModuleDeVoice : public Module
 {
        cmd_devoice *mycommand;
  public:
-       ModuleDeVoice(InspIRCd* Me) : Module::Module(Me)
+       ModuleDeVoice(InspIRCd* Me) : Module(Me)
        {
 
                mycommand = new cmd_devoice(ServerInstance);
@@ -75,31 +69,8 @@ class ModuleDeVoice : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };
 
-
-class ModuleDeVoiceFactory : public ModuleFactory
-{
- public:
-       ModuleDeVoiceFactory()
-       {
-       }
-
-       ~ModuleDeVoiceFactory()
-       {
-       }
-
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleDeVoice(Me);
-       }
-
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleDeVoiceFactory;
-}
+MODULE_INIT(ModuleDeVoice)