Fix some regressions in sending tags between servers.

[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 ac15c9723d9aafe751173c81dae5c5daaae23145..d91b6b050224fcdbebbbc3a2ef5c7ec69820d42e 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -22,10 +22,12 @@
 
 #include "inspircd.h"
 #include "modules/cap.h"
+#include "modules/names.h"
 #include "modules/who.h"
 
 class ModuleNamesX
        : public Module
+       , public Names::EventListener
        , public Who::EventListener
 {
  private:
@@ -33,19 +35,23 @@ class ModuleNamesX
 
  public:
        ModuleNamesX()
-               : Who::EventListener(this)
+               : Names::EventListener(this)
+               , Who::EventListener(this)
                , cap(this, "multi-prefix")
        {
        }
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR);
+               return Version("Provides the NAMESX (CAP multi-prefix) capability", VF_VENDOR);
        }
 
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               tokens["NAMESX"];
+               // The legacy PROTOCTL system is a wrapper around the cap.
+               dynamic_reference_nocheck<Cap::Manager> capmanager(this, "capmanager");
+               if (capmanager)
+                       tokens["NAMESX"];
        }
 
        ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
@@ -66,7 +72,7 @@ class ModuleNamesX
                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();