Annotations

[user/henk/code/inspircd.git] / src / cmd_join.cpp

diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp
index 728038c2eb11d600700f489fd64a09ace172df78..89483e1b4a52156fb0ac2c917bbe97afc06cdc35 100644 (file)
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -16,36 +16,40 @@
 
 #include "inspircd.h"
 #include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "commands/cmd_join.h"
 
-extern InspIRCd* ServerInstance;
 
-void cmd_join::Handle (const char** parameters, int pcnt, userrec *user)
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_join(Instance);
+}
+
+CmdResult cmd_join::Handle (const char** parameters, int pcnt, userrec *user)
 {
        if (pcnt > 1)
        {
                if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0, 1))
-                       return;
+                       return CMD_SUCCESS;
 
-               if (IsValidChannelName(parameters[0]))
+               if (ServerInstance->IsChannel(parameters[0]))
                {
-                       add_channel(user, parameters[0], parameters[1], false);
-                       return;
+                       chanrec::JoinUser(ServerInstance, user, parameters[0], false, parameters[1]);
+                       return CMD_SUCCESS;
                }
        }
        else
        {
                if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
-                       return;
+                       return CMD_SUCCESS;
 
-               if (IsValidChannelName(parameters[0]))
+               if (ServerInstance->IsChannel(parameters[0]))
                {
-                       add_channel(user, parameters[0], "", false);
-                       return;
+                       chanrec::JoinUser(ServerInstance, user, parameters[0], false);
+                       return CMD_SUCCESS;
                }
        }
 
-       WriteServ(user->fd,"403 %s %s :Invalid channel name",user->nick, parameters[0]);
+       user->WriteServ("403 %s %s :Invalid channel name",user->nick, parameters[0]);
+       return CMD_FAILURE;
 }