X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=4f93da21ac16f4e341f0eb400bff98520155a76c;hb=c71361e8e4f22cb4f72881399bce2832eb080b0e;hp=defb66b7848d029ccd441537e734d2ebbbaa53d4;hpb=6adca3e0997781eae4adb02f19a2f8c312512ae1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index defb66b78..4f93da21a 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -1,10 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2006, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2013, 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006, 2008 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -22,10 +25,12 @@
 
 #include "inspircd.h"
 #include "modules/cap.h"
+#include "modules/names.h"
 #include "modules/who.h"
 
 class ModuleNamesX
 	: public Module
+	, public Names::EventListener
 	, public Who::EventListener
 {
  private:
@@ -33,19 +38,23 @@ class ModuleNamesX
 
  public:
 	ModuleNamesX()
-		: Who::EventListener(this)
+		: 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 IRCv3 multi-prefix client capability.", VF_VENDOR);
 	}
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		tokens["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, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
@@ -57,7 +66,7 @@ class ModuleNamesX
 		 */
 		if (command == "PROTOCTL")
 		{
-			if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX")))
+			if (!parameters.empty() && irc::equals(parameters[0], "NAMESX"))
 			{
 				cap.set(user, true);
 				return MOD_RES_DENY;
@@ -66,7 +75,7 @@ class ModuleNamesX
 		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();
@@ -84,22 +93,9 @@ class ModuleNamesX
 		if (prefixes.length() <= 1)
 			return MOD_RES_PASSTHRU;
 
-		size_t flag_index = 5;
-		if (request.whox)
-		{
-			// We only need to fiddle with the flags if they are present.
-			if (!request.whox_fields['f'])
-				return MOD_RES_PASSTHRU;
-
-			// WHOX makes this a bit tricky as we need to work out the parameter which the flags are in.
-			flag_index = 0;
-			static const char* flags = "tcuihsn";
-			for (size_t i = 0; i < strlen(flags); ++i)
-			{
-				if (request.whox_fields[flags[i]])
-					flag_index += 1;
-			}
-		}
+		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)