X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=2b4fd87b4daf50c87b209a9832500a122cc77509;hb=09f35749aa7bf7dc20951d85bad60de3d219e4eb;hp=beac968ef0c19e0a4693cddb053f1fe0e291dd31;hpb=5267fb9d362aeb326c9e64f7171c957f76776f90;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index beac968ef..2b4fd87b4 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -22,18 +22,28 @@
 
 #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
 {
+ 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
@@ -41,7 +51,7 @@ class ModuleNamesX : public Module
 		tokens["NAMESX"];
 	}
 
-	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, 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.
@@ -59,7 +69,7 @@ class ModuleNamesX : public Module
 		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();
@@ -67,7 +77,7 @@ class ModuleNamesX : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	ModResult OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
+	ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
 	{
 		if ((!memb) || (!cap.get(source)))
 			return MOD_RES_PASSTHRU;
@@ -77,11 +87,15 @@ class ModuleNamesX : public Module
 		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() < 6)
+		if (numeric.GetParams().size() <= flag_index)
 			return MOD_RES_PASSTHRU;
 
-		numeric.GetParams()[5].append(prefixes, 1, std::string::npos);
+		numeric.GetParams()[flag_index].append(prefixes, 1, std::string::npos);
 		return MOD_RES_PASSTHRU;
 	}
 };