Fail a SANICK if the target nickname already exists.

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

diff --git a/src/coremods/core_channel/cmd_join.cpp b/src/coremods/core_channel/cmd_join.cpp
index 06e203ead68a11b3b2a1c282050d82097a9194c4..b00c8ff4ead39e4a98f402547d84d403dba39260 100644 (file)
--- a/src/coremods/core_channel/cmd_join.cpp
+++ b/src/coremods/core_channel/cmd_join.cpp
@@ -1,8 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006, 2008 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -24,13 +29,13 @@
 CommandJoin::CommandJoin(Module* parent)
        : SplitCommand(parent, "JOIN", 1, 2)
 {
-       syntax = "<channel>{,<channel>} {<key>{,<key>}}";
+       syntax = "<channel>[,<channel>]+ [<key>[,<key>]+]";
        Penalty = 2;
 }
 
 /** Handle /JOIN
  */
-CmdResult CommandJoin::HandleLocal(const std::vector<std::string>& parameters, LocalUser *user)
+CmdResult CommandJoin::HandleLocal(LocalUser* user, const Params& parameters)
 {
        if (parameters.size() > 1)
        {
@@ -55,6 +60,6 @@ CmdResult CommandJoin::HandleLocal(const std::vector<std::string>& parameters, L
                }
        }
 
-       user->WriteNumeric(ERR_NOSUCHCHANNEL, parameters[0], "Invalid channel name");
+       user->WriteNumeric(ERR_BADCHANMASK, parameters[0], "Invalid channel name");
        return CMD_FAILURE;
 }