Merge pull request #55 from Justasic/insp20

[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 c8d731ef5cebd57b0588c1df73dea6e51c889ad5..e473053e58db4659d482c2e3ccfcbde912f65890 100644 (file)
--- a/src/commands/cmd_join.cpp
+++ b/src/commands/cmd_join.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,12 +12,37 @@
  */
 
 #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
  */
@@ -25,23 +50,23 @@ CmdResult CommandJoin::Handle (const std::vector<std::string>& parameters, User
 {
        if (parameters.size() > 1)
        {
-               if (ServerInstance->Parser->LoopCall(user, this, parameters, 0, 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))
                {
-                       Channel::JoinUser(ServerInstance, user, parameters[0].c_str(), false, parameters[1].c_str(), 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, 0))
+               if (ServerInstance->Parser->LoopCall(user, this, parameters, 0, -1, false))
                        return CMD_SUCCESS;
 
                if (ServerInstance->IsChannel(parameters[0].c_str(), ServerInstance->Config->Limits.ChanMax))
                {
-                       Channel::JoinUser(ServerInstance, user, parameters[0].c_str(), false, "", false);
+                       Channel::JoinUser(user, parameters[0].c_str(), false, "", false);
                        return CMD_SUCCESS;
                }
        }
@@ -49,3 +74,5 @@ CmdResult CommandJoin::Handle (const std::vector<std::string>& parameters, User
        user->WriteNumeric(ERR_NOSUCHCHANNEL, "%s %s :Invalid channel name",user->nick.c_str(), parameters[0].c_str());
        return CMD_FAILURE;
 }
+
+COMMAND_INIT(CommandJoin)