Move static map of extensions into ServerInstance, add const-correctness

[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 b517d363e5bea15b21b9e03c1caab6d8e7288eac..25321536afc2fc66f151a3238e4dd6b7c6d57c8f 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -25,7 +25,7 @@
 class ChanFilter : public ListModeBase
 {
  public:
-       ChanFilter(Module* Creator) : ListModeBase(Creator, '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, "chanfilter") { }
 
        virtual bool ValidateParam(User* user, Channel* chan, std::string &word)
        {
@@ -69,8 +69,8 @@ class ModuleChanFilter : public Module
                        throw ModuleException("Could not add new modes!");
 
                cf.DoImplements(this);
-               Implementation eventlist[] = { I_OnCleanup, I_OnChannelDelete, I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel };
-               ServerInstance->Modules->Attach(eventlist, this, 6);
+               Implementation eventlist[] = { I_OnChannelDelete, I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel };
+               ServerInstance->Modules->Attach(eventlist, this, 5);
 
                OnRehash(NULL);
                ServerInstance->Modules->PublishInterface("ChannelBanList", this);
@@ -85,7 +85,10 @@ class ModuleChanFilter : public Module
 
        virtual ModResult ProcessMessages(User* user,Channel* chan,std::string &text)
        {
-               if (!IS_LOCAL(user) || (CHANOPS_EXEMPT('g') && chan->GetPrefixValue(user) == OP_VALUE))
+               ModResult res;
+               FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,chan,"filter"));
+
+               if (!IS_LOCAL(user) || res == MOD_RES_ALLOW)
                        return MOD_RES_PASSTHRU;
 
                modelist* list = cf.extItem.get(chan);
@@ -122,11 +125,6 @@ class ModuleChanFilter : public Module
                cf.DoCleanup(target_type, item);
        }
 
-       virtual const char* OnRequest(Request* request)
-       {
-               return cf.DoOnRequest(request);
-       }
-
        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);