More numerics.h conversion

[user/henk/code/inspircd.git] / src / commands / cmd_away.cpp

diff --git a/src/commands/cmd_away.cpp b/src/commands/cmd_away.cpp
index 2ca2df7dbb57e24350ec89307b5df6ce50b6c012..96da5cda5874c415852cfed466c5fc02ce3fd065 100644 (file)
--- a/src/commands/cmd_away.cpp
+++ b/src/commands/cmd_away.cpp
@@ -21,19 +21,32 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /AWAY
  */
-CmdResult CommandAway::Handle (const char* const* parameters, int pcnt, User *user)
+CmdResult CommandAway::Handle (const std::vector<std::string>& parameters, User *user)
 {
-       if ((pcnt) && (*parameters[0]))
+       int MOD_RESULT = 0;
+
+       if ((parameters.size()) && (!parameters[0].empty()))
        {
-               strlcpy(user->awaymsg,parameters[0],MAXAWAY);
-               user->WriteNumeric(306, "%s :You have been marked as being away",user->nick);
-               FOREACH_MOD(I_OnSetAway,OnSetAway(user));
+               FOREACH_RESULT(I_OnSetAway, OnSetAway(user, parameters[0]));
+
+               if (MOD_RESULT != 0 && !IS_LOCAL(user))
+                       return CMD_FAILURE;
+
+               user->awaytime = ServerInstance->Time();
+               user->awaymsg.assign(parameters[0], 0, ServerInstance->Config->Limits.MaxAway);
+
+               user->WriteNumeric(RPL_NOWAWAY, "%s :You have been marked as being away",user->nick.c_str());
        }
        else
        {
-               *user->awaymsg = 0;
-               user->WriteNumeric(305, "%s :You are no longer marked as being away",user->nick);
-               FOREACH_MOD(I_OnCancelAway,OnCancelAway(user));
+               FOREACH_RESULT(I_OnSetAway, OnSetAway(user, ""));
+
+               if (MOD_RESULT != 0 && !IS_LOCAL(user))
+                       return CMD_FAILURE;
+
+               user->awaymsg.clear();
+               user->WriteNumeric(RPL_UNAWAY, "%s :You are no longer marked as being away",user->nick.c_str());
        }
+
        return CMD_SUCCESS;
 }