X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Faway.cpp;h=62300580f2ba7584b57d633f5ad02c65f27d5b6e;hb=9cf381330eab69d7e5bf26684d1ec8075aee60a2;hp=9c4ec5783240a101319302e28b3d1766dbe10f2b;hpb=7e7e773d4d43e68c18c19e2ec712f4250e5f756d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/away.cpp b/src/modules/m_spanningtree/away.cpp
index 9c4ec5783..62300580f 100644
--- a/src/modules/m_spanningtree/away.cpp
+++ b/src/modules/m_spanningtree/away.cpp
@@ -23,23 +23,23 @@
 #include "utils.h"
 #include "commands.h"
 
-CmdResult CommandAway::HandleRemote(RemoteUser* u, std::vector<std::string>& params)
+CmdResult CommandAway::HandleRemote(::RemoteUser* u, Params& params)
 {
-	if (params.size())
+	if (!params.empty())
 	{
-		FOREACH_MOD(OnSetAway, (u, params[params.size() - 1]));
-
 		if (params.size() > 1)
-			u->awaytime = ConvToInt(params[0]);
+			u->awaytime = ConvToNum<time_t>(params[0]);
 		else
 			u->awaytime = ServerInstance->Time();
 
-		u->awaymsg = params[params.size() - 1];
+		u->awaymsg = params.back();
+		FOREACH_MOD_CUSTOM(awayevprov, Away::EventListener, OnUserAway, (u));
 	}
 	else
 	{
-		FOREACH_MOD(OnSetAway, (u, ""));
+		u->awaytime = 0;
 		u->awaymsg.clear();
+		FOREACH_MOD_CUSTOM(awayevprov, Away::EventListener, OnUserBack, (u));
 	}
 	return CMD_SUCCESS;
 }
@@ -47,12 +47,6 @@ CmdResult CommandAway::HandleRemote(RemoteUser* u, std::vector<std::string>& par
 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);
+	if (!user->awaymsg.empty())
+		push_int(user->awaytime).push_last(user->awaymsg);
 }