Remove the OnNamesListItem event out of the core.

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

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 708b98e56b301815c05d0684e24374d45c612ecb..ffece5cb401654e81d07a1e382e6dd5f97b3d1dd 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -22,12 +22,22 @@
 
 #include "inspircd.h"
 #include "modules/cap.h"
+#include "modules/names.h"
+#include "modules/who.h"
 
-class ModuleNamesX : public Module
+class ModuleNamesX
+       : public Module
+       , public Names::EventListener
+       , public Who::EventListener
 {
+ private:
        Cap::Capability cap;
+
  public:
-       ModuleNamesX() : cap(this, "multi-prefix")
+       ModuleNamesX()
+               : Names::EventListener(this)
+               , Who::EventListener(this)
+               , cap(this, "multi-prefix")
        {
        }
 
@@ -59,7 +69,7 @@ class ModuleNamesX : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE
+       ModResult OnNamesListItem(LocalUser* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE
        {
                if (cap.get(issuer))
                        prefixes = memb->GetAllPrefixChars();
@@ -67,7 +77,7 @@ class ModuleNamesX : public Module
                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 ((!memb) || (!cap.get(source)))
                        return MOD_RES_PASSTHRU;
@@ -77,11 +87,15 @@ class ModuleNamesX : public Module
                if (prefixes.length() <= 1)
                        return MOD_RES_PASSTHRU;
 
+               size_t flag_index;
+               if (!request.GetFieldIndex('f', flag_index))
+                       return MOD_RES_PASSTHRU;
+
                // #chan ident localhost insp22.test nick H@ :0 Attila
-               if (numeric.GetParams().size() < 6)
+               if (numeric.GetParams().size() <= flag_index)
                        return MOD_RES_PASSTHRU;
 
-               numeric.GetParams()[5].append(prefixes, 1, std::string::npos);
+               numeric.GetParams()[flag_index].append(prefixes, 1, std::string::npos);
                return MOD_RES_PASSTHRU;
        }
 };