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 afbf7a8e263add0c9049fd62671baf945105abfc..c906322bf529967fba09f4413bc0e0fef0b8afb3 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -25,7 +25,7 @@
 
 class ModuleNamesX : public Module
 {
-       GenericCap cap;
+       Cap::Capability cap;
  public:
        ModuleNamesX() : cap(this, "multi-prefix")
        {
@@ -52,28 +52,24 @@ class ModuleNamesX : public Module
                {
                        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) CXX11_OVERRIDE
+       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) CXX11_OVERRIDE
+       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
@@ -88,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);
-               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) CXX11_OVERRIDE
-       {
-               cap.HandleEvent(ev);
-       }
 };
 
 MODULE_INIT(ModuleNamesX)