Convert WriteNumeric() calls to pass the parameters of the numeric as method parameters

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

diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index 81b9b888f4fff7724b8e1c8acb0d31bcc0194ff7..b90f3f2343e0652c9147c75808af47ea8f28ece6 100644 (file)
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -26,18 +26,37 @@
 class HideOper : public SimpleUserModeHandler
 {
  public:
+       size_t opercount;
+
        HideOper(Module* Creator) : SimpleUserModeHandler(Creator, "hideoper", 'H')
+               , opercount(0)
        {
                oper = true;
        }
+
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding)
+       {
+               if (SimpleUserModeHandler::OnModeChange(source, dest, channel, parameter, adding) == MODEACTION_DENY)
+                       return MODEACTION_DENY;
+
+               if (adding)
+                       opercount++;
+               else
+                       opercount--;
+
+               return MODEACTION_ALLOW;
+       }
 };
 
-class ModuleHideOper : public Module
+class ModuleHideOper : public Module, public Whois::LineEventListener
 {
        HideOper hm;
+       bool active;
  public:
        ModuleHideOper()
-               : hm(this)
+               : Whois::LineEventListener(this)
+               , hm(this)
+               , active(false)
        {
        }
 
@@ -46,7 +65,29 @@ class ModuleHideOper : public Module
                return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR);
        }
 
-       ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) CXX11_OVERRIDE
+       void OnUserQuit(User* user, const std::string&, const std::string&) CXX11_OVERRIDE
+       {
+               if (user->IsModeSet(hm))
+                       hm.opercount--;
+       }
+
+       ModResult OnNumeric(User* user, const Numeric::Numeric& numeric) CXX11_OVERRIDE
+       {
+               if (numeric.GetNumeric() != 252 || active || user->HasPrivPermission("users/auspex"))
+                       return MOD_RES_PASSTHRU;
+
+               // If there are no visible operators then we shouldn't send the numeric.
+               size_t opercount = ServerInstance->Users->all_opers.size() - hm.opercount;
+               if (opercount)
+               {
+                       active = true;
+                       user->WriteNumeric(252, opercount, "operator(s) online");
+                       active = false;
+               }
+               return MOD_RES_DENY;
+       }
+
+       ModResult OnWhoisLine(Whois::Context& whois, unsigned int& numeric, std::string& text) CXX11_OVERRIDE
        {
                /* Dont display numeric 313 (RPL_WHOISOPER) if they have +H set and the
                 * person doing the WHOIS is not an oper
@@ -54,10 +95,10 @@ class ModuleHideOper : public Module
                if (numeric != 313)
                        return MOD_RES_PASSTHRU;
 
-               if (!dest->IsModeSet(hm))
+               if (!whois.GetTarget()->IsModeSet(hm))
                        return MOD_RES_PASSTHRU;
 
-               if (!user->HasPrivPermission("users/auspex"))
+               if (!whois.GetSource()->HasPrivPermission("users/auspex"))
                        return MOD_RES_DENY;
 
                return MOD_RES_PASSTHRU;