diff options
| author |  Sadie Powell | 2020-02-04 12:26:25 +0000 |
|---|---|---|
| committer | Sadie Powell | 2020-02-04 12:26:25 +0000 |
| commit | 6da4987073aad99061360bc54022e342e3a0f555 (patch) | |
| tree | d4e8cca5270013eed9915fe740f346cd6890a7c4 /src/modules/m_censor.cpp | |
| parent | Various CI improvements. (diff) | |
| parent | Include the ABI version with the incompatible module error message. (diff) | |
| download | inspircd++-6da4987073aad99061360bc54022e342e3a0f555.tar.gz inspircd++-6da4987073aad99061360bc54022e342e3a0f555.tar.bz2 inspircd++-6da4987073aad99061360bc54022e342e3a0f555.zip | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/m_censor.cpp')
| -rw-r--r-- | src/modules/m_censor.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index ba1c198a9..c7fd1ace8 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> @@ -52,8 +52,6 @@ class ModuleCensor : public Module return MOD_RES_PASSTHRU; int numeric = 0; - const char* targetname = NULL; - switch (target.type) { case MessageTarget::TYPE_USER: @@ -63,7 +61,6 @@ class ModuleCensor : public Module return MOD_RES_PASSTHRU; numeric = ERR_CANTSENDTOUSER; - targetname = targuser->nick.c_str(); break; } @@ -78,7 +75,6 @@ class ModuleCensor : public Module return MOD_RES_PASSTHRU; numeric = ERR_CANNOTSENDTOCHAN; - targetname = targchan->name.c_str(); break; } @@ -93,7 +89,7 @@ class ModuleCensor : public Module { if (index->second.empty()) { - user->WriteNumeric(numeric, targetname, "Your message contained a censored word (" + index->first + "), and was blocked"); + user->WriteNumeric(numeric, target.GetName(), "Your message contained a censored word (" + index->first + "), and was blocked"); return MOD_RES_DENY; } |