Split ProtocolInterface::SendMetaData() into multiple functions

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

diff --git a/src/modules/m_spanningtree/svsjoin.cpp b/src/modules/m_spanningtree/svsjoin.cpp
index d47cb0bd40a103eaa660409f68eec81f246f9ca8..552e08dd37fc53bfec859f353c4fdb413ccfa0a4 100644 (file)
--- a/src/modules/m_spanningtree/svsjoin.cpp
+++ b/src/modules/m_spanningtree/svsjoin.cpp
@@ -19,35 +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 CommandSVSJoin::Handle(const std::vector<std::string>& parameters, User *user)
+CmdResult CommandSVSJoin::Handle(User* user, std::vector<std::string>& parameters)
 {
        // Check for valid channel name
-       if (!ServerInstance->IsChannel(parameters[1].c_str(), ServerInstance->Config->Limits.ChanMax))
+       if (!ServerInstance->IsChannel(parameters[1]))
                return CMD_FAILURE;
 
        // Check target exists
-       User* u = ServerInstance->FindNick(parameters[0]);
+       User* u = ServerInstance->FindUUID(parameters[0]);
        if (!u)
                return CMD_FAILURE;
 
        /* only join if it's local, otherwise just pass it on! */
-       if (IS_LOCAL(u))
-               Channel::JoinUser(u, parameters[1].c_str(), false, "", false, ServerInstance->Time());
+       LocalUser* localuser = IS_LOCAL(u);
+       if (localuser)
+               Channel::JoinUser(localuser, parameters[1]);
        return CMD_SUCCESS;
 }
 
 RouteDescriptor CommandSVSJoin::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;