Add {To,From}{Human,Internal,Network} to ExtensionItem.

[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 1ab8243881cfcb0adc69038aa0f5aaaac1444463..d91b6b050224fcdbebbbc3a2ef5c7ec69820d42e 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -21,69 +21,85 @@
 
 
 #include "inspircd.h"
-#include "m_cap.h"
+#include "modules/cap.h"
+#include "modules/names.h"
+#include "modules/who.h"
 
-/* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */
-
-class ModuleNamesX : public Module
+class ModuleNamesX
+       : public Module
+       , public Names::EventListener
+       , public Who::EventListener
 {
- public:
-       GenericCap cap;
-       ModuleNamesX() : cap(this, "multi-prefix")
-       {
-               Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
-       }
+ private:
+       Cap::Capability cap;
 
-
-       ~ModuleNamesX()
+ public:
+       ModuleNamesX()
+               : Names::EventListener(this)
+               , Who::EventListener(this)
+               , cap(this, "multi-prefix")
        {
        }
 
-       Version GetVersion()
+       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::string &output)
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               output.append(" 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, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
+       ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
        {
-               irc::string c = command.c_str();
                /* We don't actually create a proper command handler class for PROTOCTL,
                 * because other modules might want to have PROTOCTL hooks too.
                 * Therefore, we just hook its as an unvalidated command therefore we
                 * can capture it even if it doesnt exist! :-)
                 */
-               if (c == "PROTOCTL")
+               if (command == "PROTOCTL")
                {
                        if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX")))
                        {
-                               cap.ext.set(user, 1);
+                               cap.set(user, true);
                                return MOD_RES_DENY;
                        }
                }
                return MOD_RES_PASSTHRU;
        }
 
-       void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)
+       ModResult OnNamesListItem(LocalUser* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE
        {
-               if (!cap.ext.get(issuer))
-                       return;
-
-               /* Some module hid this from being displayed, dont bother */
-               if (nick.empty())
-                       return;
+               if (cap.get(issuer))
+                       prefixes = memb->GetAllPrefixChars();
 
-               prefixes = memb->chan->GetAllPrefixChars(memb->user);
+               return MOD_RES_PASSTHRU;
        }
 
-       void OnEvent(Event& ev)
+       ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
        {
-               cap.HandleEvent(ev);
+               if ((!memb) || (!cap.get(source)))
+                       return MOD_RES_PASSTHRU;
+
+               // Don't do anything if the user has only one prefix
+               std::string prefixes = memb->GetAllPrefixChars();
+               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() <= flag_index)
+                       return MOD_RES_PASSTHRU;
+
+               numeric.GetParams()[flag_index].append(prefixes, 1, std::string::npos);
+               return MOD_RES_PASSTHRU;
        }
 };