Fix an shadowing warning in the spanningtree module.

[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 592aeda906407076a3262949331bd789e847abbc..a309492eb54250fbbf441c806751e35ee69ab9eb 100644 (file)
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -20,31 +20,19 @@
 
 
 #include "inspircd.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') { }
-};
-
+#include "modules/exemption.h"
 
 class ModuleStripColor : public Module
 {
-       ChannelStripColor csc;
-       UserStripColor usc;
+       CheckExemption::EventProvider exemptionprov;
+       SimpleChannelModeHandler csc;
+       SimpleUserModeHandler usc;
 
  public:
-       ModuleStripColor() : csc(this), usc(this)
+       ModuleStripColor()
+               : exemptionprov(this)
+               , csc(this, "stripcolor", 'S')
+               , usc(this, "u_stripcolor", 'S')
        {
        }
 
@@ -53,31 +41,38 @@ class ModuleStripColor : public Module
                tokens["EXTBAN"].push_back('S');
        }
 
-       ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
+       ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
        {
                if (!IS_LOCAL(user))
                        return MOD_RES_PASSTHRU;
 
                bool active = false;
-               if (target_type == TYPE_USER)
+               switch (target.type)
                {
-                       User* t = (User*)dest;
-                       active = t->IsModeSet(usc);
-               }
-               else if (target_type == TYPE_CHANNEL)
-               {
-                       Channel* t = (Channel*)dest;
-                       ModResult res = ServerInstance->OnCheckExemption(user,t,"stripcolor");
-
-                       if (res == MOD_RES_ALLOW)
-                               return MOD_RES_PASSTHRU;
-
-                       active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet(csc));
+                       case MessageTarget::TYPE_USER:
+                       {
+                               User* t = target.Get<User>();
+                               active = t->IsModeSet(usc);
+                               break;
+                       }
+                       case MessageTarget::TYPE_CHANNEL:
+                       {
+                               Channel* t = target.Get<Channel>();
+                               ModResult res = CheckExemption::Call(exemptionprov, user, t, "stripcolor");
+
+                               if (res == MOD_RES_ALLOW)
+                                       return MOD_RES_PASSTHRU;
+
+                               active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet(csc));
+                               break;
+                       }
+                       case MessageTarget::TYPE_SERVER:
+                               break;
                }
 
                if (active)
                {
-                       InspIRCd::StripColor(text);
+                       InspIRCd::StripColor(details.text);
                }
 
                return MOD_RES_PASSTHRU;
@@ -91,18 +86,18 @@ class ModuleStripColor : public Module
                if (!IS_LOCAL(user))
                        return;
 
-               bool active = channel->GetExtBanStatus(user, 'S').check(!user->IsModeSet(csc))
-                       && ServerInstance->OnCheckExemption(user, channel, "stripcolor") != MOD_RES_ALLOW;
-
-               if (active)
+               if (channel->GetExtBanStatus(user, 'S').check(!user->IsModeSet(csc)))
                {
-                       InspIRCd::StripColor(partmessage);
+                       ModResult res = CheckExemption::Call(exemptionprov, user, channel, "stripcolor");
+
+                       if (res != MOD_RES_ALLOW)
+                               InspIRCd::StripColor(partmessage);
                }
        }
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides channel +S mode (strip ansi color)", VF_VENDOR);
+               return Version("Provides channel mode +S, strip ansi color", VF_VENDOR);
        }
 
 };