From 6c7a3ceb6c674a9af09da955ee0238e9291cf29a Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 12 Nov 2013 06:51:31 -0500 Subject: Use WriteNumeric() everywhere we send numerics and include the user's nick automatically --- src/commands/cmd_kick.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/commands/cmd_kick.cpp') diff --git a/src/commands/cmd_kick.cpp b/src/commands/cmd_kick.cpp index b59eec030..10022d105 100644 --- a/src/commands/cmd_kick.cpp +++ b/src/commands/cmd_kick.cpp @@ -62,7 +62,7 @@ CmdResult CommandKick::Handle (const std::vector& parameters, User if (!u || !c) { - user->WriteServ( "401 %s %s :No such nick/channel", user->nick.c_str(), u ? parameters[0].c_str() : parameters[1].c_str()); + user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", u ? parameters[0].c_str() : parameters[1].c_str()); return CMD_FAILURE; } @@ -72,13 +72,13 @@ CmdResult CommandKick::Handle (const std::vector& parameters, User srcmemb = c->GetUser(user); if (!srcmemb) { - user->WriteServ( "442 %s %s :You're not on that channel!", user->nick.c_str(), parameters[0].c_str()); + user->WriteNumeric(ERR_NOTONCHANNEL, "%s :You're not on that channel!", parameters[0].c_str()); return CMD_FAILURE; } if (ServerInstance->ULine(u->server)) { - user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You may not kick a u-lined client", user->nick.c_str(), c->name.c_str()); + user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You may not kick a u-lined client", c->name.c_str()); return CMD_FAILURE; } } -- cgit v1.2.3