X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_uninvite.cpp;h=3ee23c95a7fa17a0194b8209a50bf654c6eb1de5;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=6c392fe491e8ac7ad62bf3c06985bd3f27e64887;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 6c392fe49..3ee23c95a 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -20,8 +20,6 @@
  */
 
 
-/* $ModDesc: Provides the UNINVITE command which lets users un-invite other users from channels (!) */
-
 #include "inspircd.h"
 
 /** Handle /UNINVITE
@@ -32,7 +30,7 @@ class CommandUninvite : public Command
 	CommandUninvite(Module* Creator) : Command(Creator,"UNINVITE", 2)
 	{
 		syntax = "<nick> <channel>";
-		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
+		TRANSLATE2(TR_NICK, TR_TEXT);
 	}
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
@@ -40,7 +38,7 @@ class CommandUninvite : public Command
 		User* u = ServerInstance->FindNick(parameters[0]);
 		Channel* c = ServerInstance->FindChan(parameters[1]);
 
-		if ((!c) || (!u))
+		if ((!c) || (!u) || (u->registered != REG_ALL))
 		{
 			if (!c)
 			{
@@ -63,22 +61,25 @@ class CommandUninvite : public Command
 			}
 		}
 
-		irc::string xname(c->name.c_str());
-
-		if (IS_LOCAL(u))
+		/* Servers remember invites only for their local users, so act
+		 * only if the target is local. Otherwise the command will be
+		 * passed to the target users server.
+		 */
+		LocalUser* lu = IS_LOCAL(u);
+		if (lu)
 		{
-			// TODO send messages & such out to remote servers
-			LocalUser* lu = IS_LOCAL(u);
-			if (!lu->IsInvited(xname))
+			if (!lu->RemoveInvite(c))
 			{
-				user->WriteNumeric(505, "%s %s %s :Is not invited to channel %s", user->nick.c_str(), u->nick.c_str(), c->name.c_str(), c->name.c_str());
+				user->SendText(":%s 505 %s %s %s :Is not invited to channel %s", user->server.c_str(), user->nick.c_str(), u->nick.c_str(), c->name.c_str(), c->name.c_str());
 				return CMD_FAILURE;
 			}
-			user->WriteNumeric(494, "%s %s %s :Uninvited", user->nick.c_str(), c->name.c_str(), u->nick.c_str());
-			lu->RemoveInvite(xname);
+
+			user->SendText(":%s 494 %s %s %s :Uninvited", user->server.c_str(), user->nick.c_str(), c->name.c_str(), u->nick.c_str());
 			lu->WriteNumeric(493, "%s :You were uninvited from %s by %s", u->nick.c_str(), c->name.c_str(), user->nick.c_str());
-			c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s uninvited %s.",
-				c->name.c_str(), user->nick.c_str(), u->nick.c_str());
+
+			std::string msg = "*** " + user->nick + " uninvited " + u->nick + ".";
+			c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE " + c->name + " :" + msg);
+			ServerInstance->PI->SendChannelNotice(c, 0, msg);
 		}
 
 		return CMD_SUCCESS;
@@ -99,18 +100,17 @@ class ModuleUninvite : public Module
 
 	ModuleUninvite() : cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
 	}
 
-	virtual ~ModuleUninvite()
+	void init() CXX11_OVERRIDE
 	{
+		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides the UNINVITE command which lets users un-invite other users from channels", VF_VENDOR | VF_OPTCOMMON);
 	}
 };
 
 MODULE_INIT(ModuleUninvite)
-