Fix sending DNSBL error snotices when a user isn't DNSBLed.

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

diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index cc510c3dd977b5459911a470a157ba423a0c0a1d..165e083bb9b4bdef75bb1b2716d9fad6af81a3bf 100644 (file)
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -78,7 +78,7 @@ class CommandSVSSilence : public Command
                TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT);
        }
 
-       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                /*
                 * XXX: thought occurs to me
@@ -96,13 +96,14 @@ class CommandSVSSilence : public Command
 
                if (IS_LOCAL(u))
                {
-                       ServerInstance->Parser.CallHandler("SILENCE", std::vector<std::string>(parameters.begin() + 1, parameters.end()), u);
+                       CommandBase::Params params(parameters.begin() + 1, parameters.end());
+                       ServerInstance->Parser.CallHandler("SILENCE", params, u);
                }
 
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) CXX11_OVERRIDE
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                return ROUTE_OPT_UCAST(parameters[0]);
        }
@@ -121,9 +122,9 @@ class CommandSilence : public Command
                syntax = "{[+|-]<mask> <p|c|i|n|t|a|x>}";
        }
 
-       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               if (!parameters.size())
+               if (parameters.empty())
                {
                        // no parameters, show the current silence list.
                        silencelist* sl = ext.get(user);
@@ -140,7 +141,7 @@ class CommandSilence : public Command
 
                        return CMD_SUCCESS;
                }
-               else if (parameters.size() > 0)
+               else
                {
                        // one or more parameters, add or delete entry from the list (only the first parameter is used)
                        std::string mask(parameters[0], 1);