#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
{
- GenericCap cap;
+ private:
+ Cap::Capability cap;
+
public:
- ModuleNamesX() : cap(this, "multi-prefix")
+ ModuleNamesX()
+ : 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"];
}
- ModResult OnPreCommand(std::string &command, std::vector<std::string> ¶meters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
+ ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
{
/* We don't actually create a proper command handler class for PROTOCTL,
* because other modules might want to have PROTOCTL hooks too.
{
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;
}
- 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.ext.get(issuer))
+ if (cap.get(issuer))
prefixes = memb->GetAllPrefixChars();
return MOD_RES_PASSTHRU;
}
- void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
+ ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
{
- if ((!memb) || (!cap.ext.get(source)))
- return;
-
- // Channel names can contain ":", and ":" as a 'start-of-token' delimiter is
- // only ever valid after whitespace, so... find the actual delimiter first!
- // Thanks to FxChiP for pointing this out.
- std::string::size_type pos = line.find(" :");
- if (pos == std::string::npos || pos == 0)
- return;
- pos--;
- // Don't do anything if the user has no prefixes
- if ((line[pos] == 'H') || (line[pos] == 'G') || (line[pos] == '*'))
- return;
-
- // 352 21DAAAAAB #chan ident localhost insp21.test 21DAAAAAB H@ :0 a
- // pos
+ 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;
+ return MOD_RES_PASSTHRU;
- line.erase(pos, 1);
- line.insert(pos, prefixes);
+ 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;
}
};