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 / cmd_part.cpp

diff --git a/src/cmd_part.cpp b/src/cmd_part.cpp
index 70a5511eb8491e2fa6a1d8100e47583bc98edff6..cb5dde28ef7e51f9d22074e567a471b5cc99dc4d 100644 (file)
--- a/src/cmd_part.cpp
+++ b/src/cmd_part.cpp
@@ -16,24 +16,33 @@
 
 #include "inspircd.h"
 #include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "commands/cmd_part.h"
 
-extern InspIRCd* ServerInstance;
 
-void cmd_part::Handle (char **parameters, int pcnt, userrec *user)
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_part(Instance);
+}
+
+CmdResult cmd_part::Handle (const char** parameters, int pcnt, userrec *user)
 {
-       if (pcnt > 1)
+       if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+               return CMD_SUCCESS;
+
+       chanrec* c = ServerInstance->FindChan(parameters[0]);
+       
+       if (c)
        {
-               if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-2,0))
-                       return;
-               del_channel(user,parameters[0],parameters[1],false);
+               if (!c->PartUser(user, pcnt > 1 ? parameters[0] : NULL))
+                       /* Arse, who stole our channel! :/ */
+                       delete c;
        }
        else
        {
-               if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-1,0))
-                       return;
-               del_channel(user,parameters[0],NULL,false);
+               user->WriteServ( "401 %s %s :No such channel", user->nick, parameters[0]);
+               return CMD_FAILURE;
        }
+
+       return CMD_SUCCESS;
 }