X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_channel%2Fcmd_kick.cpp;h=b9fdbef252e23aa15102c37559e665b59b1b5cb6;hb=d71c37e05911d87830987a09128a178c3e402bb4;hp=051cc2678986032e8e063b37d1b0a3cf992a7799;hpb=ed11e05d5b6463f582dc22140794837e97796bf9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_channel/cmd_kick.cpp b/src/coremods/core_channel/cmd_kick.cpp
index 051cc2678..b9fdbef25 100644
--- a/src/coremods/core_channel/cmd_kick.cpp
+++ b/src/coremods/core_channel/cmd_kick.cpp
@@ -1,8 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2013-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 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,12 +32,12 @@
 CommandKick::CommandKick(Module* parent)
 	: Command(parent, "KICK", 2, 3)
 {
-	syntax = "<channel> <nick>{,<nick>} [<reason>]";
+	syntax = "<channel> <nick>[,<nick>]+ [:<reason>]";
 }
 
 /** Handle /KICK
  */
-CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandKick::Handle(User* user, const Params& parameters)
 {
 	Channel* c = ServerInstance->FindChan(parameters[0]);
 	User* u;
@@ -42,9 +50,14 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
 	else
 		u = ServerInstance->FindNick(parameters[1]);
 
-	if ((!u) || (!c) || (u->registered != REG_ALL))
+	if (!c)
 	{
-		user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", c ? parameters[1].c_str() : parameters[0].c_str());
+		user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
+		return CMD_FAILURE;
+	}
+	if ((!u) || (u->registered != REG_ALL))
+	{
+		user->WriteNumeric(Numerics::NoSuchNick(parameters[1]));
 		return CMD_FAILURE;
 	}
 
@@ -54,21 +67,21 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
 		srcmemb = c->GetUser(user);
 		if (!srcmemb)
 		{
-			user->WriteNumeric(ERR_NOTONCHANNEL, "%s :You're not on that channel!", parameters[0].c_str());
+			user->WriteNumeric(ERR_NOTONCHANNEL, parameters[0], "You're not on that channel!");
 			return CMD_FAILURE;
 		}
 
 		if (u->server->IsULine())
 		{
-			user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You may not kick a u-lined client", c->name.c_str());
+			user->WriteNumeric(ERR_CHANOPRIVSNEEDED, c->name, "You may not kick a U-lined client");
 			return CMD_FAILURE;
 		}
 	}
 
-	const UserMembIter victimiter = c->userlist.find(u);
+	const Channel::MemberMap::iterator victimiter = c->userlist.find(u);
 	if (victimiter == c->userlist.end())
 	{
-		user->WriteNumeric(ERR_USERNOTINCHANNEL, "%s %s :They are not on that channel", u->nick.c_str(), c->name.c_str());
+		user->WriteNumeric(ERR_USERNOTINCHANNEL, u->nick, c->name, "They are not on that channel");
 		return CMD_FAILURE;
 	}
 	Membership* const memb = victimiter->second;
@@ -104,14 +117,14 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
 			for (std::string::size_type i = 0; i < memb->modes.length(); i++)
 			{
 				ModeHandler* mh = ServerInstance->Modes->FindMode(memb->modes[i], MODETYPE_CHANNEL);
-				if (mh && mh->GetLevelRequired() > req)
-					req = mh->GetLevelRequired();
+				if (mh && mh->GetLevelRequired(true) > req)
+					req = mh->GetLevelRequired(true);
 			}
 
 			if (them < req)
 			{
-				user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You must be a channel %soperator",
-					this->name.c_str(), req > HALFOP_VALUE ? "" : "half-");
+				user->WriteNumeric(ERR_CHANOPRIVSNEEDED, c->name, InspIRCd::Format("You must be a channel %soperator",
+					req > HALFOP_VALUE ? "" : "half-"));
 				return CMD_FAILURE;
 			}
 		}
@@ -122,7 +135,7 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
 	return CMD_SUCCESS;
 }
 
-RouteDescriptor CommandKick::GetRouting(User* user, const std::vector<std::string>& parameters)
+RouteDescriptor CommandKick::GetRouting(User* user, const Params& parameters)
 {
 	return (IS_LOCAL(user) ? ROUTE_LOCALONLY : ROUTE_BROADCAST);
 }