Fix some regressions in sending tags between servers.

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

diff --git a/src/modules/m_spanningtree/away.cpp b/src/modules/m_spanningtree/away.cpp
index ed97c48cdfe7c9e49b055cd8c943fa9d79d0935b..62300580f2ba7584b57d633f5ad02c65f27d5b6e 100644 (file)
--- a/src/modules/m_spanningtree/away.cpp
+++ b/src/modules/m_spanningtree/away.cpp
@@ -21,32 +21,32 @@
 
 #include "main.h"
 #include "utils.h"
-#include "treeserver.h"
-#include "treesocket.h"
+#include "commands.h"
 
-bool TreeSocket::Away(const std::string &prefix, parameterlist &params)
+CmdResult CommandAway::HandleRemote(::RemoteUser* u, Params& params)
 {
-       User* u = ServerInstance->FindNick(prefix);
-       if ((!u) || (IS_SERVER(u)))
-               return true;
-       if (params.size())
+       if (!params.empty())
        {
-               FOREACH_MOD(I_OnSetAway, OnSetAway(u, params[params.size() - 1]));
-
                if (params.size() > 1)
-                       u->awaytime = atoi(params[0].c_str());
+                       u->awaytime = ConvToNum<time_t>(params[0]);
                else
                        u->awaytime = ServerInstance->Time();
 
-               u->awaymsg = params[params.size() - 1];
-
-               params[params.size() - 1] = ":" + params[params.size() - 1];
+               u->awaymsg = params.back();
+               FOREACH_MOD_CUSTOM(awayevprov, Away::EventListener, OnUserAway, (u));
        }
        else
        {
-               FOREACH_MOD(I_OnSetAway, OnSetAway(u, ""));
+               u->awaytime = 0;
                u->awaymsg.clear();
+               FOREACH_MOD_CUSTOM(awayevprov, Away::EventListener, OnUserBack, (u));
        }
-       Utils->DoOneToAllButSender(prefix,"AWAY",params,u->server);
-       return true;
+       return CMD_SUCCESS;
+}
+
+CommandAway::Builder::Builder(User* user)
+       : CmdBuilder(user, "AWAY")
+{
+       if (!user->awaymsg.empty())
+               push_int(user->awaytime).push_last(user->awaymsg);
 }