Replace hardcoded mode letters, part 3

[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 e6585e524cc9d51050659789942eb1dada2e770f..fdc45a97ec9ba54e6033f0658c4831dfda383137 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -27,9 +27,7 @@
 #define _SCL_SECURE_NO_DEPRECATE
 
 #include "inspircd.h"
-#include "u_listmode.h"
-
-/* $ModDesc: Provides channel-specific censor lists (like mode +G but varies from channel to channel) */
+#include "listmode.h"
 
 /** Handles channel mode +g
  */
@@ -38,7 +36,7 @@ class ChanFilter : public ListModeBase
  public:
        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)
+       bool ValidateParam(User* user, Channel* chan, std::string &word)
        {
                if ((word.length() > 35) || (word.empty()))
                {
@@ -49,18 +47,17 @@ class ChanFilter : public ListModeBase
                return true;
        }
 
-       virtual bool TellListTooLong(User* user, Channel* chan, std::string &word)
+       void TellListTooLong(User* user, Channel* chan, std::string &word)
        {
                user->WriteNumeric(939, "%s %s %s :Channel spamfilter list is full", user->nick.c_str(), chan->name.c_str(), word.c_str());
-               return true;
        }
 
-       virtual void TellAlreadyOnList(User* user, Channel* chan, std::string &word)
+       void TellAlreadyOnList(User* user, Channel* chan, std::string &word)
        {
                user->WriteNumeric(937, "%s %s :The word %s is already on the spamfilter list",user->nick.c_str(), chan->name.c_str(), word.c_str());
        }
 
-       virtual void TellNotSet(User* user, Channel* chan, std::string &word)
+       void TellNotSet(User* user, Channel* chan, std::string &word)
        {
                user->WriteNumeric(938, "%s %s :No such spamfilter word is set",user->nick.c_str(), chan->name.c_str());
        }
@@ -76,35 +73,37 @@ class ModuleChanFilter : public Module
        ModuleChanFilter()
                : cf(this)
        {
-               if (!ServerInstance->Modes->AddMode(&cf))
-                       throw ModuleException("Could not add new modes!");
+       }
+
+       void init() CXX11_OVERRIDE
+       {
+               ServerInstance->Modules->AddService(cf);
 
                cf.DoImplements(this);
-               Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
+               Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnSyncChannel };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 
                OnRehash(NULL);
        }
 
-       virtual void OnRehash(User* user)
+       void OnRehash(User* user) CXX11_OVERRIDE
        {
-               ConfigReader Conf;
-               hidemask = Conf.ReadFlag("chanfilter", "hidemask", 0);
+               hidemask = ServerInstance->Config->ConfValue("chanfilter")->getBool("hidemask");
                cf.DoRehash();
        }
 
-       virtual ModResult ProcessMessages(User* user,Channel* chan,std::string &text)
+       ModResult ProcessMessages(User* user,Channel* chan,std::string &text)
        {
                ModResult res = ServerInstance->OnCheckExemption(user,chan,"filter");
 
                if (!IS_LOCAL(user) || res == MOD_RES_ALLOW)
                        return MOD_RES_PASSTHRU;
 
-               modelist* list = cf.extItem.get(chan);
+               ListModeBase::ModeList* list = cf.GetList(chan);
 
                if (list)
                {
-                       for (modelist::iterator i = list->begin(); i != list->end(); i++)
+                       for (ListModeBase::ModeList::iterator i = list->begin(); i != list->end(); i++)
                        {
                                if (InspIRCd::Match(text, i->mask))
                                {
@@ -120,7 +119,7 @@ class ModuleChanFilter : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       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)
                {
@@ -129,29 +128,15 @@ class ModuleChanFilter : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       virtual void OnCleanup(int target_type, void* item)
-       {
-               cf.DoCleanup(target_type, item);
-       }
-
-       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 void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
+       void OnSyncChannel(Channel* chan, Module* proto, void* opaque) CXX11_OVERRIDE
        {
                cf.DoSyncChannel(chan, proto, opaque);
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_VENDOR);
        }
-
-       virtual ~ModuleChanFilter()
-       {
-       }
 };
 
 MODULE_INIT(ModuleChanFilter)