Remove spanningtree override of /LUSERS

[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 40aa80392ba159f84eb3a0174f38ee55c280944c..cd7c7e06d870ca9c96b36ce2feae2bfbf1142f33 100644 (file)
--- a/src/modules/m_spanningtree/svsjoin.cpp
+++ b/src/modules/m_spanningtree/svsjoin.cpp
@@ -12,34 +12,36 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "../transport.h"
 #include "socketengine.h"
 
 #include "main.h"
 #include "utils.h"
 #include "treeserver.h"
-#include "treesocket.h"
+#include "commands.h"
 
-/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
-
-bool TreeSocket::ServiceJoin(const std::string &prefix, std::deque<std::string> &params)
+CmdResult CommandSVSJoin::Handle(const std::vector<std::string>& parameters, User *user)
 {
-       if (params.size() < 2)
-               return true;
+       // Check for valid channel name
+       if (!ServerInstance->IsChannel(parameters[1].c_str(), ServerInstance->Config->Limits.ChanMax))
+               return CMD_FAILURE;
 
-       User* u = this->ServerInstance->FindNick(params[0]);
+       // Check target exists
+       User* u = ServerInstance->FindNick(parameters[0]);
+       if (!u)
+               return CMD_FAILURE;
 
-       if (u)
-       {
-               /* only join if it's local, otherwise just pass it on! */
-               if (IS_LOCAL(u))
-                       Channel::JoinUser(this->ServerInstance, u, params[1].c_str(), false, "", false, ServerInstance->Time());
-               Utils->DoOneToAllButSender(prefix,"SVSJOIN",params,prefix);
-       }
-       return true;
+       /* 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());
+       return CMD_SUCCESS;
 }
 
+RouteDescriptor CommandSVSJoin::GetRouting(User* user, const std::vector<std::string>& parameters)
+{
+       User* u = ServerInstance->FindNick(parameters[0]);
+       if (u)
+               return ROUTE_OPT_UCAST(u->server);
+       return ROUTE_LOCALONLY;
+}