Change allocation of InspIRCd::Parser to be physically part of the object containing it

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

diff --git a/src/modules/m_spanningtree/idle.cpp b/src/modules/m_spanningtree/idle.cpp
index bf074bf7fcfc91a5e449ae8dc21b06a8d5a268fb..06af4d0fd66805e74b5d3b48df54e3d6c1682442 100644 (file)
--- a/src/modules/m_spanningtree/idle.cpp
+++ b/src/modules/m_spanningtree/idle.cpp
@@ -19,38 +19,35 @@
 
 #include "inspircd.h"
 #include "utils.h"
-#include "treesocket.h"
+#include "commands.h"
 
-bool TreeSocket::Whois(const std::string &prefix, parameterlist &params)
+CmdResult CommandIdle::HandleRemote(RemoteUser* issuer, std::vector<std::string>& params)
 {
-       if (params.size() < 1)
-               return true;
-
-       /* If this is a request, this user did the /whois
-        * If this is a reply, this user's information is in params[1] and params[2]
+       /**
+        * There are two forms of IDLE: request and reply. Requests have one parameter,
+        * replies have more than one.
+        *
+        * If this is a request, 'issuer' did a /whois and its server wants to learn the
+        * idle time of the user in params[0].
+        *
+        * If this is a reply, params[0] is the user who did the whois and params.back() is
+        * the number of seconds 'issuer' has been idle.
         */
-       User* issuer = ServerInstance->FindUUID(prefix);
-       if ((!issuer) || (IS_SERVER(issuer)))
-               return true;
 
-       /* If this is a request, this is the user whose idle information was requested
-        * If this is a reply, this user did the /whois
-        */
        User* target = ServerInstance->FindUUID(params[0]);
-       if ((!target) || (IS_SERVER(target)))
-               return true;
+       if ((!target) || (IS_SERVER(target) || (target->registered != REG_ALL)))
+               return CMD_FAILURE;
 
        LocalUser* localtarget = IS_LOCAL(target);
        if (!localtarget)
        {
                // Forward to target's server
-               Utils->DoOneToOne(prefix, "IDLE", params, target->server);
-               return true;
+               return CMD_SUCCESS;
        }
 
        if (params.size() >= 2)
        {
-               ServerInstance->Parser->CallHandler("WHOIS", params, issuer);
+               ServerInstance->Parser.CallHandler("WHOIS", params, issuer);
        }
        else
        {
@@ -60,14 +57,14 @@ bool TreeSocket::Whois(const std::string &prefix, parameterlist &params)
                        // Possible case when our clock ticked backwards
                        idle = 0;
                else
-                       idle = ((unsigned int) (localtarget->idle_lastmsg - ServerInstance->Time()));
+                       idle = ((unsigned int) (ServerInstance->Time() - localtarget->idle_lastmsg));
 
-               parameterlist reply;
-               reply.push_back(prefix);
+               CmdBuilder reply(params[0], "IDLE");
+               reply.push_back(issuer->uuid);
                reply.push_back(ConvToStr(target->signon));
                reply.push_back(ConvToStr(idle));
-               Utils->DoOneToOne(params[0], "IDLE", reply, issuer->server);
+               reply.Unicast(issuer);
        }
 
-       return true;
+       return CMD_SUCCESS;
 }