Silence some GCC warnings.

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

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 92c0b0bd0d36b1a2f01e042d8af254aa734c8d6b..6414b01e79cf2259f3951f070f50fc57269bcac0 100644 (file)
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -35,7 +35,7 @@ class ShunFactory : public XLineFactory
 
        /** Generate a shun
        */
-       XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE
+       XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
        {
                return new Shun(set_time, duration, source, reason, xline_specific_mask);
        }
@@ -53,10 +53,10 @@ class CommandShun : public Command
  public:
        CommandShun(Module* Creator) : Command(Creator, "SHUN", 1, 3)
        {
-               flags_needed = 'o'; this->syntax = "<nick!user@hostmask> [<shun-duration>] :<reason>";
+               flags_needed = 'o'; this->syntax = "<nick!user@host> [<duration> :<reason>]";
        }
 
-       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                /* syntax: SHUN nick!user@host time :reason goes here */
                /* 'time' is a human-readable timestring, like 2d3h2s. */
@@ -69,17 +69,19 @@ class CommandShun : public Command
 
                if (parameters.size() == 1)
                {
-                       if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SHUN", user))
+                       std::string reason;
+
+                       if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SHUN", reason, user))
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x', "%s removed SHUN on %s", user->nick.c_str(), parameters[0].c_str());
+                               ServerInstance->SNO->WriteToSnoMask('x', "%s removed SHUN on %s: %s", user->nick.c_str(), parameters[0].c_str(), reason.c_str());
                        }
-                       else if (ServerInstance->XLines->DelLine(target.c_str(), "SHUN", user))
+                       else if (ServerInstance->XLines->DelLine(target.c_str(), "SHUN", reason, user))
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s removed SHUN on %s", user->nick.c_str(), target.c_str());
+                               ServerInstance->SNO->WriteToSnoMask('x', "%s removed SHUN on %s: %s", user->nick.c_str(), target.c_str(), reason.c_str());
                        }
                        else
                        {
-                               user->WriteNotice("*** Shun " + parameters[0] + " not found in list, try /stats H.");
+                               user->WriteNotice("*** Shun " + parameters[0] + " not found on the list.");
                                return CMD_FAILURE;
                        }
                }
@@ -90,7 +92,11 @@ class CommandShun : public Command
                        std::string expr;
                        if (parameters.size() > 2)
                        {
-                               duration = InspIRCd::Duration(parameters[1]);
+                               if (!InspIRCd::Duration(parameters[1], duration))
+                               {
+                                       user->WriteNotice("*** Invalid duration for SHUN.");
+                                       return CMD_FAILURE;
+                               }
                                expr = parameters[2];
                        }
                        else
@@ -104,28 +110,27 @@ class CommandShun : public Command
                        {
                                if (!duration)
                                {
-                                       ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent SHUN for %s: %s",
+                                       ServerInstance->SNO->WriteToSnoMask('x', "%s added permanent SHUN for %s: %s",
                                                user->nick.c_str(), target.c_str(), expr.c_str());
                                }
                                else
                                {
-                                       time_t c_requires_crap = duration + ServerInstance->Time();
-                                       std::string timestr = InspIRCd::TimeString(c_requires_crap);
-                                       ServerInstance->SNO->WriteToSnoMask('x', "%s added timed SHUN for %s to expire on %s: %s",
-                                               user->nick.c_str(), target.c_str(), timestr.c_str(), expr.c_str());
+                                       ServerInstance->SNO->WriteToSnoMask('x', "%s added timed SHUN for %s, expires in %s (on %s): %s",
+                                               user->nick.c_str(), target.c_str(), InspIRCd::DurationString(duration).c_str(),
+                                               InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), expr.c_str());
                                }
                        }
                        else
                        {
                                delete r;
-                               user->WriteNotice("*** Shun for " + target + " already exists");
+                               user->WriteNotice("*** Shun for " + target + " already exists.");
                                return CMD_FAILURE;
                        }
                }
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) CXX11_OVERRIDE
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                if (IS_LOCAL(user))
                        return ROUTE_LOCALONLY; // spanningtree will send ADDLINE
@@ -198,7 +203,7 @@ class ModuleShun : public Module, public Stats::EventListener
                affectopers = tag->getBool("affectopers", false);
        }
 
-       ModResult OnPreCommand(std::string &command, std::vector<std::string>& parameters, LocalUser* user, bool validated, const std::string &original_line) CXX11_OVERRIDE
+       ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
        {
                if (validated)
                        return MOD_RES_PASSTHRU;
@@ -230,7 +235,7 @@ class ModuleShun : public Module, public Stats::EventListener
                else if ((command == "PART") && (parameters.size() > 1))
                {
                        /* same for PART */
-                       parameters[1].clear();
+                       parameters.pop_back();
                }
 
                /* if we're here, allow the command. */
@@ -239,7 +244,7 @@ class ModuleShun : public Module, public Stats::EventListener
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides the /SHUN command, which stops a user from executing all except configured commands.",VF_VENDOR|VF_COMMON);
+               return Version("Provides the SHUN command, which stops a user from executing all except configured commands", VF_VENDOR|VF_COMMON);
        }
 };