Hide User#host and User#dhost and use accessors to modify them.

[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..fa929294c9a8427add9809e12d4ea4527613ea23 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -24,6 +24,7 @@
 
 
 #include "inspircd.h"
+#include "modules/exemption.h"
 
 /** Holds flood settings and state for mode +f
  */
@@ -73,7 +74,7 @@ class MsgFlood : public ParamMode<MsgFlood, SimpleExtItem<floodsettings> >
                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(608, channel->name, "Invalid flood parameter");
                        return MODEACTION_DENY;
                }
 
@@ -84,7 +85,7 @@ class MsgFlood : public ParamMode<MsgFlood, SimpleExtItem<floodsettings> >
 
                if ((nlines<2) || (nsecs<1))
                {
-                       source->WriteNumeric(608, "%s :Invalid flood parameter", channel->name.c_str());
+                       source->WriteNumeric(608, channel->name, "Invalid flood parameter");
                        return MODEACTION_DENY;
                }
 
@@ -103,12 +104,14 @@ class MsgFlood : public ParamMode<MsgFlood, SimpleExtItem<floodsettings> >
 
 class ModuleMsgFlood : public Module
 {
+       CheckExemption::EventProvider exemptionprov;
        MsgFlood mf;
 
  public:
 
        ModuleMsgFlood()
-               : mf(this)
+               : exemptionprov(this)
+               , mf(this)
        {
        }
 
@@ -121,7 +124,8 @@ class ModuleMsgFlood : public Module
                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 +138,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 +154,7 @@ class ModuleMsgFlood : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void Prioritize()
+       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);