From 4132a44396d8fa3d23f87b5cbea5b928aa09769f Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Wed, 6 Sep 2017 08:48:19 +0100 Subject: Allow the maximum length of a chanfilter message to be configured. --- src/modules/m_chanfilter.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp index 70535a475..dd11cb514 100644 --- a/src/modules/m_chanfilter.cpp +++ b/src/modules/m_chanfilter.cpp @@ -40,10 +40,13 @@ enum class ChanFilter : public ListModeBase { public: + unsigned long maxlen; + ChanFilter(Module* Creator) : ListModeBase(Creator, "filter", 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { } - bool ValidateParam(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE { - if (word.length() > 35) + bool ValidateParam(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE + { + if (word.length() > maxlen) { user->WriteNumeric(Numerics::InvalidModeParameter(chan, this, word, "Word is too long for the spamfilter list")); return false; @@ -84,7 +87,9 @@ class ModuleChanFilter : public Module void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - hidemask = ServerInstance->Config->ConfValue("chanfilter")->getBool("hidemask"); + ConfigTag* tag = ServerInstance->Config->ConfValue("chanfilter"); + hidemask = tag->getBool("hidemask"); + cf.maxlen = tag->getInt("maxlen", 35, 10, 100); cf.DoRehash(); } @@ -121,7 +126,12 @@ class ModuleChanFilter : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_VENDOR); + // We don't send any link data if the length is 35 for compatibility with the 2.0 branch. + std::string maxfilterlen; + if (cf.maxlen != 35) + maxfilterlen.assign(ConvToStr(cf.maxlen)); + + return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_VENDOR, maxfilterlen); } }; -- cgit v1.2.3