m_chanfilter: Apply filters to part messages (#1702)

[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 2bca0a1569cb1444548bb4319e51ec77f3943a64..d78ed538b64e2046fad85617897f777b734c6b32 100644 (file)
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -21,6 +21,7 @@
 
 #include "inspircd.h"
 #include "modules/stats.h"
+#include "modules/who.h"
 #include "modules/whois.h"
 
 /** Handles user mode +H
@@ -50,13 +51,20 @@ class HideOper : public SimpleUserModeHandler
        }
 };
 
-class ModuleHideOper : public Module, public Stats::EventListener, public Whois::LineEventListener
+class ModuleHideOper
+       : public Module
+       , public Stats::EventListener
+       , public Who::EventListener
+       , public Whois::LineEventListener
 {
+ private:
        HideOper hm;
        bool active;
+
  public:
        ModuleHideOper()
                : Stats::EventListener(this)
+               , Who::EventListener(this)
                , Whois::LineEventListener(this)
                , hm(this)
                , active(false)
@@ -107,20 +115,24 @@ class ModuleHideOper : public Module, public Stats::EventListener, public Whois:
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
+       ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
        {
                if (user->IsModeSet(hm) && !source->HasPrivPermission("users/auspex"))
                {
                        // Hide the line completely if doing a "/who * o" query
-                       if ((params.size() > 1) && (params[1].find('o') != std::string::npos))
+                       if (request.flags['o'])
                                return MOD_RES_DENY;
 
+                       size_t flag_index;
+                       if (!request.GetFieldIndex('f', flag_index))
+                               return MOD_RES_PASSTHRU;
+
                        // hide the "*" that marks the user as an oper from the /WHO line
                        // #chan ident localhost insp22.test nick H@ :0 Attila
-                       if (numeric.GetParams().size() < 6)
+                       if (numeric.GetParams().size() <= flag_index)
                                return MOD_RES_PASSTHRU;
 
-                       std::string& param = numeric.GetParams()[5];
+                       std::string& param = numeric.GetParams()[flag_index];
                        const std::string::size_type pos = param.find('*');
                        if (pos != std::string::npos)
                                param.erase(pos, 1);