From 8459e625349c03039e7545c213f84d8756034390 Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Tue, 16 Apr 2019 16:19:55 +0100
Subject: Update trivially-modifiable modules to handle tag messages.

---
 src/modules/m_messageflood.cpp | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'src/modules/m_messageflood.cpp')

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index af976afd5..b2c67d538 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -24,6 +24,7 @@
 
 
 #include "inspircd.h"
+#include "modules/ctctags.h"
 #include "modules/exemption.h"
 
 /** Holds flood settings and state for mode +f
@@ -105,20 +106,23 @@ class MsgFlood : public ParamMode<MsgFlood, SimpleExtItem<floodsettings> >
 	}
 };
 
-class ModuleMsgFlood : public Module
+class ModuleMsgFlood
+	: public Module
+	, public CTCTags::EventListener
 {
+private:
 	CheckExemption::EventProvider exemptionprov;
 	MsgFlood mf;
 
  public:
-
 	ModuleMsgFlood()
-		: exemptionprov(this)
+		: CTCTags::EventListener(this)
+		, exemptionprov(this)
 		, mf(this)
 	{
 	}
 
-	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
+	ModResult HandleMessage(User* user, const MessageTarget& target)
 	{
 		if (target.type != MessageTarget::TYPE_CHANNEL)
 			return MOD_RES_PASSTHRU;
@@ -157,6 +161,16 @@ class ModuleMsgFlood : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
+	{
+		return HandleMessage(user, target);
+	}
+
+	ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
+	{
+		return HandleMessage(user, target);
+	}
+
 	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.)
-- 
cgit v1.2.3