X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=00981aa5363a1ca2a46d5346c02285047980fd89;hb=5fe9da839cc387244f9d34aececd6aa28f551c90;hp=0a83707e916b491648c3c73cace0a54bd3c5078e;hpb=a697104a8c768228ce494967c11ff669d4aa3555;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 0a83707e9..00981aa53 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -2,7 +2,7 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
- *   Copyright (C) 2013, 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2017-2018, 2020 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>
@@ -51,7 +51,6 @@ class ModuleCensor : public Module
 		if (!IS_LOCAL(user))
 			return MOD_RES_PASSTHRU;
 
-		int numeric = 0;
 		switch (target.type)
 		{
 			case MessageTarget::TYPE_USER:
@@ -59,8 +58,6 @@ class ModuleCensor : public Module
 				User* targuser = target.Get<User>();
 				if (!targuser->IsModeSet(cu))
 					return MOD_RES_PASSTHRU;
-
-				numeric = ERR_CANTSENDTOUSER;
 				break;
 			}
 
@@ -73,8 +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;
 				break;
 			}
 
@@ -89,7 +84,11 @@ class ModuleCensor : public Module
 			{
 				if (index->second.empty())
 				{
-					user->WriteNumeric(numeric, target.GetName(), "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;
 				}
 
@@ -123,7 +122,7 @@ class ModuleCensor : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides user and channel mode +G", 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);
 	}
 
 };