Get rid of the OnRemoteKill hook, make use of GetRouting() and TR_CUSTOM to route...

[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..c13549db87c6d2632821c2b08e42b9f6eff4e364 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -49,7 +49,7 @@ public:
        {
                OnRehash(NULL);
                ServerInstance->Modules->AddService(bc);
-               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash, I_On005Numeric };
+               Implementation eventlist[] = { I_OnUserPreMessage, I_OnRehash, I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
@@ -63,7 +63,7 @@ public:
                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)
                {
@@ -105,11 +105,6 @@ 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()
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("blockcaps");
@@ -121,12 +116,12 @@ public:
                        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.");
+                       ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "<blockcaps:percent> out of range, setting to default of 100.");
                        percent = 100;
                }
-               if (minlen < 1 || minlen > MAXBUF-1)
+               if (minlen < 1 || minlen > ServerInstance->Config->Limits.MaxLine)
                {
-                       ServerInstance->Logs->Log("CONFIG",LOG_DEFAULT, "<blockcaps:minlen> out of range, setting to default of 1.");
+                       ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "<blockcaps:minlen> out of range, setting to default of 1.");
                        minlen = 1;
                }
        }