Implement feature in bug #395 reported by stealth, and tidy up a bit

[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 9f7f211e88d00f2f8ebafcefcf8e1a31ead8f47f..06413f0ec0432206b662b3311bb9cf708c3570d7 100644 (file)
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -18,14 +18,13 @@
 
 /* $ModDesc: Provides voiced users with the ability to devoice themselves. */
 
-#include <stdio.h>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /** Handle /DEVOICE
- */     
+ */
 class cmd_devoice : public command_t
 {
  public:
@@ -45,8 +44,12 @@ class cmd_devoice : public command_t
                        modes[1] = "-v";
                        modes[2] = user->nick;
 
-                       ServerInstance->SendMode(modes,3,user);
+                       userrec* n = new userrec(ServerInstance);
+                       n->SetFd(FD_MAGIC_NUMBER);
+                       ServerInstance->SendMode(modes,3,n);
+                       delete n;
 
+                       /* route it -- SendMode doesn't distribute over the whole network */
                        return CMD_SUCCESS;
                }
 
@@ -58,44 +61,21 @@ class ModuleDeVoice : public Module
 {
        cmd_devoice *mycommand;
  public:
-       ModuleDeVoice(InspIRCd* Me) : Module::Module(Me)
+       ModuleDeVoice(InspIRCd* Me) : Module(Me)
        {
-               
+
                mycommand = new cmd_devoice(ServerInstance);
                ServerInstance->AddCommand(mycommand);
        }
-       
+
        virtual ~ModuleDeVoice()
        {
        }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
-       }
-};
-
 
-class ModuleDeVoiceFactory : public ModuleFactory
-{
- public:
-       ModuleDeVoiceFactory()
-       {
-       }
-       
-       ~ModuleDeVoiceFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
+       virtual Version GetVersion()
        {
-               return new ModuleDeVoice(Me);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleDeVoiceFactory;
-}
+MODULE_INIT(ModuleDeVoice)