Fix unnecessary inlining in command handler constructors.

[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 730b0271693dffc199aa36e352816816d3f21df1..bff5bba2d4b82ced135a6fb7f2c6b7d3fee8e139 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 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) 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
@@ -41,20 +47,20 @@ class ModuleNoNotice : public Module
 
        ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
        {
-               ModResult res;
                if ((details.type == MSG_NOTICE) && (target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
                        Channel* c = target.Get<Channel>();
-                       if (!c->GetExtBanStatus(user, 'T').check(!c->IsModeSet(nt)))
+
+                       ModResult res = CheckExemption::Call(exemptionprov, user, c, "nonotice");
+                       if (res == MOD_RES_ALLOW)
+                               return MOD_RES_PASSTHRU;
+
+                       bool modeset = c->IsModeSet(nt);
+                       if (!c->GetExtBanStatus(user, 'T').check(!modeset))
                        {
-                               res = CheckExemption::Call(exemptionprov, user, c, "nonotice");
-                               if (res == MOD_RES_ALLOW)
-                                       return MOD_RES_PASSTHRU;
-                               else
-                               {
-                                       user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send NOTICE to channel (+T is set)");
-                                       return MOD_RES_DENY;
-                               }
+                               user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, InspIRCd::Format("Can't send NOTICE to channel (%s)",
+                                       modeset ? "+T is set" : "you're extbanned"));
+                               return MOD_RES_DENY;
                        }
                }
                return MOD_RES_PASSTHRU;