X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_uhnames.cpp;h=790a9acbcb8b5012716c54bb53bbbc5309496a7e;hb=d848034590bc402277da975b7efdbc78ce1722fc;hp=e29e0c662da93351b2b8c61e01e77b2b56492548;hpb=f7dd3ab4c02f704226ee77d1a12d74104e0e36d1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index e29e0c662..790a9acbc 100644
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -1,113 +1,84 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2013, 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012, 2014-2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Craig Edwards <brain@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "inspircd.h"
-
-static const char* dummy = "ON";
 
-/* $ModDesc: Provides aliases of commands. */
+#include "inspircd.h"
+#include "modules/cap.h"
+#include "modules/names.h"
 
-class ModuleUHNames : public Module
+class ModuleUHNames
+	: public Module
+	, public Names::EventListener
 {
-	CUList nl;
- public:
-	
-	ModuleUHNames(InspIRCd* Me)
-		: Module::Module(Me)
-	{
-	}
+ private:
+	Cap::Capability cap;
 
-	void Implements(char* List)
-	{
-		List[I_OnPreCommand] = List[I_OnUserList] = List[I_On005Numeric] = 1;
-	}
-
-	virtual ~ModuleUHNames()
-	{
-	}
-
-	virtual Version GetVersion()
+ public:
+	ModuleUHNames()
+		: Names::EventListener(this)
+		, cap(this, "userhost-in-names")
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 
-        virtual void On005Numeric(std::string &output)
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		output.append(" UHNAMES");
+		return Version("Provides the IRCv3 userhost-in-names client capability.", VF_VENDOR);
 	}
 
-	Priority Prioritize()
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		return (Priority)ServerInstance->PriorityBefore("m_namesx.so");
+		// The legacy PROTOCTL system is a wrapper around the cap.
+		dynamic_reference_nocheck<Cap::Manager> capmanager(this, "capmanager");
+		if (capmanager)
+			tokens["UHNAMES"];
 	}
 
-        virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) 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 ((pcnt) && (!strcasecmp(parameters[0],"UHNAMES")))
+			if (!parameters.empty() && irc::equals(parameters[0], "UHNAMES"))
 			{
-				user->Extend("UHNAMES",dummy);
-				return 1;
+				cap.set(user, true);
+				return MOD_RES_DENY;
 			}
 		}
-		return 0;
-	}
-
-	/* IMPORTANT: This must be prioritized above NAMESX! */
-	virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &ulist)
-	{
-		if (user->GetExt("UHNAMES"))
-		{
-			nl.clear();
-			for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-				nl[i->first] = i->first->GetFullHost();
-			ulist = &nl;
-		}
-		return 0;		
- 	}
-};
-
-
-class ModuleUHNamesFactory : public ModuleFactory
-{
- public:
-	ModuleUHNamesFactory()
-	{
+		return MOD_RES_PASSTHRU;
 	}
 
-	~ModuleUHNamesFactory()
+	ModResult OnNamesListItem(LocalUser* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE
 	{
-	}
+		if (cap.get(issuer))
+			nick = memb->user->GetFullHost();
 
-		virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleUHNames(Me);
+		return MOD_RES_PASSTHRU;
 	}
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleUHNamesFactory;
-}
-
+MODULE_INIT(ModuleUHNames)