Some more text fixes and improvements (#1618).

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

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 1faf3bfb99e5a1d04c449b9798201088f72edb6d..3021b1771e65940e52cdb1b57a09ab431047132c 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -24,6 +24,8 @@
 
 
 #include "inspircd.h"
+#include "modules/ctctags.h"
+#include "modules/exemption.h"
 
 /** Holds flood settings and state for mode +f
  */
@@ -36,7 +38,10 @@ class floodsettings
        time_t reset;
        insp::flat_map<User*, unsigned int> counters;
 
-       floodsettings(bool a, int b, int c) : ban(a), secs(b), lines(c)
+       floodsettings(bool a, unsigned int b, unsigned int c)
+               : ban(a)
+               , secs(b)
+               , lines(c)
        {
                reset = ServerInstance->Time() + secs;
        }
@@ -68,23 +73,23 @@ class MsgFlood : public ParamMode<MsgFlood, SimpleExtItem<floodsettings> >
        {
        }
 
-       ModeAction OnSet(User* source, Channel* channel, std::string& parameter)
+       ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE
        {
                std::string::size_type colon = parameter.find(':');
                if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos))
                {
-                       source->WriteNumeric(608, "%s :Invalid flood parameter", channel->name.c_str());
+                       source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
                        return MODEACTION_DENY;
                }
 
                /* Set up the flood parameters for this channel */
                bool ban = (parameter[0] == '*');
-               unsigned int nlines = ConvToInt(parameter.substr(ban ? 1 : 0, ban ? colon-1 : colon));
-               unsigned int nsecs = ConvToInt(parameter.substr(colon+1));
+               unsigned int nlines = ConvToNum<unsigned int>(parameter.substr(ban ? 1 : 0, ban ? colon-1 : colon));
+               unsigned int nsecs = ConvToNum<unsigned int>(parameter.substr(colon+1));
 
                if ((nlines<2) || (nsecs<1))
                {
-                       source->WriteNumeric(608, "%s :Invalid flood parameter", channel->name.c_str());
+                       source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
                        return MODEACTION_DENY;
                }
 
@@ -101,27 +106,33 @@ class MsgFlood : public ParamMode<MsgFlood, SimpleExtItem<floodsettings> >
        }
 };
 
-class ModuleMsgFlood : public Module
+class ModuleMsgFlood
+       : public Module
+       , public CTCTags::EventListener
 {
+private:
+       CheckExemption::EventProvider exemptionprov;
        MsgFlood mf;
 
  public:
-
        ModuleMsgFlood()
-               : mf(this)
+               : CTCTags::EventListener(this)
+               , exemptionprov(this)
+               , mf(this)
        {
        }
 
-       ModResult OnUserPreMessage(User* user, void* voiddest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
+       ModResult HandleMessage(User* user, const MessageTarget& target)
        {
-               if (target_type != TYPE_CHANNEL)
+               if (target.type != MessageTarget::TYPE_CHANNEL)
                        return MOD_RES_PASSTHRU;
 
-               Channel* dest = static_cast<Channel*>(voiddest);
+               Channel* dest = target.Get<Channel>();
                if ((!IS_LOCAL(user)) || !dest->IsModeSet(mf))
                        return MOD_RES_PASSTHRU;
 
-               if (ServerInstance->OnCheckExemption(user,dest,"flood") == MOD_RES_ALLOW)
+               ModResult res = CheckExemption::Call(exemptionprov, user, dest, "flood");
+               if (res == MOD_RES_ALLOW)
                        return MOD_RES_PASSTHRU;
 
                floodsettings *f = mf.ext.get(dest);
@@ -134,12 +145,12 @@ class ModuleMsgFlood : public Module
                                if (f->ban)
                                {
                                        Modes::ChangeList changelist;
-                                       changelist.push_add(ServerInstance->Modes->FindMode('b', MODETYPE_CHANNEL), "*!*@" + user->dhost);
+                                       changelist.push_add(ServerInstance->Modes->FindMode('b', MODETYPE_CHANNEL), "*!*@" + user->GetDisplayedHost());
                                        ServerInstance->Modes->Process(ServerInstance->FakeClient, dest, NULL, changelist);
                                }
 
-                               const std::string kickMessage = "Channel flood triggered (limit is " + ConvToStr(f->lines) +
-                                       " in " + ConvToStr(f->secs) + " secs)";
+                               const std::string kickMessage = "Channel flood triggered (trigger is " + ConvToStr(f->lines) +
+                                       " lines in " + ConvToStr(f->secs) + " secs)";
 
                                dest->KickUser(ServerInstance->FakeClient, user, kickMessage);
 
@@ -150,7 +161,17 @@ class ModuleMsgFlood : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void Prioritize()
+       ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
+       {
+               return HandleMessage(user, target);
+       }
+
+       ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
+       {
+               return HandleMessage(user, target);
+       }
+
+       void Prioritize() CXX11_OVERRIDE
        {
                // we want to be after all modules that might deny the message (e.g. m_muteban, m_noctcp, m_blockcolor, etc.)
                ServerInstance->Modules->SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST);
@@ -158,7 +179,7 @@ class ModuleMsgFlood : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides channel mode +f (message flood protection)", VF_VENDOR);
+               return Version("Provides channel mode +f, message flood protection", VF_VENDOR);
        }
 };