Fix the cloaking module on C++98 compilers.

[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 3a57dc184d46ecd46dbf19c9e67cf169ef6ddb50..b7cb84101edbefafab0075d1b5b675aa1c878e4d 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-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) 2004, 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
@@ -61,27 +68,54 @@ class ModuleNoCTCP : public Module
                if (!details.IsCTCP(ctcpname) || irc::equals(ctcpname, "ACTION"))
                        return MOD_RES_PASSTHRU;
 
-               if (target.type == MessageTarget::TYPE_CHANNEL)
+               switch (target.type)
                {
-                       Channel* c = target.Get<Channel>();
-                       ModResult res = CheckExemption::Call(exemptionprov, user, c, "noctcp");
-                       if (res == MOD_RES_ALLOW)
-                               return MOD_RES_PASSTHRU;
-
-                       if (!c->GetExtBanStatus(user, 'C').check(!c->IsModeSet(nc)))
+                       case MessageTarget::TYPE_CHANNEL:
                        {
-                               user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send CTCP to channel (+C set)");
-                               return MOD_RES_DENY;
+                               if (user->HasPrivPermission("channels/ignore-noctcp"))
+                                       return MOD_RES_PASSTHRU;
+
+                               Channel* c = target.Get<Channel>();
+                               const Channel::MemberMap& members = c->GetUsers();
+                               for (Channel::MemberMap::const_iterator member = members.begin(); member != members.end(); ++member)
+                               {
+                                       User* u = member->first;
+                                       if (u->IsModeSet(ncu))
+                                               details.exemptions.insert(u);
+                               }
+
+                               ModResult res = CheckExemption::Call(exemptionprov, user, c, "noctcp");
+                               if (res == MOD_RES_ALLOW)
+                                       return MOD_RES_PASSTHRU;
+
+                               if (c->IsModeSet(nc))
+                               {
+                                       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;
                        }
-               }
-               else if (target.type == MessageTarget::TYPE_USER)
-               {
-                       User* u = target.Get<User>();
-                       if (u->IsModeSet(ncu))
+                       case MessageTarget::TYPE_USER:
                        {
-                               user->WriteNumeric(ERR_CANTSENDTOUSER, u->nick, "Can't send CTCP to user (+T set)");
-                               return MOD_RES_DENY;
+                               if (user->HasPrivPermission("users/ignore-noctcp"))
+                                       return MOD_RES_PASSTHRU;
+
+                               User* u = target.Get<User>();
+                               if (u->IsModeSet(ncu))
+                               {
+                                       user->WriteNumeric(Numerics::CannotSendTo(u, "CTCPs", &ncu));
+                                       return MOD_RES_DENY;
+                               }
+                               break;
                        }
+                       case MessageTarget::TYPE_SERVER:
+                               break;
                }
                return MOD_RES_PASSTHRU;
        }