Merge pull request #1141 from SaberUK/master+windows-purge

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

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index c9c14f01b31e2fe189f8e603a5bef68d29802d14..6e67cb3095efc6c3610326553b0389ae2f172b1f 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -21,8 +21,7 @@
 
 
 #include "inspircd.h"
-
-/* $ModDesc: Provides support to block all-CAPS channel messages and notices */
+#include "modules/exemption.h"
 
 
 /** Handles the +B channel mode
@@ -35,35 +34,25 @@ class BlockCaps : public SimpleChannelModeHandler
 
 class ModuleBlockCAPS : public Module
 {
+       CheckExemption::EventProvider exemptionprov;
        BlockCaps bc;
-       int percent;
+       unsigned int percent;
        unsigned int minlen;
        char capsmap[256];
 
 public:
-       ModuleBlockCAPS() : bc(this)
+       ModuleBlockCAPS()
+               : exemptionprov(this)
+               , bc(this)
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               OnRehash(NULL);
-               ServerInstance->Modules->AddService(bc);
-               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-       }
-
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
                tokens["EXTBAN"].push_back('B');
        }
 
-       void OnRehash(User* user) CXX11_OVERRIDE
-       {
-               ReadConf();
-       }
-
-       ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) CXX11_OVERRIDE
+       ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -71,33 +60,26 @@ public:
                                return MOD_RES_PASSTHRU;
 
                        Channel* c = (Channel*)dest;
-                       ModResult res = ServerInstance->OnCheckExemption(user,c,"blockcaps");
+                       ModResult res;
+                       FIRST_MOD_RESULT_CUSTOM(exemptionprov, CheckExemption::EventListener, OnCheckExemption, res, (user, c, "blockcaps"));
 
                        if (res == MOD_RES_ALLOW)
                                return MOD_RES_PASSTHRU;
 
-                       if (!c->GetExtBanStatus(user, 'B').check(!c->IsModeSet('B')))
+                       if (!c->GetExtBanStatus(user, 'B').check(!c->IsModeSet(bc)))
                        {
-                               int caps = 0;
-                               const char* actstr = "\1ACTION ";
-                               int act = 0;
-
-                               for (std::string::iterator i = text.begin(); i != text.end(); i++)
-                               {
-                                       /* Smart fix for suggestion from Jobe, ignore CTCP ACTION (part of /ME) */
-                                       if (*actstr && *i == *actstr++ && act != -1)
-                                       {
-                                               act++;
-                                               continue;
-                                       }
-                                       else
-                                               act = -1;
+                               std::string::size_type caps = 0;
+                               unsigned int offset = 0;
+                               // Ignore the beginning of the text if it's a CTCP ACTION (/me)
+                               if (!text.compare(0, 8, "\1ACTION ", 8))
+                                       offset = 8;
 
+                               for (std::string::const_iterator i = text.begin() + offset; i != text.end(); ++i)
                                        caps += capsmap[(unsigned char)*i];
-                               }
-                               if ( ((caps*100)/(int)text.length()) >= percent )
+
+                               if (((caps * 100) / text.length()) >= percent)
                                {
-                                       user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s %s :Your message cannot contain more than %d%% capital letters if it's longer than %d characters", user->nick.c_str(), c->name.c_str(), percent, minlen);
+                                       user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, InspIRCd::Format("Your message cannot contain %d%% or more capital letters if it's longer than %d characters", percent, minlen));
                                        return MOD_RES_DENY;
                                }
                        }
@@ -105,30 +87,15 @@ public:
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) CXX11_OVERRIDE
-       {
-               return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
-       }
-
-       void ReadConf()
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("blockcaps");
-               percent = tag->getInt("percent", 100);
-               minlen = tag->getInt("minlen", 1);
+               percent = tag->getInt("percent", 100, 1, 100);
+               minlen = tag->getInt("minlen", 1, 1, ServerInstance->Config->Limits.MaxLine);
                std::string hmap = tag->getString("capsmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
                memset(capsmap, 0, sizeof(capsmap));
                for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
                        capsmap[(unsigned char)*n] = 1;
-               if (percent < 1 || percent > 100)
-               {
-                       ServerInstance->Logs->Log("CONFIG",LOG_DEFAULT, "<blockcaps:percent> out of range, setting to default of 100.");
-                       percent = 100;
-               }
-               if (minlen < 1 || minlen > MAXBUF-1)
-               {
-                       ServerInstance->Logs->Log("CONFIG",LOG_DEFAULT, "<blockcaps:minlen> out of range, setting to default of 1.");
-                       minlen = 1;
-               }
        }
 
        Version GetVersion() CXX11_OVERRIDE