X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_join.cpp;h=a88509bc26c00314f5a500c083facb4f8ba6199d;hb=b36ce84c7da93f680fc397bcb4c877abe063eaaa;hp=6124fcc1c7746b5975cdf049cb0d478d5448255c;hpb=baa9ba88b78cf9de5e37dc78433c4e2f91ee9c79;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_join.cpp b/src/commands/cmd_join.cpp
index 6124fcc1c..a88509bc2 100644
--- a/src/commands/cmd_join.cpp
+++ b/src/commands/cmd_join.cpp
@@ -25,33 +25,39 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class CommandJoin : public Command
+class CommandJoin : public SplitCommand
 {
  public:
 	/** Constructor for join.
 	 */
-	CommandJoin ( Module* parent) : Command(parent,"JOIN", 1, 2) { syntax = "<channel>{,<channel>} {<key>{,<key>}}"; Penalty = 2; }
+	CommandJoin(Module* parent)
+		: SplitCommand(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);
+	CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user);
 };
 
 /** Handle /JOIN
  */
-CmdResult CommandJoin::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandJoin::HandleLocal(const std::vector<std::string>& parameters, LocalUser *user)
 {
 	if (parameters.size() > 1)
 	{
 		if (ServerInstance->Parser->LoopCall(user, this, parameters, 0, 1, false))
 			return CMD_SUCCESS;
 
-		if (ServerInstance->IsChannel(parameters[0].c_str(), ServerInstance->Config->Limits.ChanMax))
+		if (ServerInstance->IsChannel(parameters[0]))
 		{
-			Channel::JoinUser(user, parameters[0].c_str(), false, parameters[1].c_str(), false);
+			Channel::JoinUser(user, parameters[0], false, parameters[1]);
 			return CMD_SUCCESS;
 		}
 	}
@@ -60,9 +66,9 @@ CmdResult CommandJoin::Handle (const std::vector<std::string>& parameters, User
 		if (ServerInstance->Parser->LoopCall(user, this, parameters, 0, -1, false))
 			return CMD_SUCCESS;
 
-		if (ServerInstance->IsChannel(parameters[0].c_str(), ServerInstance->Config->Limits.ChanMax))
+		if (ServerInstance->IsChannel(parameters[0]))
 		{
-			Channel::JoinUser(user, parameters[0].c_str(), false, "", false);
+			Channel::JoinUser(user, parameters[0]);
 			return CMD_SUCCESS;
 		}
 	}