Fix a bunch of weird indentation and spacing issues.

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

diff --git a/src/modules/m_hidemode.cpp b/src/modules/m_hidemode.cpp
index d6ae05801cb58e4e4b21459e3ee3d17287a637e4..3f041344f1ceb53a3366b6f93423bbc6e0e9647d 100644 (file)
--- a/src/modules/m_hidemode.cpp
+++ b/src/modules/m_hidemode.cpp
@@ -1,7 +1,10 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018 Attila Molnar <attilamolnar@hush.com>
  *
  * 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
@@ -37,20 +40,24 @@ class Settings
 
        void Load()
        {
-               rankstosee.clear();
+               RanksToSeeMap newranks;
 
                ConfigTagList tags = ServerInstance->Config->ConfTags("hidemode");
                for (ConfigIter i = tags.first; i != tags.second; ++i)
                {
                        ConfigTag* tag = i->second;
-                       std::string modename = tag->getString("mode");
-                       unsigned int rank = tag->getInt("rank", 0, 0);
-                       if (!modename.empty() && rank)
-                       {
-                               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Hiding the %s mode from users below rank %u", modename.c_str(), rank);
-                               rankstosee.insert(std::make_pair(modename, rank));
-                       }
+                       const std::string modename = tag->getString("mode");
+                       if (modename.empty())
+                               throw ModuleException("<hidemode:mode> is empty at " + tag->getTagLocation());
+
+                       unsigned int rank = tag->getUInt("rank", 0);
+                       if (!rank)
+                               throw ModuleException("<hidemode:rank> must be greater than 0 at " + tag->getTagLocation());
+
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Hiding the %s mode from users below rank %u", modename.c_str(), rank);
+                       newranks.insert(std::make_pair(modename, rank));
                }
+               rankstosee.swap(newranks);
        }
 };
 
@@ -84,7 +91,7 @@ class ModeHook : public ClientProtocol::EventHook
                        const Modes::Change& curr = *i;
                        if (settings.GetRequiredRank(*curr.mh) <= rank)
                        {
-                                // No restriction on who can see this mode or there is one but the member's rank is sufficient
+                               // No restriction on who can see this mode or there is one but the member's rank is sufficient
                                if (modechangelist)
                                        modechangelist->push(curr);
 
@@ -126,6 +133,9 @@ class ModeHook : public ClientProtocol::EventHook
                if (!chan)
                        return MOD_RES_PASSTHRU;
 
+               if (user->HasPrivPermission("channels/auspex"))
+                       return MOD_RES_PASSTHRU;
+
                Membership* const memb = chan->GetUser(user);
                if (!memb)
                        return MOD_RES_PASSTHRU;
@@ -191,7 +201,7 @@ class ModuleHideMode : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for hiding mode changes", VF_VENDOR);
+               return Version("Allows mode changes to be hidden from users without a prefix mode ranked equal to or higher than a defined level.", VF_VENDOR);
        }
 };