X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcoremods%2Fcore_user%2Fcmd_away.cpp;h=50a586392b4a2d4a4e58ac73c02fa5b4eab0e901;hb=ba23c2b115ad3bf2632179d283165c1579332fd8;hp=fb720a5a7d61da7fcdf97a568e32da6fd6b1b1d2;hpb=a3e0768758ca68429a29d9c78ce672f2d938c6e7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_user/cmd_away.cpp b/src/coremods/core_user/cmd_away.cpp
index fb720a5a7..50a586392 100644
--- a/src/coremods/core_user/cmd_away.cpp
+++ b/src/coremods/core_user/cmd_away.cpp
@@ -21,45 +21,62 @@
 #include "inspircd.h"
 #include "core_user.h"
 
+enum
+{
+	// From RFC 1459.
+	RPL_UNAWAY = 305,
+	RPL_NOWAWAY = 306
+};
+
 CommandAway::CommandAway(Module* parent)
-	: Command(parent, "AWAY", 0, 0)
+	: Command(parent, "AWAY", 0, 1)
+	, awayevprov(parent)
 {
+	allow_empty_last_param = false;
 	syntax = "[<message>]";
 }
 
 /** Handle /AWAY
  */
-CmdResult CommandAway::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandAway::Handle(User* user, const Params& parameters)
 {
+	LocalUser* luser = IS_LOCAL(user);
 	ModResult MOD_RESULT;
 
-	if ((parameters.size()) && (!parameters[0].empty()))
+	if (!parameters.empty())
 	{
-		FIRST_MOD_RESULT(OnSetAway, MOD_RESULT, (user, parameters[0]));
-
-		if (MOD_RESULT == MOD_RES_DENY && IS_LOCAL(user))
-			return CMD_FAILURE;
+		std::string message(parameters[0]);
+		if (luser)
+		{
+			FIRST_MOD_RESULT_CUSTOM(awayevprov, Away::EventListener, OnUserPreAway, MOD_RESULT, (luser, message));
+			if (MOD_RESULT == MOD_RES_DENY)
+				return CMD_FAILURE;
+		}
 
 		user->awaytime = ServerInstance->Time();
-		user->awaymsg.assign(parameters[0], 0, ServerInstance->Config->Limits.MaxAway);
-
+		user->awaymsg.assign(message, 0, ServerInstance->Config->Limits.MaxAway);
 		user->WriteNumeric(RPL_NOWAWAY, "You have been marked as being away");
+		FOREACH_MOD_CUSTOM(awayevprov, Away::EventListener, OnUserAway, (user));
 	}
 	else
 	{
-		FIRST_MOD_RESULT(OnSetAway, MOD_RESULT, (user, ""));
-
-		if (MOD_RESULT == MOD_RES_DENY && IS_LOCAL(user))
-			return CMD_FAILURE;
+		if (luser)
+		{
+			FIRST_MOD_RESULT_CUSTOM(awayevprov, Away::EventListener, OnUserPreBack, MOD_RESULT, (luser));
+			if (MOD_RESULT == MOD_RES_DENY)
+				return CMD_FAILURE;
+		}
 
+		user->awaytime = 0;
 		user->awaymsg.clear();
 		user->WriteNumeric(RPL_UNAWAY, "You are no longer marked as being away");
+		FOREACH_MOD_CUSTOM(awayevprov, Away::EventListener, OnUserBack, (user));
 	}
 
 	return CMD_SUCCESS;
 }
 
-RouteDescriptor CommandAway::GetRouting(User* user, const std::vector<std::string>& parameters)
+RouteDescriptor CommandAway::GetRouting(User* user, const Params& parameters)
 {
 	return (IS_LOCAL(user) ? ROUTE_LOCALONLY : ROUTE_BROADCAST);
 }