Run configure -update on all svn/git changes

[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 d9808642102063013e787b2245e827d343e033ec..7c28036b74bb0bd691775a47d6c2e269839afb6d 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -25,7 +25,7 @@
 class ChanFilter : public ListModeBase
 {
  public:
-       ChanFilter(InspIRCd* Instance) : ListModeBase(Instance, 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { }
+       ChanFilter(InspIRCd* Instance, Module* Creator) : ListModeBase(Instance, Creator, 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { }
 
        virtual bool ValidateParam(User* user, Channel* chan, std::string &word)
        {
@@ -63,7 +63,7 @@ class ModuleChanFilter : public Module
  public:
 
        ModuleChanFilter(InspIRCd* Me)
-               : Module(Me), cf(Me)
+               : Module(Me), cf(Me, this)
        {
                if (!ServerInstance->Modes->AddMode(&cf))
                        throw ModuleException("Could not add new modes!");
@@ -76,11 +76,6 @@ class ModuleChanFilter : public Module
                ServerInstance->Modules->PublishInterface("ChannelBanList", this);
        }
 
-       virtual void OnChannelDelete(Channel* chan)
-       {
-               cf.DoChannelDelete(chan);
-       }
-
        virtual void OnRehash(User* user)
        {
                ConfigReader Conf(ServerInstance);
@@ -88,13 +83,12 @@ class ModuleChanFilter : public Module
                cf.DoRehash();
        }
 
-       virtual int ProcessMessages(User* user,Channel* chan,std::string &text)
+       virtual ModResult ProcessMessages(User* user,Channel* chan,std::string &text)
        {
-               if (!IS_LOCAL(user) || (CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetStatus(user) == STATUS_OP))
-                       return 0;
+               if (!IS_LOCAL(user) || (CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetPrefixValue(user) == OP_VALUE))
+                       return MOD_RES_PASSTHRU;
 
-               modelist* list;
-               chan->GetExt(cf.GetInfoKey(), list);
+               modelist* list = cf.extItem.get(chan);
 
                if (list)
                {
@@ -106,21 +100,21 @@ class ModuleChanFilter : public Module
                                                user->WriteNumeric(404, "%s %s :Cannot send to channel (your message contained a censored word)",user->nick.c_str(), chan->name.c_str());
                                        else
                                                user->WriteNumeric(404, "%s %s %s :Cannot send to channel (your message contained a censored word)",user->nick.c_str(), chan->name.c_str(), i->mask.c_str());
-                                       return 1;
+                                       return MOD_RES_DENY;
                                }
                        }
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
                        return ProcessMessages(user,(Channel*)dest,text);
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual void OnCleanup(int target_type, void* item)
@@ -133,7 +127,7 @@ class ModuleChanFilter : public Module
                return cf.DoOnRequest(request);
        }
 
-       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       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);
        }
@@ -145,7 +139,7 @@ class ModuleChanFilter : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
        virtual ~ModuleChanFilter()