Add const std::string &original_command to OnPreCommand and OnPostCommand, which...

[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 ecae6a763ab62e3cdba1f12ea2a31d7990785918..c1f4e3bc871cd4589d9cfe1366f602754d23d262 100644 (file)
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -27,31 +27,35 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "inspircd.h"
 
-Server *Srv;
-        
+/** Handle /DEVOICE
+ */     
 class cmd_devoice : public command_t
 {
  public:
-       cmd_devoice () : command_t("DEVOICE", 'o', 2)
+       cmd_devoice (InspIRCd* Instance) : command_t(Instance,"DEVOICE", 0, 1)
        {
                this->source = "m_devoice.so";
+               syntax = "<channel>";
        }
 
-       void Handle (char **parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
-               /*
-                * NOTE: DO NOT CODE LIKE THIS!!! This has no checks and can send
-                * invalid or plain confusing mode changes, code some checking!
-                *
-                * - I'm not aware what checking I need, so for now... be supreme evil.
-                */
-                char* modes[3];
-                modes[0] = parameters[0];
-                modes[1] = "-v";
-                modes[2] = user->nick;
+               chanrec* c = ServerInstance->FindChan(parameters[0]);
+               if (c && c->HasUser(user))
+               {
+                       const char* modes[3];
+                       modes[0] = parameters[0];
+                       modes[1] = "-v";
+                       modes[2] = user->nick;
 
-                Srv->SendMode(modes,3,user);
+                       ServerInstance->SendMode(modes,3,user);
+
+                       return CMD_SUCCESS;
+               }
+
+               return CMD_FAILURE;
        }
 };
 
@@ -59,11 +63,11 @@ class ModuleDeVoice : public Module
 {
        cmd_devoice *mycommand;
  public:
-       ModuleDeVoice(Server* Me) : Module::Module(Me)
+       ModuleDeVoice(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_devoice();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_devoice(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleDeVoice()
@@ -88,7 +92,7 @@ class ModuleDeVoiceFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleDeVoice(Me);
        }