#include "inspircd.h"
#include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
-#include "cmd_join.h"
+#include "commands/cmd_join.h"
-extern InspIRCd* ServerInstance;
-
-void cmd_join::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_join::Handle (const char** parameters, int pcnt, userrec *user)
{
- if (ServerInstance->Parser->LoopCall(this, parameters, pcnt, user, 0, 0, 1))
- return;
-
- if (IsValidChannelName(parameters[0]))
+ if (pcnt > 1)
{
- add_channel(user, parameters[0], parameters[1], false);
+ if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0, 1))
+ return;
+
+ if (ServerInstance->IsChannel(parameters[0]))
+ {
+ chanrec::JoinUser(ServerInstance, user, parameters[0], false, parameters[1]);
+ return;
+ }
}
else
{
- WriteServ(user->fd,"403 %s %s :Invalid channel name",user->nick, parameters[0]);
+ if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+ return;
+
+ if (ServerInstance->IsChannel(parameters[0]))
+ {
+ chanrec::JoinUser(ServerInstance, user, parameters[0], false);
+ return;
+ }
}
+
+ user->WriteServ("403 %s %s :Invalid channel name",user->nick, parameters[0]);
}