X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sapart.cpp;h=8f0a9e551c0e3becf51e05eca136ecd955c88d92;hb=de69e28a4a1aea89e410b693bbbb67890ecb0bd3;hp=85c1a8606eddd389c343fadeb22c489cfe4f7279;hpb=d4ee4c5aa4312cde76fe50e34ef8ca1685d521f0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 85c1a8606..8f0a9e551 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -20,10 +20,9 @@
 class CommandSapart : public Command
 {
  public:
-	CommandSapart (InspIRCd* Instance) : Command(Instance,"SAPART", "o", 2, 3, false, 0)
+	CommandSapart(Module* Creator) : Command(Creator,"SAPART", 2, 3)
 	{
-		this->source = "m_sapart.so";
-		syntax = "<nick> <channel> [reason]";
+		flags_needed = 'o'; Penalty = 0; syntax = "<nick> <channel> [reason]";
 		TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
 	}
 
@@ -50,8 +49,7 @@ class CommandSapart : public Command
 			 */
 			if (IS_LOCAL(dest))
 			{
-				if (!channel->PartUser(dest, reason))
-					delete channel;
+				channel->PartUser(dest, reason);
 
 				Channel* n = ServerInstance->FindChan(parameters[1]);
 				if (!n)
@@ -83,20 +81,25 @@ class CommandSapart : public Command
 
 		return CMD_FAILURE;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		User* dest = ServerInstance->FindNick(parameters[0]);
+		if (dest)
+			return ROUTE_OPT_UCAST(dest->server);
+		return ROUTE_LOCALONLY;
+	}
 };
 
 
 class ModuleSapart : public Module
 {
-	CommandSapart*	mycommand;
+	CommandSapart cmd;
  public:
-	ModuleSapart(InspIRCd* Me)
-		: Module(Me)
+	ModuleSapart()
+		: cmd(this)
 	{
-
-		mycommand = new CommandSapart(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-
+		ServerInstance->AddCommand(&cmd);
 	}
 
 	virtual ~ModuleSapart()
@@ -105,7 +108,7 @@ class ModuleSapart : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style SAPART command", VF_OPTCOMMON | VF_VENDOR);
 	}
 
 };