X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=9ff17924d1c38bbb154c4a959fa151824894a221;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=ff92fcaa394ac22031eef651707e6c35ef1bd194;hpb=388e4ff40931dda5870ddef149e54bdcc6c5a711;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index ff92fcaa3..9ff17924d 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -126,11 +126,14 @@ class ModuleMsgFlood : public Module
 	ModuleMsgFlood()
 		: mf(this)
 	{
-		if (!ServerInstance->Modes->AddMode(&mf))
-			throw ModuleException("Could not add new modes!");
-		ServerInstance->Extensions.Register(&mf.ext);
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(mf);
+		ServerInstance->Modules->AddService(mf.ext);
 		Implementation eventlist[] = { I_OnUserPreNotice, I_OnUserPreMessage };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	ModResult ProcessMessages(User* user,Channel* dest, const std::string &text)
@@ -185,8 +188,11 @@ 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);
+		ServerInstance->Modules->SetPriority(this, I_OnUserPreNotice, PRIORITY_LAST);
 	}
 
 	Version GetVersion()