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

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

diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 6ad32bfc1010207530b46b36c976b3fa857f50ce..8068d8b7ed5eb4f79e5d80af3b8d374272fd1665 100644 (file)
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -22,34 +22,17 @@
 #include "inspircd.h"
 #include "modules/exemption.h"
 
-/** Handles channel mode +S
- */
-class ChannelStripColor : public SimpleChannelModeHandler
-{
- public:
-       ChannelStripColor(Module* Creator) : SimpleChannelModeHandler(Creator, "stripcolor", 'S') { }
-};
-
-/** Handles user mode +S
- */
-class UserStripColor : public SimpleUserModeHandler
-{
- public:
-       UserStripColor(Module* Creator) : SimpleUserModeHandler(Creator, "u_stripcolor", 'S') { }
-};
-
-
 class ModuleStripColor : public Module
 {
        CheckExemption::EventProvider exemptionprov;
-       ChannelStripColor csc;
-       UserStripColor usc;
+       SimpleChannelModeHandler csc;
+       SimpleUserModeHandler usc;
 
  public:
        ModuleStripColor()
                : exemptionprov(this)
-               , csc(this)
-               , usc(this)
+               , csc(this, "stripcolor", 'S')
+               , usc(this, "u_stripcolor", 'S')
        {
        }
 
@@ -72,8 +55,7 @@ class ModuleStripColor : public Module
                else if (target_type == TYPE_CHANNEL)
                {
                        Channel* t = (Channel*)dest;
-                       ModResult res;
-                       FIRST_MOD_RESULT_CUSTOM(exemptionprov, CheckExemption::EventListener, OnCheckExemption, res, (user, t, "stripcolor"));
+                       ModResult res = CheckExemption::Call(exemptionprov, user, t, "stripcolor");
 
                        if (res == MOD_RES_ALLOW)
                                return MOD_RES_PASSTHRU;
@@ -99,8 +81,7 @@ class ModuleStripColor : public Module
 
                if (channel->GetExtBanStatus(user, 'S').check(!user->IsModeSet(csc)))
                {
-                       ModResult res;
-                       FIRST_MOD_RESULT_CUSTOM(exemptionprov, CheckExemption::EventListener, OnCheckExemption, res, (user, channel, "stripcolor"));
+                       ModResult res = CheckExemption::Call(exemptionprov, user, channel, "stripcolor");
 
                        if (res != MOD_RES_ALLOW)
                                InspIRCd::StripColor(partmessage);