X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_uhnames.cpp;h=420ba2c846d7ecaa9276c16dfc62badf371c0d5d;hb=e59cb85871f75b7603c63c6cd274d57536cf6794;hp=37bd674408bf6072c46c14de7b63a6441e815689;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index 37bd67440..420ba2c84 100644
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -20,68 +20,57 @@
 
 
 #include "inspircd.h"
-#include "m_cap.h"
+#include "modules/cap.h"
+#include "modules/names.h"
 
-/* $ModDesc: Provides the UHNAMES facility. */
-
-class ModuleUHNames : public Module
+class ModuleUHNames
+	: public Module
+	, public Names::EventListener
 {
- public:
-	GenericCap cap;
-
-	ModuleUHNames() : cap(this, "userhost-in-names")
-	{
-		Implementation eventlist[] = { I_OnEvent, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 4);
-	}
+ private:
+	Cap::Capability cap;
 
-	~ModuleUHNames()
+ public:
+	ModuleUHNames()
+		: Names::EventListener(this)
+		, cap(this, "userhost-in-names")
 	{
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides the UHNAMES facility.",VF_VENDOR);
+		return Version("Provides the UHNAMES (CAP userhost-in-names) capability", VF_VENDOR);
 	}
 
-	void On005Numeric(std::string &output)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		output.append(" UHNAMES");
+		tokens["UHNAMES"];
 	}
 
-	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *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 ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"UHNAMES")))
 			{
-				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)
+	ModResult OnNamesListItem(LocalUser* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE
 	{
-		if (!cap.ext.get(issuer))
-			return;
+		if (cap.get(issuer))
+			nick = memb->user->GetFullHost();
 
-		if (nick.empty())
-			return;
-
-		nick = memb->user->GetFullHost();
-	}
-
-	void OnEvent(Event& ev)
-	{
-		cap.HandleEvent(ev);
+		return MOD_RES_PASSTHRU;
 	}
 };