Update the module descriptions.

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

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 45f805ac9f493ee476ff2e3048304ad5fa5c4020..2a61478ab6e16822e7cd8974994e1cedc2342a92 100644 (file)
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -1,9 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2013, 2017-2018, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2004, 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006 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
@@ -49,7 +56,7 @@ class ModuleNoCTCP : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides user mode +T and channel mode +C to block CTCPs", VF_VENDOR);
+               return Version("Adds channel mode C (noctcp) which allows channels to block messages which contain CTCPs and user mode T (u_noctcp) which allows users to block private messages that contain CTCPs.", VF_VENDOR);
        }
 
        ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
@@ -81,9 +88,15 @@ class ModuleNoCTCP : public Module
                                if (res == MOD_RES_ALLOW)
                                        return MOD_RES_PASSTHRU;
 
-                               if (!c->GetExtBanStatus(user, 'C').check(!c->IsModeSet(nc)))
+                               if (c->IsModeSet(nc))
                                {
-                                       user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send CTCP to channel (+C is set)");
+                                       user->WriteNumeric(Numerics::CannotSendTo(c, "CTCPs", &nc));
+                                       return MOD_RES_DENY;
+                               }
+
+                               if (c->GetExtBanStatus(user, 'C') == MOD_RES_DENY)
+                               {
+                                       user->WriteNumeric(Numerics::CannotSendTo(c, "CTCPs", 'C', "noctcp"));
                                        return MOD_RES_DENY;
                                }
                                break;
@@ -96,7 +109,7 @@ class ModuleNoCTCP : public Module
                                User* u = target.Get<User>();
                                if (u->IsModeSet(ncu))
                                {
-                                       user->WriteNumeric(ERR_CANTSENDTOUSER, u->nick, "Can't send CTCP to user (+T is set)");
+                                       user->WriteNumeric(Numerics::CannotSendTo(u, "CTCPs", &ncu));
                                        return MOD_RES_DENY;
                                }
                                break;