X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=9d2e0e681c3a828b03ba25dc45ee5023937b60a7;hb=4aa27e75af8da0a5bc2e35f931f0165339f5f289;hp=d89de49eb0d0802098e41adfdb840952dcfb2da4;hpb=834c94679b7df475e50d87ccb11311e297a78718;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index d89de49eb..9d2e0e681 100644
--- 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
  */
@@ -36,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;
 	}
@@ -68,7 +72,7 @@ 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))
@@ -103,12 +107,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 +127,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,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);
 				}