Merge pull request #545 from SaberUK/master+logging-cleanup

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

diff --git a/src/commands/cmd_join.cpp b/src/commands/cmd_join.cpp
index e473053e58db4659d482c2e3ccfcbde912f65890..a88509bc26c00314f5a500c083facb4f8ba6199d 100644 (file)
--- a/src/commands/cmd_join.cpp
+++ b/src/commands/cmd_join.cpp
@@ -1,61 +1,63 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
-
-#ifndef CMD_JOIN_H
-#define CMD_JOIN_H
 
-// include the common header files
-
-#include "users.h"
-#include "channels.h"
+#include "inspircd.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
+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);
 };
 
-#endif
-
-
 /** 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;
                }
        }
@@ -64,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;
                }
        }