Improve support for wildcards in <link:name>.

[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..dc703f9b01ead5462ec20bd8b7a16472bcdf731a 100644 (file)
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -24,7 +24,7 @@
 #include "inspircd.h"
 
 /* Improved drop-in replacement for the /SILENCE command
- * syntax: /SILENCE [+|-]<mask> <p|c|i|n|t|a|x> as in <privatemessage|channelmessage|invites|privatenotice|channelnotice|all|exclude>
+ * syntax: /SILENCE [(+|-)<mask> [p|c|i|n|t|a|x]] as in [privatemessages|channelmessages|invites|privatenotices|channelnotices|all|exclude]
  *
  * example that blocks all except private messages
  *  /SILENCE +*!*@* a
@@ -74,11 +74,11 @@ class CommandSVSSilence : public Command
  public:
        CommandSVSSilence(Module* Creator) : Command(Creator,"SVSSILENCE", 2)
        {
-               syntax = "<target> {[+|-]<mask> <p|c|i|n|t|a|x>}";
+               syntax = "<target> (+|-)<mask> [p|c|i|n|t|a|x]";
                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]);
        }
@@ -118,12 +119,12 @@ class CommandSilence : public Command
                , ext("silence_list", ExtensionItem::EXT_USER, Creator)
        {
                allow_empty_last_param = false;
-               syntax = "{[+|-]<mask> <p|c|i|n|t|a|x>}";
+               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);