Some more text fixes and improvements (#1618).

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

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 90e3f912a9e9ce2f0066a27a0e3cab3405139852..25345506e5a517faae5273543584f4b26c973056 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -22,65 +22,44 @@
 
 
 #include "inspircd.h"
-
-/* $ModDesc: Provides channel mode +c to block color */
-
-/** Handles the +c channel mode
- */
-class BlockColor : public SimpleChannelModeHandler
-{
- public:
-       BlockColor(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcolor", 'c') { }
-};
+#include "modules/exemption.h"
 
 class ModuleBlockColor : public Module
 {
-       bool AllowChanOps;
-       BlockColor bc;
+       CheckExemption::EventProvider exemptionprov;
+       SimpleChannelModeHandler bc;
  public:
 
-       ModuleBlockColor() : bc(this)
+       ModuleBlockColor()
+               : exemptionprov(this)
+               , bc(this, "blockcolor", 'c')
        {
        }
 
-       void init()
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               if (!ServerInstance->Modes->AddMode(&bc))
-                       throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               tokens["EXTBAN"].push_back('c');
        }
 
-       virtual void On005Numeric(std::string &output)
+       ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
        {
-               ServerInstance->AddExtBanChar('c');
-       }
-
-       virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
-       {
-               if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
+               if ((target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
-                       Channel* c = (Channel*)dest;
-                       ModResult res = ServerInstance->OnCheckExemption(user,c,"blockcolor");
+                       Channel* c = target.Get<Channel>();
+                       ModResult res = CheckExemption::Call(exemptionprov, user, c, "blockcolor");
 
                        if (res == MOD_RES_ALLOW)
                                return MOD_RES_PASSTHRU;
 
-                       if (!c->GetExtBanStatus(user, 'c').check(!c->IsModeSet('c')))
+                       if (!c->GetExtBanStatus(user, 'c').check(!c->IsModeSet(bc)))
                        {
-                               for (std::string::iterator i = text.begin(); i != text.end(); i++)
+                               for (std::string::iterator i = details.text.begin(); i != details.text.end(); i++)
                                {
-                                       switch (*i)
+                                       // Block all control codes except \001 for CTCP
+                                       if ((*i >= 0) && (*i < 32) && (*i != 1))
                                        {
-                                               case 2:
-                                               case 3:
-                                               case 15:
-                                               case 21:
-                                               case 22:
-                                               case 31:
-                                                       user->WriteNumeric(404, "%s %s :Can't send colors to channel (+c set)",user->nick.c_str(), c->name.c_str());
-                                                       return MOD_RES_DENY;
-                                               break;
+                                               user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send colors to channel (+c is set)");
+                                               return MOD_RES_DENY;
                                        }
                                }
                        }
@@ -88,16 +67,7 @@ class ModuleBlockColor : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
-       {
-               return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
-       }
-
-       virtual ~ModuleBlockColor()
-       {
-       }
-
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides channel mode +c to block color",VF_VENDOR);
        }