Convert InspIRCd::SetSignals to a static function.

[user/henk/code/inspircd.git] / src / modules / m_chanfilter.cpp

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 55b6d3d2f649abe0a7034839acf80166920fb6cf..e955175a8b720ac0853d469a184923346cc9066a 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -27,14 +27,6 @@
 #include "listmode.h"
 #include "modules/exemption.h"
 
-enum
-{
-       // InspIRCd-specific.
-       ERR_ALREADYCHANFILTERED = 937,
-       ERR_NOSUCHCHANFILTER = 938,
-       ERR_CHANFILTERFULL = 939
-};
-
 /** Handles channel mode +g
  */
 class ChanFilter : public ListModeBase
@@ -42,33 +34,22 @@ class ChanFilter : public ListModeBase
  public:
        unsigned long maxlen;
 
-       ChanFilter(Module* Creator) : ListModeBase(Creator, "filter", 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { }
+       ChanFilter(Module* Creator)
+               : ListModeBase(Creator, "filter", 'g', "End of channel spamfilter list", 941, 940, false)
+       {
+               syntax = "<pattern>";
+       }
 
        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"));
+                       user->WriteNumeric(Numerics::InvalidModeParameter(chan, this, word, "Word is too long for the spamfilter list."));
                        return false;
                }
 
                return true;
        }
-
-       void TellListTooLong(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
-       {
-               user->WriteNumeric(ERR_CHANFILTERFULL, chan->name, word, "Channel spamfilter list is full");
-       }
-
-       void TellAlreadyOnList(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
-       {
-               user->WriteNumeric(ERR_ALREADYCHANFILTERED, chan->name, InspIRCd::Format("The word %s is already on the spamfilter list", word.c_str()));
-       }
-
-       void TellNotSet(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
-       {
-               user->WriteNumeric(ERR_NOSUCHCHANFILTER, chan->name, "No such spamfilter word is set");
-       }
 };
 
 class ModuleChanFilter : public Module
@@ -78,6 +59,25 @@ class ModuleChanFilter : public Module
        bool hidemask;
        bool notifyuser;
 
+       ChanFilter::ListItem* Match(User* user, Channel* chan, const std::string& text)
+       {
+               ModResult res = CheckExemption::Call(exemptionprov, user, chan, "filter");
+               if (!IS_LOCAL(user) || res == MOD_RES_ALLOW)
+                       return NULL;
+
+               ListModeBase::ModeList* list = cf.GetList(chan);
+               if (!list)
+                       return NULL;
+
+               for (ListModeBase::ModeList::iterator i = list->begin(); i != list->end(); i++)
+               {
+                       if (InspIRCd::Match(text, i->mask))
+                               return &*i;
+               }
+
+               return NULL;
+       }
+
  public:
 
        ModuleChanFilter()
@@ -90,45 +90,67 @@ class ModuleChanFilter : public Module
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("chanfilter");
                hidemask = tag->getBool("hidemask");
-               cf.maxlen = tag->getUInt("maxlen", 35, 10, 100);
+               cf.maxlen = tag->getUInt("maxlen", 35, 10, ModeParser::MODE_PARAM_MAX);
                notifyuser = tag->getBool("notifyuser", true);
                cf.DoRehash();
        }
 
+       void OnUserPart(Membership* memb, std::string& partmessage, CUList& except_list) CXX11_OVERRIDE
+       {
+               if (!memb)
+                       return;
+
+               User* user = memb->user;
+               Channel* chan = memb->chan;
+               ChanFilter::ListItem* match = Match(user, chan, partmessage);
+               if (!match)
+                       return;
+
+               // Match() checks the user is local, we can assume from here
+               LocalUser* luser = IS_LOCAL(user);
+
+               std::string oldreason(partmessage);
+               partmessage = "Reason filtered";
+               if (!notifyuser)
+               {
+                       // Send fake part
+                       ClientProtocol::Messages::Part partmsg(memb, oldreason);
+                       ClientProtocol::Event ev(ServerInstance->GetRFCEvents().part, partmsg);
+                       luser->Send(ev);
+
+                       // Don't send the user the changed message
+                       except_list.insert(user);
+                       return;
+               }
+
+               if (hidemask)
+                       user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (your part message contained a censored word)");
+               else
+                       user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (your part message contained a censored word: " + match->mask + ")");
+       }
+
        ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
        {
                if (target.type != MessageTarget::TYPE_CHANNEL)
                        return MOD_RES_PASSTHRU;
 
                Channel* chan = target.Get<Channel>();
-               ModResult res = CheckExemption::Call(exemptionprov, user, chan, "filter");
-
-               if (!IS_LOCAL(user) || res == MOD_RES_ALLOW)
-                       return MOD_RES_PASSTHRU;
-
-               ListModeBase::ModeList* list = cf.GetList(chan);
-
-               if (list)
+               ChanFilter::ListItem* match = Match(user, chan, details.text);
+               if (match)
                {
-                       for (ListModeBase::ModeList::iterator i = list->begin(); i != list->end(); i++)
+                       if (!notifyuser)
                        {
-                               if (InspIRCd::Match(details.text, i->mask))
-                               {
-                                       if (!notifyuser)
-                                       {
-                                               details.echooriginal = true;
-                                               return MOD_RES_DENY;
-                                       }
-
-                                       if (hidemask)
-                                               user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (your message contained a censored word)");
-                                       else
-                                               user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, i->mask, "Cannot send to channel (your message contained a censored word)");
-                                       return MOD_RES_DENY;
-                               }
+                               details.echo_original = true;
+                               return MOD_RES_DENY;
                        }
-               }
 
+                       if (hidemask)
+                               user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (your message contained a censored word)");
+                       else
+                               user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (your message contained a censored word: " + match->mask + ")");
+
+                       return MOD_RES_DENY;
+               }
                return MOD_RES_PASSTHRU;
        }