Patch to not increment nickchange counter for nick changes that would be blocked...

[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 513901e4703d89050af8892aadae0bccf8c53f89..c8d731ef5cebd57b0588c1df73dea6e51c889ad5 100644 (file)
--- 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-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -21,31 +21,31 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /JOIN
  */
-CmdResult CommandJoin::Handle (const char* const* 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))
                        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(ServerInstance, 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))
                        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(ServerInstance, 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;
 }