X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_channel%2Fcmd_invite.cpp;h=c26318337597d389f9491697904ceb7d800a4b31;hb=dba2cddc463082ca028617df93e6726253e0866f;hp=c1f1b00c7bd4be6067bcb2692d148454e186a648;hpb=0b63ccd0b5cb26883d6becb196fb98e4f95d0397;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_channel/cmd_invite.cpp b/src/coremods/core_channel/cmd_invite.cpp
index c1f1b00c7..c26318337 100644
--- a/src/coremods/core_channel/cmd_invite.cpp
+++ b/src/coremods/core_channel/cmd_invite.cpp
@@ -34,7 +34,7 @@ CommandInvite::CommandInvite(Module* parent, Invite::APIImpl& invapiimpl)
 
 /** Handle /INVITE
  */
-CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandInvite::Handle(User* user, const Params& parameters)
 {
 	ModResult MOD_RESULT;
 
@@ -51,14 +51,27 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
 		if (parameters.size() >= 3)
 		{
 			if (IS_LOCAL(user))
-				timeout = ServerInstance->Time() + InspIRCd::Duration(parameters[2]);
+			{
+				unsigned long duration;
+				if (!InspIRCd::Duration(parameters[2], duration))
+				{
+					user->WriteNotice("*** Invalid duration for invite");
+					return CMD_FAILURE;
+				}
+				timeout = ServerInstance->Time() + duration;
+			}
 			else if (parameters.size() > 3)
-				timeout = ConvToInt(parameters[3]);
+				timeout = ConvToNum<time_t>(parameters[3]);
 		}
 
-		if ((!c) || (!u) || (u->registered != REG_ALL))
+		if (!c)
 		{
-			user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", c ? parameters[0].c_str() : parameters[1].c_str());
+			user->WriteNumeric(Numerics::NoSuchChannel(parameters[1]));
+			return CMD_FAILURE;
+		}
+		if ((!u) || (u->registered != REG_ALL))
+		{
+			user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
 			return CMD_FAILURE;
 		}
 
@@ -70,20 +83,20 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
 				return CMD_INVALID;
 
 			// Drop the invite if our channel TS is lower
-			time_t RemoteTS = ConvToInt(parameters[2]);
+			time_t RemoteTS = ConvToNum<time_t>(parameters[2]);
 			if (c->age < RemoteTS)
 				return CMD_FAILURE;
 		}
 
 		if ((IS_LOCAL(user)) && (!c->HasUser(user)))
 		{
-			user->WriteNumeric(ERR_NOTONCHANNEL, "%s :You're not on that channel!", c->name.c_str());
+			user->WriteNumeric(ERR_NOTONCHANNEL, c->name, "You're not on that channel!");
 			return CMD_FAILURE;
 		}
 
 		if (c->HasUser(u))
 		{
-			user->WriteNumeric(ERR_USERONCHANNEL, "%s %s :is already on channel", u->nick.c_str(), c->name.c_str());
+			user->WriteNumeric(ERR_USERONCHANNEL, u->nick, c->name, "is already on channel");
 			return CMD_FAILURE;
 		}
 
@@ -102,37 +115,39 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
 				{
 					// Check whether halfop mode is available and phrase error message accordingly
 					ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL);
-					user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You must be a channel %soperator",
-						c->name.c_str(), (mh && mh->name == "halfop" ? "half-" : ""));
+					user->WriteNumeric(ERR_CHANOPRIVSNEEDED, c->name, InspIRCd::Format("You must be a channel %soperator",
+						(mh && mh->name == "halfop" ? "half-" : "")));
 					return CMD_FAILURE;
 				}
 			}
 		}
 
-		if (IS_LOCAL(u))
+		LocalUser* const localtargetuser = IS_LOCAL(u);
+		if (localtargetuser)
 		{
-			invapi.Create(IS_LOCAL(u), c, timeout);
-			u->WriteFrom(user,"INVITE %s :%s",u->nick.c_str(),c->name.c_str());
+			invapi.Create(localtargetuser, c, timeout);
+			ClientProtocol::Messages::Invite invitemsg(user, localtargetuser, c);
+			localtargetuser->Send(ServerInstance->GetRFCEvents().invite, invitemsg);
 		}
 
 		if (IS_LOCAL(user))
 		{
-			user->WriteNumeric(RPL_INVITING, "%s %s", u->nick.c_str(),c->name.c_str());
+			user->WriteNumeric(RPL_INVITING, u->nick, c->name);
 			if (u->IsAway())
-				user->WriteNumeric(RPL_AWAY, "%s :%s", u->nick.c_str(), u->awaymsg.c_str());
+				user->WriteNumeric(RPL_AWAY, u->nick, u->awaymsg);
 		}
 
 		char prefix = 0;
 		unsigned int minrank = 0;
-		switch (ServerInstance->Config->AnnounceInvites)
+		switch (announceinvites)
 		{
-			case ServerConfig::INVITE_ANNOUNCE_OPS:
+			case Invite::ANNOUNCE_OPS:
 			{
 				prefix = '@';
 				minrank = OP_VALUE;
 				break;
 			}
-			case ServerConfig::INVITE_ANNOUNCE_DYNAMIC:
+			case Invite::ANNOUNCE_DYNAMIC:
 			{
 				PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h');
 				if ((mh) && (mh->name == "halfop"))
@@ -150,8 +165,12 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
 		CUList excepts;
 		FOREACH_MOD(OnUserInvite, (user, u, c, timeout, minrank, excepts));
 
-		if (ServerInstance->Config->AnnounceInvites != ServerConfig::INVITE_ANNOUNCE_NONE)
-			c->WriteAllExcept(user, true, prefix, excepts, "NOTICE %s :*** %s invited %s into the channel", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
+		if (announceinvites != Invite::ANNOUNCE_NONE)
+		{
+			excepts.insert(user);
+			ClientProtocol::Messages::Privmsg privmsg(ServerInstance->FakeClient, c, InspIRCd::Format("*** %s invited %s into the channel", user->nick.c_str(), u->nick.c_str()), MSG_NOTICE);
+			c->Write(ServerInstance->GetRFCEvents().privmsg, privmsg, prefix, excepts);
+		}
 	}
 	else if (IS_LOCAL(user))
 	{
@@ -161,14 +180,14 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
 		if (list)
 		{
 			for (Invite::List::const_iterator i = list->begin(); i != list->end(); ++i)
-				user->WriteNumeric(RPL_INVITELIST, ":%s", (*i)->chan->name.c_str());
+				user->WriteNumeric(RPL_INVITELIST, (*i)->chan->name);
 		}
-		user->WriteNumeric(RPL_ENDOFINVITELIST, ":End of INVITE list");
+		user->WriteNumeric(RPL_ENDOFINVITELIST, "End of INVITE list");
 	}
 	return CMD_SUCCESS;
 }
 
-RouteDescriptor CommandInvite::GetRouting(User* user, const std::vector<std::string>& parameters)
+RouteDescriptor CommandInvite::GetRouting(User* user, const Params& parameters)
 {
 	return (IS_LOCAL(user) ? ROUTE_LOCALONLY : ROUTE_BROADCAST);
 }