Improve LIST and implement more extended list features.

[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 6e67cb3095efc6c3610326553b0389ae2f172b1f..d7cd303b6ea89cbf1cf93c0cee09bbf99b53ae67 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -23,19 +23,10 @@
 #include "inspircd.h"
 #include "modules/exemption.h"
 
-
-/** Handles the +B channel mode
- */
-class BlockCaps : public SimpleChannelModeHandler
-{
- public:
-       BlockCaps(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcaps", 'B') { }
-};
-
 class ModuleBlockCAPS : public Module
 {
        CheckExemption::EventProvider exemptionprov;
-       BlockCaps bc;
+       SimpleChannelModeHandler bc;
        unsigned int percent;
        unsigned int minlen;
        char capsmap[256];
@@ -43,7 +34,7 @@ class ModuleBlockCAPS : public Module
 public:
        ModuleBlockCAPS()
                : exemptionprov(this)
-               , bc(this)
+               , bc(this, "blockcaps", 'B')
        {
        }
 
@@ -56,12 +47,11 @@ public:
        {
                if (target_type == TYPE_CHANNEL)
                {
-                       if ((!IS_LOCAL(user)) || (text.length() < minlen))
+                       if ((!IS_LOCAL(user)) || (text.length() < minlen) || (text == "\1ACTION\1") || (text == "\1ACTION"))
                                return MOD_RES_PASSTHRU;
 
                        Channel* c = (Channel*)dest;
-                       ModResult res;
-                       FIRST_MOD_RESULT_CUSTOM(exemptionprov, CheckExemption::EventListener, OnCheckExemption, res, (user, c, "blockcaps"));
+                       ModResult res = CheckExemption::Call(exemptionprov, user, c, "blockcaps");
 
                        if (res == MOD_RES_ALLOW)
                                return MOD_RES_PASSTHRU;