X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_uninvite.cpp;h=ff392edc31efb35c9ef6870192a836f390c38b3d;hb=2550d001423d25b50c7bfdc89f6efe81dbb64612;hp=6c392fe491e8ac7ad62bf3c06985bd3f27e64887;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 6c392fe49..ff392edc3 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -37,10 +37,15 @@ class CommandUninvite : public Command
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		User* u = ServerInstance->FindNick(parameters[0]);
+		User* u;
+		if (IS_LOCAL(user))
+			u = ServerInstance->FindNickOnly(parameters[0]);
+		else
+			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 +68,27 @@ 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);
+			irc::string xname(c->name.c_str());
 			if (!lu->IsInvited(xname))
 			{
-				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());
+
+			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->RemoveInvite(xname);
 			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,7 +109,11 @@ class ModuleUninvite : public Module
 
 	ModuleUninvite() : cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(cmd);
 	}
 
 	virtual ~ModuleUninvite()