Some more text fixes and improvements (#1618).

[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 ba66d17b5c164c3c019905ec84583edb24b8e8a4..6ea279422e4f9b237d606e5c4640a5a3f5cc978f 100644 (file)
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -20,62 +20,42 @@
 
 
 #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')
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->AddService(usc);
-               ServerInstance->Modules->AddService(csc);
-               Implementation eventlist[] = { I_OnUserPreMessage, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-       }
-
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
                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)
+               if (target.type == MessageTarget::TYPE_USER)
                {
-                       User* t = (User*)dest;
+                       User* t = target.Get<User>();
                        active = t->IsModeSet(usc);
                }
-               else if (target_type == TYPE_CHANNEL)
+               else if (target.type == MessageTarget::TYPE_CHANNEL)
                {
-                       Channel* t = (Channel*)dest;
-                       ModResult res = ServerInstance->OnCheckExemption(user,t,"stripcolor");
+                       Channel* t = target.Get<Channel>();
+                       ModResult res = CheckExemption::Call(exemptionprov, user, t, "stripcolor");
 
                        if (res == MOD_RES_ALLOW)
                                return MOD_RES_PASSTHRU;
@@ -85,15 +65,32 @@ class ModuleStripColor : public Module
 
                if (active)
                {
-                       InspIRCd::StripColor(text);
+                       InspIRCd::StripColor(details.text);
                }
 
                return MOD_RES_PASSTHRU;
        }
 
+       void OnUserPart(Membership* memb, std::string& partmessage, CUList& except_list) CXX11_OVERRIDE
+       {
+               User* user = memb->user;
+               Channel* channel = memb->chan;
+
+               if (!IS_LOCAL(user))
+                       return;
+
+               if (channel->GetExtBanStatus(user, 'S').check(!user->IsModeSet(csc)))
+               {
+                       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);
        }
 
 };