Fixes to make this module scale much better. Dont connect on each query, keep open...

[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 2f1654016aa8c14b64dea0ea131f3f6c4d6b7e51..7d1e80d62f0a5a116c75ea14ab6d06de17990764 100644 (file)
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -51,6 +51,41 @@ static int SILENCE_ALL               = 0x0020; /* a  all, (pcint)          */
 static int SILENCE_EXCLUDE     = 0x0040; /* x  exclude this pattern  */
 
 
+class CommandSVSSilence : public Command
+{
+ public:
+       CommandSVSSilence(InspIRCd* Instance) : Command(Instance,"SVSSILENCE", 0, 2)
+       {
+               this->source = "m_silence.so";
+               syntax = "<target> {[+|-]<mask> <p|c|i|n|t|a|x>}";
+               TRANSLATE3(TR_NICK, TR_TEXT, TR_END); /* we watch for a nick. not a UID. */
+       }
+
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+       {
+               /*
+                * XXX: thought occurs to me
+                * We may want to change the syntax of this command to
+                * SVSSILENCE <flagsora+> +<nick> -<nick> +<nick>
+                * style command so services can modify lots of entries at once.
+                * leaving it backwards compatible for now as it's late. -- w
+                */
+               if (!ServerInstance->ULine(user->server))
+                       return CMD_FAILURE;
+                       
+               User *u = ServerInstance->FindNick(parameters[0]);
+               if (!u)
+                       return CMD_FAILURE;
+                       
+               if (IS_LOCAL(u))
+               {
+                       ServerInstance->Parser->CallHandler("SILENCE", std::vector<std::string>(++parameters.begin(), parameters.end()), u);
+               }
+               
+               return CMD_SUCCESS;
+       }
+};
+
 class CommandSilence : public Command
 {
        unsigned int& maxsilence;
@@ -62,9 +97,9 @@ class CommandSilence : public Command
                TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
-               if (!pcnt)
+               if (!parameters.size())
                {
                        // no parameters, show the current silence list.
                        // Use Extensible::GetExt to fetch the silence list
@@ -82,17 +117,17 @@ class CommandSilence : public Command
 
                        return CMD_LOCALONLY;
                }
-               else if (pcnt > 0)
+               else if (parameters.size() > 0)
                {
                        // one or more parameters, add or delete entry from the list (only the first parameter is used)
-                       std::string mask = parameters[0] + 1;
-                       char action = *parameters[0];
+                       std::string mask = parameters[0].substr(1);
+                       char action = parameters[0][0];
                        // Default is private and notice so clients do not break
                        int pattern = CompilePattern("pn");
 
                        // if pattern supplied, use it
-                       if (pcnt > 1) {
-                               pattern = CompilePattern(parameters[1]);
+                       if (parameters.size() > 1) {
+                               pattern = CompilePattern(parameters[1].c_str());
                        }
                        
                        if (!mask.length())
@@ -232,7 +267,8 @@ class CommandSilence : public Command
 
 class ModuleSilence : public Module
 {
-       CommandSilence* mycommand;
+       CommandSilence* cmdsilence;
+       CommandSVSSilence *cmdsvssilence;
        unsigned int maxsilence;
  public:
  
@@ -240,8 +276,11 @@ class ModuleSilence : public Module
                : Module(Me), maxsilence(32)
        {
                OnRehash(NULL, "");
-               mycommand = new CommandSilence(ServerInstance,maxsilence);
-               ServerInstance->AddCommand(mycommand);
+               cmdsilence = new CommandSilence(ServerInstance,maxsilence);
+               cmdsvssilence = new CommandSVSSilence(ServerInstance);
+               ServerInstance->AddCommand(cmdsilence);
+               ServerInstance->AddCommand(cmdsvssilence);
+
                Implementation eventlist[] = { I_OnRehash, I_OnBuildExemptList, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage, I_OnUserPreInvite };
                ServerInstance->Modules->Attach(eventlist, this, 7);
        }
@@ -342,6 +381,10 @@ class ModuleSilence : public Module
 
        int MatchPattern(User* dest, User* source, int pattern)
        {
+               /* Server source */
+               if (!source || !dest)
+                       return 1;
+
                silencelist* sl;
                dest->GetExt("silence_list", sl);
                if (sl)