From 88c28f525676fad98033e59ac35025263c374c4b Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Sat, 28 Sep 2024 16:05:40 +0100
Subject: [PATCH] Make the messageflood and repeat messages a bit better.

---
 docs/conf/modules.example.conf | 4 ++--
 src/modules/m_messageflood.cpp | 2 +-
 src/modules/m_repeat.cpp       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/conf/modules.example.conf b/docs/conf/modules.example.conf
index 12a85c770..e174b00f7 100644
--- a/docs/conf/modules.example.conf
+++ b/docs/conf/modules.example.conf
@@ -1631,7 +1631,7 @@
 # 1/5 of a NOTICE or PRIVMSG to avoid users being accidentally flooded
 # out of a channel by automatic client features such as typing
 # notifications.
-#<messageflood message="Message flood (trigger is %messages% messages in %duration%)"
+#<messageflood message="Message flood detected (trigger is %messages% messages in %duration%)"
 #              extended="yes"
 #              notice="1.0"
 #              privmsg="1.0"
@@ -2076,7 +2076,7 @@
 #        maxtime="0s"
 #        size="512"
 #        extended="yes"
-#        message="Repeat flood (trigger is %lines% messages in %duration%)">
+#        message="Repeat flood detected (trigger is %lines% messages in %duration%)">
 #<module name="repeat">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index d511dea36..894e2c1f8 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -265,7 +265,7 @@ public:
 		notice = tag->getNum<double>("notice", 1.0);
 		privmsg = tag->getNum<double>("privmsg", 1.0);
 		tagmsg = tag->getNum<double>("tagmsg", 0.2);
-		message = tag->getString("message", "Message flood (trigger is %messages% messages in %duration%)", 1);
+		message = tag->getString("message", "Message flood detected (trigger is %messages% messages in %duration%)", 1);
 		mf.extended = tag->getBool("extended");
 		mf.SetSyntax();
 	}
diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp
index dec4efc67..a38fbc274 100644
--- a/src/modules/m_repeat.cpp
+++ b/src/modules/m_repeat.cpp
@@ -442,7 +442,7 @@ public:
 	void ReadConfig(ConfigStatus& status) override
 	{
 		const auto& tag = ServerInstance->Config->ConfValue("repeat");
-		rm.ms.Message = tag->getString("message", tag->getString("kickmessage", "Repeat flood (trigger is %lines% messages in %duration%)"), 1);
+		rm.ms.Message = tag->getString("message", tag->getString("kickmessage", "Repeat flood detected (trigger is %lines% messages in %duration%)"), 1);
 		rm.ms.Extended = tag->getBool("extended");
 		rm.ms.MaxBacklog = tag->getNum<unsigned long>("maxbacklog", 20);
 		rm.ms.MaxDiff = tag->getNum<unsigned int>("maxdistance", 50, 0, 100);