X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sakick.cpp;h=d6b6e965bde7742470cd0c6d9b9ece44f8d7486e;hb=de69e28a4a1aea89e410b693bbbb67890ecb0bd3;hp=d171abe57cfa037ff6d4f295cf5f65b017959374;hpb=15e6efe1aec69a0d134a8dcfbd6ea8220428b0cb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp
index d171abe57..d6b6e965b 100644
--- a/src/modules/m_sakick.cpp
+++ b/src/modules/m_sakick.cpp
@@ -20,10 +20,9 @@
 class CommandSakick : public Command
 {
  public:
-	CommandSakick (InspIRCd* Instance) : Command(Instance,"SAKICK", "o", 2, 3, false, 0)
+	CommandSakick(Module* Creator) : Command(Creator,"SAKICK", 2, 3)
 	{
-		this->source = "m_sakick.so";
-		syntax = "<channel> <nick> [reason]";
+		flags_needed = 'o'; Penalty = 0; syntax = "<channel> <nick> [reason]";
 		TRANSLATE4(TR_TEXT, TR_NICK, TR_TEXT, TR_END);
 	}
 
@@ -32,7 +31,6 @@ class CommandSakick : public Command
 		User* dest = ServerInstance->FindNick(parameters[1]);
 		Channel* channel = ServerInstance->FindChan(parameters[0]);
 		const char* reason = "";
-		const char* servername = NULL;
 
 		if (dest && channel)
 		{
@@ -57,8 +55,7 @@ class CommandSakick : public Command
 			 */
 			if (IS_LOCAL(dest))
 			{
-				if (!channel->ServerKickUser(dest, reason, servername))
-					delete channel;
+				channel->KickUser(ServerInstance->FakeClient, dest, reason);
 
 				Channel *n = ServerInstance->FindChan(parameters[1]);
 				if (n && n->HasUser(dest))
@@ -84,19 +81,24 @@ class CommandSakick : public Command
 
 		return CMD_FAILURE;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		User* dest = ServerInstance->FindNick(parameters[1]);
+		if (dest)
+			return ROUTE_OPT_UCAST(dest->server);
+		return ROUTE_LOCALONLY;
+	}
 };
 
 class ModuleSakick : public Module
 {
-	CommandSakick*	mycommand;
+	CommandSakick cmd;
  public:
-	ModuleSakick(InspIRCd* Me)
-		: Module(Me)
+	ModuleSakick()
+		: cmd(this)
 	{
-
-		mycommand = new CommandSakick(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-
+		ServerInstance->AddCommand(&cmd);
 	}
 
 	virtual ~ModuleSakick()
@@ -105,7 +107,7 @@ class ModuleSakick : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON|VF_VENDOR, API_VERSION);
+		return Version("Provides a SAKICK command", VF_OPTCOMMON|VF_VENDOR);
 	}
 
 };