stripcolor now strips from part messages (#1175)

[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 113c931cbaeff9a441f01bd719ba9fd6bfc8d46f..592aeda906407076a3262949331bd789e847abbc 100644 (file)
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -1,19 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2004, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
 
-/* $ModDesc: Provides channel +S mode (strip ansi colour) */
+#include "inspircd.h"
 
 /** Handles channel mode +S
  */
@@ -34,7 +40,6 @@ class UserStripColor : public SimpleUserModeHandler
 
 class ModuleStripColor : public Module
 {
-       bool AllowChanOps;
        ChannelStripColor csc;
        UserStripColor usc;
 
@@ -43,64 +48,12 @@ class ModuleStripColor : public Module
        {
        }
 
-       void init()
-       {
-               ServerInstance->Modules->AddService(usc);
-               ServerInstance->Modules->AddService(csc);
-               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
-       }
-
-       virtual ~ModuleStripColor()
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
+               tokens["EXTBAN"].push_back('S');
        }
 
-       virtual void On005Numeric(std::string &output)
-       {
-               ServerInstance->AddExtBanChar('S');
-       }
-
-       virtual void ReplaceLine(std::string &sentence)
-       {
-               /* refactor this completely due to SQUIT bug since the old code would strip last char and replace with \0 --peavey */
-               int seq = 0;
-               std::string::iterator i,safei;
-               for (i = sentence.begin(); i != sentence.end();)
-               {
-                       if ((*i == 3))
-                               seq = 1;
-                       else if (seq && (( ((*i >= '0') && (*i <= '9')) || (*i == ',') ) ))
-                       {
-                               seq++;
-                               if ( (seq <= 4) && (*i == ',') )
-                                       seq = 1;
-                               else if (seq > 3)
-                                       seq = 0;
-                       }
-                       else
-                               seq = 0;
-
-                       if (seq || ((*i == 2) || (*i == 15) || (*i == 22) || (*i == 21) || (*i == 31)))
-                       {
-                               if (i != sentence.begin())
-                               {
-                                       safei = i;
-                                       --i;
-                                       sentence.erase(safei);
-                                       ++i;
-                               }
-                               else
-                               {
-                                       sentence.erase(i);
-                                       i = sentence.begin();
-                               }
-                       }
-                       else
-                               ++i;
-               }
-       }
-
-       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 (!IS_LOCAL(user))
                        return MOD_RES_PASSTHRU;
@@ -109,36 +62,47 @@ class ModuleStripColor : public Module
                if (target_type == TYPE_USER)
                {
                        User* t = (User*)dest;
-                       active = t->IsModeSet('S');
+                       active = t->IsModeSet(usc);
                }
                else if (target_type == TYPE_CHANNEL)
                {
                        Channel* t = (Channel*)dest;
-                       ModResult res;
-                       FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,t,"stripcolor"));
+                       ModResult res = ServerInstance->OnCheckExemption(user,t,"stripcolor");
 
                        if (res == MOD_RES_ALLOW)
                                return MOD_RES_PASSTHRU;
 
-                       active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet('S'));
+                       active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet(csc));
                }
 
                if (active)
                {
-                       this->ReplaceLine(text);
+                       InspIRCd::StripColor(text);
                }
 
                return MOD_RES_PASSTHRU;
        }
 
-       virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       void OnUserPart(Membership* memb, std::string& partmessage, CUList& except_list) CXX11_OVERRIDE
        {
-               return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
+               User* user = memb->user;
+               Channel* channel = memb->chan;
+
+               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)
+               {
+                       InspIRCd::StripColor(partmessage);
+               }
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides channel +S mode (strip ansi colour)", VF_VENDOR);
+               return Version("Provides channel +S mode (strip ansi color)", VF_VENDOR);
        }
 
 };