X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Faway.cpp;h=ba0870dcc4406ccd4ebc274f43f75d7223a48ceb;hb=0a6b1e1a7de92e078a98f0b955d2624e5b85e4c1;hp=7c514c49e69597251d753857331f232a082c59a6;hpb=5267fb9d362aeb326c9e64f7171c957f76776f90;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/away.cpp b/src/modules/m_spanningtree/away.cpp
index 7c514c49e..ba0870dcc 100644
--- a/src/modules/m_spanningtree/away.cpp
+++ b/src/modules/m_spanningtree/away.cpp
@@ -1,6 +1,12 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -23,23 +29,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.back()));
-
 		if (params.size() > 1)
-			u->awaytime = ConvToInt(params[0]);
+			u->awaytime = ConvToNum<time_t>(params[0]);
 		else
 			u->awaytime = ServerInstance->Time();
 
 		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 +53,6 @@ CmdResult CommandAway::HandleRemote(::RemoteUser* u, std::vector<std::string>& p
 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);
 }