Made SANICK not collide the user (theres no need to in the new 1.1 now we have return...

[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 4dcca3d9d65346589a56f748c1bacd5069d7e678..fb5b4bc833d13b0237ed4c38a57d9e4ece0f2443 100644 (file)
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -34,26 +34,28 @@ using namespace std;
 class cmd_devoice : public command_t
 {
  public:
- cmd_devoice (InspIRCd* Instance) : command_t(Instance,"DEVOICE", 0, 1)
+       cmd_devoice (InspIRCd* Instance) : command_t(Instance,"DEVOICE", 0, 1)
        {
                this->source = "m_devoice.so";
                syntax = "<channel>";
        }
 
-       void Handle (const 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.
-                */
-               const 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;
 
-               ServerInstance->SendMode(modes,3,user);
+                       ServerInstance->SendMode(modes,3,user);
+
+                       return CMD_SUCCESS;
+               }
+
+               return CMD_FAILURE;
        }
 };