Merge insp20

[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 7e9c5fd48f6e6dbaaf586d74559308dbe91c4d75..c906322bf529967fba09f4413bc0e0fef0b8afb3 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -21,69 +21,55 @@
 
 
 #include "inspircd.h"
-#include "m_cap.h"
-
-/* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */
+#include "modules/cap.h"
 
 class ModuleNamesX : public Module
 {
+       Cap::Capability cap;
  public:
-       GenericCap cap;
        ModuleNamesX() : cap(this, "multi-prefix")
-       {
-               Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent, I_OnSendWhoLine };
-               ServerInstance->Modules->Attach(eventlist, this, 5);
-       }
-
-
-       ~ModuleNamesX()
        {
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                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");
+               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, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) 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(User* 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 OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, std::string& line)
+       void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
        {
-               if (!cap.ext.get(source))
+               if ((!memb) || (!cap.get(source)))
                        return;
 
                // Channel names can contain ":", and ":" as a 'start-of-token' delimiter is
@@ -98,31 +84,16 @@ class ModuleNamesX : public Module
                        return;
 
                // 352 21DAAAAAB #chan ident localhost insp21.test 21DAAAAAB H@ :0 a
-               //              a     b                                       pos
-               std::string::size_type a = 4 + source->nick.length() + 1;
-               std::string::size_type b = line.find(' ', a);
-               if (b == std::string::npos)
-                       return;
-
-               // Try to find this channel
-               std::string channame = line.substr(a, b-a);
-               Channel* chan = ServerInstance->FindChan(channame.c_str());
-               if (!chan)
-                       return;
+               //                                                            pos
 
                // Don't do anything if the user has only one prefix
-               std::string prefixes = chan->GetAllPrefixChars(user);
+               std::string prefixes = memb->GetAllPrefixChars();
                if (prefixes.length() <= 1)
                        return;
 
                line.erase(pos, 1);
                line.insert(pos, prefixes);
        }
-
-       void OnEvent(Event& ev)
-       {
-               cap.HandleEvent(ev);
-       }
 };
 
 MODULE_INIT(ModuleNamesX)