X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_join.cpp;h=e473053e58db4659d482c2e3ccfcbde912f65890;hb=76619990ad82501afc95d0c76f057a2841862de9;hp=1c640b326ca5e825ca51174a64725aa93068b9be;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_join.cpp b/src/commands/cmd_join.cpp
index 1c640b326..e473053e5 100644
--- a/src/commands/cmd_join.cpp
+++ b/src/commands/cmd_join.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,40 +12,67 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_join.h"
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+#ifndef CMD_JOIN_H
+#define CMD_JOIN_H
+
+// include the common header files
+
+#include "users.h"
+#include "channels.h"
+
+/** Handle /JOIN. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandJoin : public Command
 {
-	return new CommandJoin(Instance);
-}
+ public:
+	/** Constructor for join.
+	 */
+	CommandJoin ( Module* parent) : Command(parent,"JOIN", 1, 2) { syntax = "<channel>{,<channel>} {<key>{,<key>}}"; Penalty = 2; }
+	/** Handle command.
+	 * @param parameters The parameters to the comamnd
+	 * @param pcnt The number of parameters passed to teh command
+	 * @param user The user issuing the command
+	 * @return A value from CmdResult to indicate command success or failure.
+	 */
+	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+};
+
+#endif
+
 
 /** Handle /JOIN
  */
-CmdResult CommandJoin::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandJoin::Handle (const std::vector<std::string>& parameters, User *user)
 {
-	if (pcnt > 1)
+	if (parameters.size() > 1)
 	{
-		if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0, 1))
+		if (ServerInstance->Parser->LoopCall(user, this, parameters, 0, 1, false))
 			return CMD_SUCCESS;
 
-		if (ServerInstance->IsChannel(parameters[0]))
+		if (ServerInstance->IsChannel(parameters[0].c_str(), ServerInstance->Config->Limits.ChanMax))
 		{
-			Channel::JoinUser(ServerInstance, user, parameters[0], false, parameters[1], false);
+			Channel::JoinUser(user, parameters[0].c_str(), false, parameters[1].c_str(), false);
 			return CMD_SUCCESS;
 		}
 	}
 	else
 	{
-		if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+		if (ServerInstance->Parser->LoopCall(user, this, parameters, 0, -1, false))
 			return CMD_SUCCESS;
 
-		if (ServerInstance->IsChannel(parameters[0]))
+		if (ServerInstance->IsChannel(parameters[0].c_str(), ServerInstance->Config->Limits.ChanMax))
 		{
-			Channel::JoinUser(ServerInstance, user, parameters[0], false, "", false);
+			Channel::JoinUser(user, parameters[0].c_str(), false, "", false);
 			return CMD_SUCCESS;
 		}
 	}
 
-	user->WriteServ("403 %s %s :Invalid channel name",user->nick, parameters[0]);
+	user->WriteNumeric(ERR_NOSUCHCHANNEL, "%s %s :Invalid channel name",user->nick.c_str(), parameters[0].c_str());
 	return CMD_FAILURE;
 }
+
+COMMAND_INIT(CommandJoin)