Merge branch 'master+writenumeric'

[user/henk/code/inspircd.git] / src / modules / m_setidle.cpp

diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index e3733957d12dc51288045a7cf7887627a54c6dce..4a15fd0d5a050fff9c33f6694ae94d7909aba858 100644 (file)
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -21,33 +21,30 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Allows opers to set their idle time */
-
 /** Handle /SETIDLE
  */
-class CommandSetidle : public Command
+class CommandSetidle : public SplitCommand
 {
  public:
-       CommandSetidle(Module* Creator) : Command(Creator,"SETIDLE", 1)
+       CommandSetidle(Module* Creator) : SplitCommand(Creator,"SETIDLE", 1)
        {
                flags_needed = 'o'; syntax = "<duration>";
-               TRANSLATE2(TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+       CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user)
        {
-               time_t idle = ServerInstance->Duration(parameters[0]);
+               int idle = InspIRCd::Duration(parameters[0]);
                if (idle < 1)
                {
-                       user->WriteNumeric(948, "%s :Invalid idle time.",user->nick.c_str());
+                       user->WriteNumeric(948, "Invalid idle time.");
                        return CMD_FAILURE;
                }
                user->idle_lastmsg = (ServerInstance->Time() - idle);
                // minor tweak - we cant have signon time shorter than our idle time!
                if (user->signon > user->idle_lastmsg)
                        user->signon = user->idle_lastmsg;
-               ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" used SETIDLE to set their idle time to "+ConvToStr(idle)+" seconds");
-               user->WriteNumeric(944, "%s :Idle time set.",user->nick.c_str());
+               ServerInstance->SNO->WriteToSnoMask('a', user->nick+" used SETIDLE to set their idle time to "+ConvToStr(idle)+" seconds");
+               user->WriteNumeric(944, "Idle time set.");
 
                return CMD_SUCCESS;
        }
@@ -60,15 +57,10 @@ class ModuleSetIdle : public Module
  public:
        ModuleSetIdle()
                : cmd(this)
-       {
-               ServerInstance->AddCommand(&cmd);
-       }
-
-       virtual ~ModuleSetIdle()
        {
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Allows opers to set their idle time", VF_VENDOR);
        }