Merge insp20

[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 f2cabadd536d2dab52baa2203b0ae892e818d51b..f14c8ac987937f735f488c4d12052f4d38cbd8ce 100644 (file)
--- a/src/modules/m_spanningtree/away.cpp
+++ b/src/modules/m_spanningtree/away.cpp
@@ -21,31 +21,38 @@
 
 #include "main.h"
 #include "utils.h"
-#include "treesocket.h"
+#include "commands.h"
 
-bool TreeSocket::Away(const std::string &prefix, parameterlist &params)
+CmdResult CommandAway::HandleRemote(RemoteUser* u, std::vector<std::string>& params)
 {
-       User* u = ServerInstance->FindNick(prefix);
-       if ((!u) || (IS_SERVER(u)))
-               return true;
        if (params.size())
        {
-               FOREACH_MOD(I_OnSetAway, OnSetAway(u, params[params.size() - 1]));
+               FOREACH_MOD(OnSetAway, (u, params.back()));
 
                if (params.size() > 1)
                        u->awaytime = ConvToInt(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();
        }
        else
        {
-               FOREACH_MOD(I_OnSetAway, OnSetAway(u, ""));
+               FOREACH_MOD(OnSetAway, (u, ""));
                u->awaymsg.clear();
        }
-       Utils->DoOneToAllButSender(prefix,"AWAY",params,u->server);
-       return true;
+       return CMD_SUCCESS;
+}
+
+CommandAway::Builder::Builder(User* user)
+       : CmdBuilder(user, "AWAY")
+{
+       push_int(user->awaytime).push_last(user->awaymsg);
+}
+
+CommandAway::Builder::Builder(User* user, const std::string& msg)
+       : CmdBuilder(user, "AWAY")
+{
+       if (!msg.empty())
+               push_int(ServerInstance->Time()).push_last(msg);
 }