Use CommandBase::Params instead of std::vector<std::string>.

[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 9d119b6c37cfc679e52315670acddb443ae7f70e..0707e6ae4e6fa10b28389b9d7a0aa6df68ae49f2 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -37,7 +37,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;
        }
@@ -69,12 +72,12 @@ 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, channel->name, "Invalid flood parameter");
+                       source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
                        return MODEACTION_DENY;
                }
 
@@ -85,7 +88,7 @@ class MsgFlood : public ParamMode<MsgFlood, SimpleExtItem<floodsettings> >
 
                if ((nlines<2) || (nsecs<1))
                {
-                       source->WriteNumeric(608, channel->name, "Invalid flood parameter");
+                       source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
                        return MODEACTION_DENY;
                }
 
@@ -115,17 +118,16 @@ class ModuleMsgFlood : public Module
        {
        }
 
-       ModResult OnUserPreMessage(User* user, void* voiddest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
+       ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
        {
-               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;
 
-               ModResult res;
-               FIRST_MOD_RESULT_CUSTOM(exemptionprov, CheckExemption::EventListener, OnCheckExemption, res, (user, dest, "flood"));
+               ModResult res = CheckExemption::Call(exemptionprov, user, dest, "flood");
                if (res == MOD_RES_ALLOW)
                        return MOD_RES_PASSTHRU;
 
@@ -139,7 +141,7 @@ 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);
                                }