X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_invite.cpp;h=2ed05c550033c8344cd430c4ad408a7df8f2ebee;hb=03a623a284b6c9f2f11f549c55333c45c4d91eab;hp=8025296ae8723c33e30edc850191c7b90c4bc2f3;hpb=5961493368ec3c83b688afe6229d4efb1bb4d57a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_invite.cpp b/src/commands/cmd_invite.cpp
index 8025296ae..2ed05c550 100644
--- a/src/commands/cmd_invite.cpp
+++ b/src/commands/cmd_invite.cpp
@@ -40,6 +40,10 @@ class CommandInvite : public Command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
 	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return (IS_LOCAL(user) ? ROUTE_LOCALONLY : ROUTE_BROADCAST);
+	}
 };
 
 /** Handle /INVITE
@@ -61,7 +65,7 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
 		if (parameters.size() == 3)
 		{
 			if (IS_LOCAL(user))
-				timeout = ServerInstance->Time() + ServerInstance->Duration(parameters[2]);
+				timeout = ServerInstance->Time() + InspIRCd::Duration(parameters[1]);
 			else
 				timeout = ConvToInt(parameters[2]);
 		}
@@ -72,16 +76,16 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
 			return CMD_FAILURE;
 		}
 
-		if (c->HasUser(u))
-	 	{
-	 		user->WriteNumeric(ERR_USERONCHANNEL, "%s %s %s :is already on channel",user->nick.c_str(),u->nick.c_str(),c->name.c_str());
-	 		return CMD_FAILURE;
-		}
-
 		if ((IS_LOCAL(user)) && (!c->HasUser(user)))
-	 	{
+		{
 			user->WriteNumeric(ERR_NOTONCHANNEL, "%s %s :You're not on that channel!",user->nick.c_str(), c->name.c_str());
-	  		return CMD_FAILURE;
+			return CMD_FAILURE;
+		}
+
+		if (c->HasUser(u))
+		{
+			user->WriteNumeric(ERR_USERONCHANNEL, "%s %s %s :is already on channel",user->nick.c_str(),u->nick.c_str(),c->name.c_str());
+			return CMD_FAILURE;
 		}
 
 		FIRST_MOD_RESULT(OnUserPreInvite, MOD_RESULT, (user,u,c,timeout));
@@ -94,39 +98,52 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
 		{
 			if (IS_LOCAL(user))
 			{
-				int rank = c->GetPrefixValue(user);
+				unsigned int rank = c->GetPrefixValue(user);
 				if (rank < HALFOP_VALUE)
 				{
+					// Check whether halfop mode is available and phrase error message accordingly
+					ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL);
 					user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator",
-						user->nick.c_str(), c->name.c_str(), rank >= HALFOP_VALUE ? "" : "half-");
+						user->nick.c_str(), c->name.c_str(), (mh && mh->name == "halfop" ? "half-" : ""));
 					return CMD_FAILURE;
 				}
 			}
 		}
 
 		if (IS_LOCAL(u))
-			IS_LOCAL(u)->InviteTo(c->name.c_str(), timeout);
-		u->WriteFrom(user,"INVITE %s :%s",u->nick.c_str(),c->name.c_str());
-		user->WriteNumeric(RPL_INVITING, "%s %s %s",user->nick.c_str(),u->nick.c_str(),c->name.c_str());
-		switch (ServerInstance->Config->AnnounceInvites)
 		{
-			case ServerConfig::INVITE_ANNOUNCE_ALL:
-				c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s invited %s into the channel", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
-			break;
-			case ServerConfig::INVITE_ANNOUNCE_OPS:
-				c->WriteAllExceptSender(user, true, '@', "NOTICE %s :*** %s invited %s into the channel", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
-			break;
-			case ServerConfig::INVITE_ANNOUNCE_DYNAMIC:
-				if (c->IsModeSet('i'))
-					c->WriteAllExceptSender(user, true, '@', "NOTICE %s :*** %s invited %s into the channel", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
-				else
-					c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s invited %s into the channel", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
-			break;
-			default:
-				/* Nobody */
-			break;
+			Invitation::Create(c, IS_LOCAL(u), timeout);
+			u->WriteFrom(user,"INVITE %s :%s",u->nick.c_str(),c->name.c_str());
+		}
+
+		if (IS_LOCAL(user))
+			user->WriteNumeric(RPL_INVITING, "%s %s %s",user->nick.c_str(),u->nick.c_str(),c->name.c_str());
+
+		if (ServerInstance->Config->AnnounceInvites != ServerConfig::INVITE_ANNOUNCE_NONE)
+		{
+			char prefix;
+			switch (ServerInstance->Config->AnnounceInvites)
+			{
+				case ServerConfig::INVITE_ANNOUNCE_OPS:
+				{
+					prefix = '@';
+					break;
+				}
+				case ServerConfig::INVITE_ANNOUNCE_DYNAMIC:
+				{
+					ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL);
+					prefix = (mh && mh->name == "halfop" ? mh->GetPrefix() : '@');
+					break;
+				}
+				default:
+				{
+					prefix = 0;
+					break;
+				}
+			}
+			c->WriteAllExceptSender(user, true, prefix, "NOTICE %s :*** %s invited %s into the channel", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
 		}
-		FOREACH_MOD(I_OnUserInvite,OnUserInvite(user,u,c,timeout));
+		FOREACH_MOD(OnUserInvite, (user,u,c,timeout));
 	}
 	else if (IS_LOCAL(user))
 	{