Make messageflood weights configurable.

Also, default TAGMSG to being worth 0.2 NOTICE/PRIVMSG. This should
prevent flood kicks from typing notifications.

Closes #1649.

2 files changed, 25 insertions, 7 deletions

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index bb8a74dbc..a2a219444 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -1343,6 +1343,12 @@
 # Message flood module: Adds message/notice flood protection via
 # channel mode +f.
 #<module name="messageflood">
+#
+# The weight to give each message type. TAGMSGs are considered to be
+# 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 notice="1.0" privmsg="1.0" tagmsg="0.2">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # MLOCK module: Adds support for server-side enforcement of services
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 3021b1771..7b96804f0 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -36,7 +36,7 @@ class floodsettings
 	unsigned int secs;
 	unsigned int lines;
 	time_t reset;
-	insp::flat_map<User*, unsigned int> counters;
+	insp::flat_map<User*, double> counters;
 
 	floodsettings(bool a, unsigned int b, unsigned int c)
 		: ban(a)
@@ -46,7 +46,7 @@ class floodsettings
 		reset = ServerInstance->Time() + secs;
 	}
 
-	bool addmessage(User* who)
+	bool addmessage(User* who, double weight)
 	{
 		if (ServerInstance->Time() > reset)
 		{
@@ -54,7 +54,8 @@ class floodsettings
 			reset = ServerInstance->Time() + secs;
 		}
 
-		return (++counters[who] >= this->lines);
+		counters[who] += weight;
+		return (counters[who] >= this->lines);
 	}
 
 	void clear(User* who)
@@ -113,6 +114,9 @@ class ModuleMsgFlood
 private:
 	CheckExemption::EventProvider exemptionprov;
 	MsgFlood mf;
+	double notice;
+	double privmsg;
+	double tagmsg;
 
  public:
 	ModuleMsgFlood()
@@ -122,7 +126,15 @@ private:
 	{
 	}
 
-	ModResult HandleMessage(User* user, const MessageTarget& target)
+	void ReadConfig(ConfigStatus&) CXX11_OVERRIDE
+	{
+		ConfigTag* tag = ServerInstance->Config->ConfValue("messageflood");
+		notice = tag->getFloat("notice", 1.0);
+		privmsg = tag->getFloat("privmsg", 1.0);
+		tagmsg = tag->getFloat("tagmsg", 0.2);
+	}
+
+	ModResult HandleMessage(User* user, const MessageTarget& target, double weight)
 	{
 		if (target.type != MessageTarget::TYPE_CHANNEL)
 			return MOD_RES_PASSTHRU;
@@ -138,7 +150,7 @@ private:
 		floodsettings *f = mf.ext.get(dest);
 		if (f)
 		{
-			if (f->addmessage(user))
+			if (f->addmessage(user, weight))
 			{
 				/* Youre outttta here! */
 				f->clear(user);
@@ -163,12 +175,12 @@ private:
 
 	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
-		return HandleMessage(user, target);
+		return HandleMessage(user, target, (details.type == MSG_PRIVMSG ? privmsg : notice));
 	}
 
 	ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
 	{
-		return HandleMessage(user, target);
+		return HandleMessage(user, target, tagmsg);
 	}
 
 	void Prioritize() CXX11_OVERRIDE