X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=776841bcc20a9e72b835645b55734efc3b6c2034;hb=cc1d8c1d57abc36effdc1e9383e4d7f5a3ea9ab0;hp=e0b30163c28c5af598e895c69973167ad4ff8e08;hpb=21c3232b8e0bb41727f2d65a0b2d5304587cf6be;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index e0b30163c..776841bcc 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -25,8 +25,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides channel mode +f (message flood protection) */
-
 /** Holds flood settings and state for mode +f
  */
 class floodsettings
@@ -75,8 +73,6 @@ class MsgFlood : public ModeHandler
 
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
-		floodsettings *f = ext.get(channel);
-
 		if (adding)
 		{
 			std::string::size_type colon = parameter.find(':');
@@ -97,26 +93,23 @@ class MsgFlood : public ModeHandler
 				return MODEACTION_DENY;
 			}
 
+			floodsettings* f = ext.get(channel);
 			if ((f) && (nlines == f->lines) && (nsecs == f->secs) && (ban == f->ban))
 				// mode params match
 				return MODEACTION_DENY;
 
 			ext.set(channel, new floodsettings(ban, nsecs, nlines));
 			parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" + ConvToStr(nsecs);
-			channel->SetModeParam('f', parameter);
 			return MODEACTION_ALLOW;
 		}
 		else
 		{
-			if (f)
-			{
-				ext.unset(channel);
-				channel->SetModeParam('f', "");
-				return MODEACTION_ALLOW;
-			}
-		}
+			if (!channel->IsModeSet(this))
+				return MODEACTION_DENY;
 
-		return MODEACTION_DENY;
+			ext.unset(channel);
+			return MODEACTION_ALLOW;
+		}
 	}
 };
 
@@ -129,16 +122,18 @@ class ModuleMsgFlood : public Module
 	ModuleMsgFlood()
 		: mf(this)
 	{
-		if (!ServerInstance->Modes->AddMode(&mf))
-			throw ModuleException("Could not add new modes!");
-		ServerInstance->Extensions.Register(&mf.ext);
-		Implementation eventlist[] = { I_OnUserPreNotice, I_OnUserPreMessage };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+	}
+
+	void init() CXX11_OVERRIDE
+	{
+		ServerInstance->Modules->AddService(mf);
+		ServerInstance->Modules->AddService(mf.ext);
+		ServerInstance->Modules->Attach(I_OnUserPreMessage, this);
 	}
 
 	ModResult ProcessMessages(User* user,Channel* dest, const std::string &text)
 	{
-		if ((!IS_LOCAL(user)) || !dest->IsModeSet('f'))
+		if ((!IS_LOCAL(user)) || !dest->IsModeSet(mf))
 			return MOD_RES_PASSTHRU;
 
 		if (ServerInstance->OnCheckExemption(user,dest,"flood") == MOD_RES_ALLOW)
@@ -156,14 +151,14 @@ class ModuleMsgFlood : public Module
 					std::vector<std::string> parameters;
 					parameters.push_back(dest->name);
 					parameters.push_back("+b");
-					parameters.push_back(user->MakeWildHost());
-					ServerInstance->SendGlobalMode(parameters, ServerInstance->FakeClient);
+					parameters.push_back("*!*@" + user->dhost);
+					ServerInstance->Modes->Process(parameters, ServerInstance->FakeClient);
 				}
 
-				char kickmessage[MAXBUF];
-				snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %u lines in %u secs)", f->lines, f->secs);
+				const std::string kickMessage = "Channel flood triggered (limit is " + ConvToStr(f->lines) +
+					" in " + ConvToStr(f->secs) + " secs)";
 
-				dest->KickUser(ServerInstance->FakeClient, user, kickmessage);
+				dest->KickUser(ServerInstance->FakeClient, user, kickMessage);
 
 				return MOD_RES_DENY;
 			}
@@ -172,15 +167,7 @@ class ModuleMsgFlood : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	ModResult OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
-	{
-		if (target_type == TYPE_CHANNEL)
-			return ProcessMessages(user,(Channel*)dest,text);
-
-		return MOD_RES_PASSTHRU;
-	}
-
-	ModResult OnUserPreNotice(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
+	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
 	{
 		if (target_type == TYPE_CHANNEL)
 			return ProcessMessages(user,(Channel*)dest,text);
@@ -188,11 +175,13 @@ class ModuleMsgFlood : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	~ModuleMsgFlood()
+	void Prioritize()
 	{
+		// 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);
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides channel mode +f (message flood protection)", VF_VENDOR);
 	}