X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_join.cpp;h=aa2f537a5da9e23a3393d943bbfe7f4948226979;hb=b844d1cbbe79585facc69b9247baa8427cff0b62;hp=fc63283e5b68ec8865fcde69a08d0e43650f3a1f;hpb=0757a4a495daabf661ac3b7ab79f0a5ee423abe8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp
index fc63283e5..aa2f537a5 100644
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -16,23 +13,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)
 {
-	if (ServerInstance->Parser->LoopCall(this, parameters, pcnt, user, 0, 0, 1))
-		return;
+	return new cmd_join(Instance);
+}
 
-	if (IsValidChannelName(parameters[0]))
+/** Handle /JOIN
+ */
+CmdResult cmd_join::Handle (const char** parameters, int pcnt, userrec *user)
+{
+	if (pcnt > 1)
 	{
-		add_channel(user, parameters[0], parameters[1], false);
+		if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0, 1))
+			return CMD_SUCCESS;
+
+		if (ServerInstance->IsChannel(parameters[0]))
+		{
+			chanrec::JoinUser(ServerInstance, user, parameters[0], false, parameters[1]);
+			return CMD_SUCCESS;
+		}
 	}
 	else
 	{
-		WriteServ(user->fd,"403 %s %s :Invalid channel name",user->nick, parameters[0]);
+		if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+			return CMD_SUCCESS;
+
+		if (ServerInstance->IsChannel(parameters[0]))
+		{
+			chanrec::JoinUser(ServerInstance, user, parameters[0], false);
+			return CMD_SUCCESS;
+		}
 	}
+
+	user->WriteServ("403 %s %s :Invalid channel name",user->nick, parameters[0]);
+	return CMD_FAILURE;
 }