Add support for blocking tag messages with the deaf mode.

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

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 43d0826dd7138954b28f61acb66d5bc00008bcd9..c5dc35fe371b52fc1881a6686716b3fdc2c52772 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -1,11 +1,17 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2004-2006, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2013, 2017, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2018 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 Shawn Smith <ShawnSmith0828@gmail.com>
+ *   Copyright (C) 2012 DjSlash <djslash@djslash.org>
+ *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2005, 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -46,26 +52,24 @@ class ModuleBlockColor : public Module
                if ((target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
                        Channel* c = target.Get<Channel>();
-                       ModResult res = CheckExemption::Call(exemptionprov, user, c, "blockcolor");
 
+                       ModResult res = CheckExemption::Call(exemptionprov, user, c, "blockcolor");
                        if (res == MOD_RES_ALLOW)
                                return MOD_RES_PASSTHRU;
 
-                       if (!c->GetExtBanStatus(user, 'c').check(!c->IsModeSet(bc)))
+                       bool modeset = c->IsModeSet(bc);
+                       if (!c->GetExtBanStatus(user, 'c').check(!modeset))
                        {
                                for (std::string::iterator i = details.text.begin(); i != details.text.end(); i++)
                                {
-                                       switch (*i)
+                                       // Block all control codes except \001 for CTCP
+                                       if ((*i >= 0) && (*i < 32) && (*i != 1))
                                        {
-                                               case 2:
-                                               case 3:
-                                               case 15:
-                                               case 21:
-                                               case 22:
-                                               case 31:
-                                                       user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send colors to channel (+c set)");
-                                                       return MOD_RES_DENY;
-                                               break;
+                                               if (modeset)
+                                                       user->WriteNumeric(Numerics::CannotSendTo(c, "messages containing formatting characters", &bc));
+                                               else
+                                                       user->WriteNumeric(Numerics::CannotSendTo(c, "messages containing formatting characters", 'c', "nocolor"));
+                                               return MOD_RES_DENY;
                                        }
                                }
                        }
@@ -75,7 +79,7 @@ class ModuleBlockColor : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides channel mode +c to block color",VF_VENDOR);
+               return Version("Adds channel mode c (blockcolor) which allows channels to block messages which contain IRC formatting codes.",VF_VENDOR);
        }
 };