Add support for blocking tag messages with the deaf mode.

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

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 6863fc2441bf6858f4e65a140ef8ad8d674189e7..9e30ceca2a95dc6a9b72a38ff7dc696728bedb5f 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -1,10 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2013, 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>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2004, 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   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
@@ -63,15 +66,10 @@ class ModuleOperChans : public Module
                if (!user->IsOper())
                        return MOD_RES_PASSTHRU;
 
-               // Check whether the oper's type matches the ban.
-               const std::string submask = mask.substr(2);
-               if (InspIRCd::Match(user->oper->name, submask))
-                       return MOD_RES_DENY;
-
-               // If the oper's type contains spaces recheck with underscores.
+               // Replace spaces with underscores as they're prohibited in mode parameters.
                std::string opername(user->oper->name);
                stdalgo::string::replace_all(opername, space, underscore);
-               if (InspIRCd::Match(opername, submask))
+               if (InspIRCd::Match(opername, mask.substr(2)))
                        return MOD_RES_DENY;
 
                return MOD_RES_PASSTHRU;
@@ -84,7 +82,7 @@ class ModuleOperChans : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for oper-only channels via channel mode +O and extban 'O'", VF_VENDOR);
+               return Version("Adds channel mode O (operonly) which prevents non-server operators from joining the channel.", VF_VENDOR);
        }
 };