Improvements and bugfixes to the cgiirc module.

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

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index bb2fcdbc083ae2252ad2c886bd027d628757666e..e74f3324ba936ff324326d4f94b86fbd273e5df8 100644 (file)
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -22,6 +22,12 @@
 
 #include "inspircd.h"
 #include "xline.h"
+#include "modules/stats.h"
+
+namespace
+{
+       bool silent;
+}
 
 /** Holds a SVSHold item
  */
@@ -36,19 +42,28 @@ public:
                this->nickname = nick;
        }
 
-       bool Matches(User *u)
+       bool Matches(User* u) CXX11_OVERRIDE
        {
                if (u->nick == nickname)
                        return true;
                return false;
        }
 
-       bool Matches(const std::string &s)
+       bool Matches(const std::string& s) CXX11_OVERRIDE
        {
                return InspIRCd::Match(s, nickname);
        }
 
-       const std::string& Displayable()
+       void DisplayExpiry() CXX11_OVERRIDE
+       {
+               if (!silent)
+               {
+                       ServerInstance->SNO->WriteToSnoMask('x', "Removing expired SVSHOLD %s (set by %s %ld seconds ago)",
+                               nickname.c_str(), source.c_str(), (long)(ServerInstance->Time() - set_time));
+               }
+       }
+
+       const std::string& Displayable() CXX11_OVERRIDE
        {
                return nickname;
        }
@@ -63,12 +78,12 @@ class SVSHoldFactory : public XLineFactory
 
        /** Generate a shun
        */
-       XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+       XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE
        {
                return new SVSHold(set_time, duration, source, reason, xline_specific_mask);
        }
 
-       bool AutoApplyToUserList(XLine *x)
+       bool AutoApplyToUserList(XLine* x) CXX11_OVERRIDE
        {
                return false;
        }
@@ -84,12 +99,12 @@ class CommandSvshold : public Command
                flags_needed = 'o'; this->syntax = "<nickname> [<duration> :<reason>]";
        }
 
-       CmdResult Handle(const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                /* syntax: svshold nickname time :reason goes here */
                /* 'time' is a human-readable timestring, like 2d3h2s. */
 
-               if (!ServerInstance->ULine(user->server))
+               if (!user->server->IsULine())
                {
                        /* don't allow SVSHOLD from non-ulined clients */
                        return CMD_FAILURE;
@@ -99,7 +114,8 @@ class CommandSvshold : public Command
                {
                        if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SVSHOLD", user))
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s removed SVSHOLD on %s",user->nick.c_str(),parameters[0].c_str());
+                               if (!silent)
+                                       ServerInstance->SNO->WriteToSnoMask('x',"%s removed SVSHOLD on %s",user->nick.c_str(),parameters[0].c_str());
                        }
                        else
                        {
@@ -116,6 +132,9 @@ class CommandSvshold : public Command
 
                        if (ServerInstance->XLines->AddLine(r, user))
                        {
+                               if (silent)
+                                       return CMD_SUCCESS;
+
                                if (!duration)
                                {
                                        ServerInstance->SNO->WriteGlobalSno('x', "%s added permanent SVSHOLD for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str());
@@ -137,20 +156,22 @@ class CommandSvshold : public Command
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                return ROUTE_BROADCAST;
        }
 };
 
-class ModuleSVSHold : public Module
+class ModuleSVSHold : public Module, public Stats::EventListener
 {
        CommandSvshold cmd;
        SVSHoldFactory s;
 
 
  public:
-       ModuleSVSHold() : cmd(this)
+       ModuleSVSHold()
+               : Stats::EventListener(this)
+               , cmd(this)
        {
        }
 
@@ -159,22 +180,28 @@ class ModuleSVSHold : public Module
                ServerInstance->XLines->RegisterFactory(&s);
        }
 
-       ModResult OnStats(char symbol, User* user, string_list &out) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+       {
+               ConfigTag* tag = ServerInstance->Config->ConfValue("svshold");
+               silent = tag->getBool("silent", true);
+       }
+
+       ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE
        {
-               if(symbol != 'S')
+               if (stats.GetSymbol() != 'S')
                        return MOD_RES_PASSTHRU;
 
-               ServerInstance->XLines->InvokeStats("SVSHOLD", 210, user, out);
+               ServerInstance->XLines->InvokeStats("SVSHOLD", 210, stats);
                return MOD_RES_DENY;
        }
 
-       ModResult OnUserPreNick(User *user, const std::string &newnick) CXX11_OVERRIDE
+       ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE
        {
                XLine *rl = ServerInstance->XLines->MatchesLine("SVSHOLD", newnick);
 
                if (rl)
                {
-                       user->WriteNumeric(ERR_ERRONEUSNICKNAME, "%s :Services reserved nickname: %s", newnick.c_str(), rl->reason.c_str());
+                       user->WriteNumeric(ERR_ERRONEUSNICKNAME, newnick, InspIRCd::Format("Services reserved nickname: %s", rl->reason.c_str()));
                        return MOD_RES_DENY;
                }