Fix the cloaking module on C++98 compilers.

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

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 2883a3c6dced7820bf5c725b64ae426627ca6376..fe04f3204142ddcad4d4d554848fa7330215155a 100644 (file)
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -1,9 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2004, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2013, 2017, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Shawn Smith <ShawnSmith0828@gmail.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
+ *   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) 2007 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
@@ -49,11 +55,15 @@ class ModuleNoNotice : public Module
                        if (res == MOD_RES_ALLOW)
                                return MOD_RES_PASSTHRU;
 
-                       bool modeset = c->IsModeSet(nt);
-                       if (!c->GetExtBanStatus(user, 'T').check(!modeset))
+                       if (c->IsModeSet(nt))
                        {
-                               user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, InspIRCd::Format("Can't send NOTICE to channel (%s)",
-                                       modeset ? "+T is set" : "you're extbanned"));
+                               user->WriteNumeric(Numerics::CannotSendTo(c, "notices", &nt));
+                               return MOD_RES_DENY;
+                       }
+
+                       if (c->GetExtBanStatus(user, 'T') == MOD_RES_DENY)
+                       {
+                               user->WriteNumeric(Numerics::CannotSendTo(c, "notices", 'T', "nonotice"));
                                return MOD_RES_DENY;
                        }
                }
@@ -62,7 +72,7 @@ class ModuleNoNotice : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides channel mode +T to block notices to the channel", VF_VENDOR);
+               return Version("Adds channel mode T (nonotice) which allows channels to block messages sent with the /NOTICE command.", VF_VENDOR);
        }
 };