Move OnSync{Channel,Network,User} to ServerEventListener.

[user/henk/code/inspircd.git] / src / modules / m_censor.cpp

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index d2a60275a8705ee43c101ee90fc9644a70e045cd..6394ba9d011a357512157613abb47a575de3efa4 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -21,33 +21,24 @@
 
 
 #include "inspircd.h"
+#include "modules/exemption.h"
 
 typedef insp::flat_map<irc::string, irc::string> censor_t;
 
-/** Handles usermode +G
- */
-class CensorUser : public SimpleUserModeHandler
-{
- public:
-       CensorUser(Module* Creator) : SimpleUserModeHandler(Creator, "u_censor", 'G') { }
-};
-
-/** Handles channel mode +G
- */
-class CensorChannel : public SimpleChannelModeHandler
-{
- public:
-       CensorChannel(Module* Creator) : SimpleChannelModeHandler(Creator, "censor", 'G') { }
-};
-
 class ModuleCensor : public Module
 {
+       CheckExemption::EventProvider exemptionprov;
        censor_t censors;
-       CensorUser cu;
-       CensorChannel cc;
+       SimpleUserModeHandler cu;
+       SimpleChannelModeHandler cc;
 
  public:
-       ModuleCensor() : cu(this), cc(this) { }
+       ModuleCensor()
+               : exemptionprov(this)
+               , cu(this, "u_censor", 'G')
+               , cc(this, "censor", 'G')
+       {
+       }
 
        // format of a config entry is <badword text="shit" replace="poo">
        ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
@@ -63,7 +54,7 @@ class ModuleCensor : public Module
                {
                        Channel* c = (Channel*)dest;
                        active = c->IsModeSet(cc);
-                       ModResult res = ServerInstance->OnCheckExemption(user,c,"censor");
+                       ModResult res = CheckExemption::Call(exemptionprov, user, c, "censor");
 
                        if (res == MOD_RES_ALLOW)
                                return MOD_RES_PASSTHRU;