m_spanningtree Throw an exception on protocol violations instead of returning CMD_INVALID

[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 ae60633bf50b351c12420f35dd27d98739f9ef2a..9c4ec5783240a101319302e28b3d1766dbe10f2b 100644 (file)
--- a/src/modules/m_spanningtree/away.cpp
+++ b/src/modules/m_spanningtree/away.cpp
@@ -21,13 +21,10 @@
 
 #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(OnSetAway, (u, params[params.size() - 1]));
@@ -38,14 +35,24 @@ bool TreeSocket::Away(const std::string &prefix, parameterlist &params)
                        u->awaytime = ServerInstance->Time();
 
                u->awaymsg = params[params.size() - 1];
-
-               params[params.size() - 1] = ":" + params[params.size() - 1];
        }
        else
        {
                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);
 }