From 5a3f8af9f963b164832fabc1163611a2b768a890 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Sat, 2 Sep 2017 19:53:48 +0100 Subject: Move RPL_SYNTAX to 650 to prevent a collision with RPL_TEXT. Also move the command name to a parameter so that it is more easily parseable by software. --- include/numerics.h | 3 ++- src/command_parse.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/numerics.h b/include/numerics.h index a105b970e..2dc8d8414 100644 --- a/include/numerics.h +++ b/include/numerics.h @@ -73,7 +73,6 @@ enum RPL_AWAY = 301, RPL_USERHOST = 302, RPL_ISON = 303, - RPL_SYNTAX = 304, // insp-specific RPL_UNAWAY = 305, RPL_NOWAWAY = 306, @@ -187,6 +186,8 @@ enum ERR_CANTJOINOPERSONLY = 520, // unrealircd, but crap to have so many numerics for cant join.. ERR_CANTSENDTOUSER = 531, // ??? + RPL_SYNTAX = 650, // insp-specific + ERR_CHANOPEN = 713, ERR_KNOCKONCHAN = 714, diff --git a/src/command_parse.cpp b/src/command_parse.cpp index f3511b05b..9ffd20865 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -307,7 +307,7 @@ void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd) user->CommandFloodPenalty += failpenalty; user->WriteNumeric(ERR_NEEDMOREPARAMS, command, "Not enough parameters."); if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (handler->syntax.length())) - user->WriteNumeric(RPL_SYNTAX, InspIRCd::Format("SYNTAX %s %s", handler->name.c_str(), handler->syntax.c_str())); + user->WriteNumeric(RPL_SYNTAX, handler->name, handler->syntax); return; } -- cgit v1.2.3