Merge branch 'insp20' into master.

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

diff --git a/src/modules/m_spanningtree/num.cpp b/src/modules/m_spanningtree/num.cpp
index 047dba4322b9826528f3e5c02190ea8e18875a3c..f83f91286e0648d70a04ef8083d57d5b83589492 100644 (file)
--- a/src/modules/m_spanningtree/num.cpp
+++ b/src/modules/m_spanningtree/num.cpp
@@ -21,8 +21,9 @@
 
 #include "utils.h"
 #include "commands.h"
+#include "remoteuser.h"
 
-CmdResult CommandNum::HandleServer(TreeServer* server, std::vector<std::string>& params)
+CmdResult CommandNum::HandleServer(TreeServer* server, CommandBase::Params& params)
 {
        User* const target = ServerInstance->FindUUID(params[1]);
        if (!target)
@@ -41,7 +42,21 @@ CmdResult CommandNum::HandleServer(TreeServer* server, std::vector<std::string>&
        return CMD_SUCCESS;
 }
 
-RouteDescriptor CommandNum::GetRouting(User* user, const std::vector<std::string>& params)
+RouteDescriptor CommandNum::GetRouting(User* user, const Params& params)
 {
        return ROUTE_UNICAST(params[1]);
 }
+
+CommandNum::Builder::Builder(SpanningTree::RemoteUser* target, const Numeric::Numeric& numeric)
+       : CmdBuilder("NUM")
+{
+       TreeServer* const server = (numeric.GetServer() ? (static_cast<TreeServer*>(numeric.GetServer())) : Utils->TreeRoot);
+       push(server->GetID()).push(target->uuid).push(InspIRCd::Format("%03u", numeric.GetNumeric()));
+       const CommandBase::Params& params = numeric.GetParams();
+       if (!params.empty())
+       {
+               for (CommandBase::Params::const_iterator i = params.begin(); i != params.end()-1; ++i)
+                       push(*i);
+               push_last(params.back());
+       }
+}