Various text improvements: consistency, syntax, help and doc updates/fixes.

[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 1945bf52e2484a2a8d1df83815e00d31b5e5fcf3..0e783d2b3852dbcfeac14b2359ca2158981df43d 100644 (file)
--- a/src/coremods/core_channel/cmd_join.cpp
+++ b/src/coremods/core_channel/cmd_join.cpp
@@ -24,13 +24,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 +55,6 @@ CmdResult CommandJoin::HandleLocal(const std::vector<std::string>& parameters, L
                }
        }
 
-       user->WriteNumeric(ERR_NOSUCHCHANNEL, "%s :Invalid channel name", parameters[0].c_str());
+       user->WriteNumeric(ERR_BADCHANMASK, parameters[0], "Invalid channel name");
        return CMD_FAILURE;
 }