m_spanningtree: Ensure tags are sent in forwarded cmds

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

diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp
index b3a612ca350f9b53108ac9c213812ace9070066b..a734dc8ed8e84bb1945b7e5b7ca54bc40c02b6fb 100644 (file)
--- a/src/modules/m_spanningtree/svsnick.cpp
+++ b/src/modules/m_spanningtree/svsnick.cpp
@@ -23,7 +23,7 @@
 #include "main.h"
 #include "commands.h"
 
-CmdResult CommandSVSNick::Handle(User* user, std::vector<std::string>& parameters)
+CmdResult CommandSVSNick::Handle(User* user, Params& parameters)
 {
        User* u = ServerInstance->FindNick(parameters[0]);
 
@@ -47,7 +47,7 @@ CmdResult CommandSVSNick::Handle(User* user, std::vector<std::string>& parameter
                // won't happen because the timestamps won't match.
                if (parameters.size() > 3)
                {
-                       time_t ExpectedTS = ConvToInt(parameters[3]);
+                       time_t ExpectedTS = ConvToNum<time_t>(parameters[3]);
                        if (u->age != ExpectedTS)
                                return CMD_FAILURE; // Ignore SVSNICK
                }
@@ -56,7 +56,7 @@ CmdResult CommandSVSNick::Handle(User* user, std::vector<std::string>& parameter
                if (isdigit(nick[0]))
                        nick = u->uuid;
 
-               time_t NickTS = ConvToInt(parameters[2]);
+               time_t NickTS = ConvToNum<time_t>(parameters[2]);
                if (NickTS <= 0)
                        return CMD_FAILURE;
 
@@ -70,10 +70,7 @@ CmdResult CommandSVSNick::Handle(User* user, std::vector<std::string>& parameter
        return CMD_SUCCESS;
 }
 
-RouteDescriptor CommandSVSNick::GetRouting(User* user, const std::vector<std::string>& parameters)
+RouteDescriptor CommandSVSNick::GetRouting(User* user, const Params& parameters)
 {
-       User* u = ServerInstance->FindNick(parameters[0]);
-       if (u)
-               return ROUTE_OPT_UCAST(u->server);
-       return ROUTE_LOCALONLY;
+       return ROUTE_OPT_UCAST(parameters[0]);
 }