Update copyright headers.

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

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 31309ed2f013a56e71fea5c90c4f814c42fc65a7..c13c677e9b923913c933a470693df6f850ed1822 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -1,10 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2004, 2008-2009 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2013, 2017-2018, 2020-2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2013 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2005, 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2005, 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004, 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
@@ -23,12 +28,12 @@
 #include "inspircd.h"
 #include "modules/exemption.h"
 
-typedef insp::flat_map<std::string, std::string, irc::insensitive_swo> censor_t;
+typedef insp::flat_map<std::string, std::string, irc::insensitive_swo> CensorMap;
 
 class ModuleCensor : public Module
 {
        CheckExemption::EventProvider exemptionprov;
-       censor_t censors;
+       CensorMap censors;
        SimpleUserModeHandler cu;
        SimpleChannelModeHandler cc;
 
@@ -46,9 +51,6 @@ class ModuleCensor : public Module
                if (!IS_LOCAL(user))
                        return MOD_RES_PASSTHRU;
 
-               int numeric = 0;
-               const char* targetname = NULL;
-
                switch (target.type)
                {
                        case MessageTarget::TYPE_USER:
@@ -56,9 +58,6 @@ class ModuleCensor : public Module
                                User* targuser = target.Get<User>();
                                if (!targuser->IsModeSet(cu))
                                        return MOD_RES_PASSTHRU;
-
-                               numeric = ERR_CANTSENDTOUSER;
-                               targetname = targuser->nick.c_str();
                                break;
                        }
 
@@ -71,9 +70,6 @@ class ModuleCensor : public Module
                                ModResult result = CheckExemption::Call(exemptionprov, user, targchan, "censor");
                                if (result == MOD_RES_ALLOW)
                                        return MOD_RES_PASSTHRU;
-
-                               numeric = ERR_CANNOTSENDTOCHAN;
-                               targetname = targchan->name.c_str();
                                break;
                        }
 
@@ -81,14 +77,18 @@ class ModuleCensor : public Module
                                return MOD_RES_PASSTHRU;
                }
 
-               for (censor_t::iterator index = censors.begin(); index != censors.end(); index++)
+               for (CensorMap::const_iterator index = censors.begin(); index != censors.end(); ++index)
                {
                        size_t censorpos;
                        while ((censorpos = irc::find(details.text, index->first)) != std::string::npos)
                        {
                                if (index->second.empty())
                                {
-                                       user->WriteNumeric(numeric, targetname, "Your message contained a censored word (" + index->first + "), and was blocked");
+                                       const std::string msg = InspIRCd::Format("Your message to this channel contained a banned phrase (%s) and was blocked.", index->first.c_str());
+                                       if (target.type == MessageTarget::TYPE_CHANNEL)
+                                               user->WriteNumeric(Numerics::CannotSendTo(target.Get<Channel>(), msg));
+                                       else
+                                               user->WriteNumeric(Numerics::CannotSendTo(target.Get<User>(), msg));
                                        return MOD_RES_DENY;
                                }
 
@@ -104,8 +104,7 @@ class ModuleCensor : public Module
                 * reload our config file on rehash - we must destroy and re-allocate the classes
                 * to call the constructor again and re-read our data.
                 */
-               censor_t newcensors;
-
+               CensorMap newcensors;
                ConfigTagList badwords = ServerInstance->Config->ConfTags("badword");
                for (ConfigIter i = badwords.first; i != badwords.second; ++i)
                {
@@ -122,7 +121,7 @@ class ModuleCensor : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides user and channel +G mode",VF_VENDOR);
+               return Version("Allows the server administrator to define inappropriate phrases that are not allowed to be used in private or channel messages.", VF_VENDOR);
        }
 
 };