Various text improvements: consistency, syntax, help and doc updates/fixes.

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

diff --git a/src/coremods/core_user/cmd_away.cpp b/src/coremods/core_user/cmd_away.cpp
index 1b7bacebaa3d31eae28767f16941a903688f844e..834e8711d448cfe10a2a5ac8a90ab62431fd077f 100644 (file)
--- a/src/coremods/core_user/cmd_away.cpp
+++ b/src/coremods/core_user/cmd_away.cpp
@@ -21,39 +21,56 @@
 #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)
 {
-       syntax = "[<message>]";
+       allow_empty_last_param = false;
+       syntax = "[:<message>]";
 }
 
 /** Handle /AWAY
  */
 CmdResult CommandAway::Handle(User* user, const Params& parameters)
 {
+       LocalUser* luser = IS_LOCAL(user);
        ModResult MOD_RESULT;
 
-       if ((!parameters.empty()) && (!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;