X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcoremods%2Fcore_channel%2Fcmd_kick.cpp;h=7f8a8a3291d28d0c445db47e8d34df945917c7b6;hb=b9e11915a976daaf790ebc763aff56e19fd49e0f;hp=dfa9bf21740042d172a4ff31afe8bd58ed45d646;hpb=252f2b4f2b1027da7cf41d06e779305767048f14;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 dfa9bf217..7f8a8a329 100644
--- a/src/coremods/core_channel/cmd_kick.cpp
+++ b/src/coremods/core_channel/cmd_kick.cpp
@@ -44,7 +44,7 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
 
 	if ((!u) || (!c) || (u->registered != REG_ALL))
 	{
-		user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", c ? parameters[1].c_str() : parameters[0].c_str());
+		user->WriteNumeric(Numerics::NoSuchNick(c ? parameters[1] : parameters[0]));
 		return CMD_FAILURE;
 	}
 
@@ -54,25 +54,36 @@ 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;
 
+	// KICKs coming from servers can carry a membership id
+	if ((!IS_LOCAL(user)) && (parameters.size() > 3))
+	{
+		// If the current membership id is not equal to the one in the message then the user rejoined
+		if (memb->id != Membership::IdFromString(parameters[2]))
+		{
+			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Dropped KICK due to membership id mismatch: " + ConvToStr(memb->id) + " != " + parameters[2]);
+			return CMD_FAILURE;
+		}
+	}
+
 	const bool has_reason = (parameters.size() > 2);
 	const std::string reason((has_reason ? parameters.back() : user->nick), 0, ServerInstance->Config->Limits.MaxKick);
 
@@ -99,8 +110,8 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
 
 			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;
 			}
 		}