Merge insp20

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / svspart.cpp

diff --git a/src/modules/m_spanningtree/svspart.cpp b/src/modules/m_spanningtree/svspart.cpp
index 7edc720af4a9e4c53b816f7e3f618deb52398019..f86afa367a9e4695aa29dbe92d08d2d72958ae02 100644 (file)
--- a/src/modules/m_spanningtree/svspart.cpp
+++ b/src/modules/m_spanningtree/svspart.cpp
@@ -19,34 +19,30 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "xline.h"
-#include "socketengine.h"
 
-#include "main.h"
-#include "utils.h"
-#include "treeserver.h"
 #include "commands.h"
 
-CmdResult CommandSVSPart::Handle(const std::vector<std::string>& parameters, User *user)
+CmdResult CommandSVSPart::Handle(User* user, std::vector<std::string>& parameters)
 {
-       std::string reason = "Services forced part";
+       User* u = ServerInstance->FindUUID(parameters[0]);
+       if (!u)
+               return CMD_FAILURE;
 
-       if (parameters.size() == 3)
-               reason = parameters[2];
-
-       User* u = ServerInstance->FindNick(parameters[0]);
        Channel* c = ServerInstance->FindChan(parameters[1]);
+       if (!c)
+               return CMD_FAILURE;
 
-       if (u && IS_LOCAL(u))
+       if (IS_LOCAL(u))
+       {
+               std::string reason = (parameters.size() == 3) ? parameters[2] : "Services forced part";
                c->PartUser(u, reason);
-
+       }
        return CMD_SUCCESS;
 }
 
 RouteDescriptor CommandSVSPart::GetRouting(User* user, const std::vector<std::string>& parameters)
 {
-       User* u = ServerInstance->FindNick(parameters[0]);
+       User* u = ServerInstance->FindUUID(parameters[0]);
        if (u)
                return ROUTE_OPT_UCAST(u->server);
        return ROUTE_LOCALONLY;