X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=7614cdc7642b85ccb04045bec4730c746ef3a1e6;hb=7107ec12d8640d35cfe3d5002db1bc1deb33625d;hp=794cd5b46b4b6b07a1df73a994abfb62beb34425;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 794cd5b46..7614cdc76 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -19,36 +19,29 @@
 class ModuleNamesX : public Module
 {
  public:
-
-	ModuleNamesX(InspIRCd* Me)
-		: Module(Me)
+	GenericCap cap;
+	ModuleNamesX() : cap(this, "multi-prefix")
 	{
-		Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent };
-		ServerInstance->Modules->Attach(eventlist, this, 5);
+		Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent };
+		ServerInstance->Modules->Attach(eventlist, this, 4);
 	}
 
 
-	virtual ~ModuleNamesX()
-	{
-	}
-
-	void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+	~ModuleNamesX()
 	{
-		if ((displayable) && (extname == "NAMESX"))
-			proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR);
 	}
 
-	virtual void On005Numeric(std::string &output)
+	void On005Numeric(std::string &output)
 	{
 		output.append(" NAMESX");
 	}
 
-	virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
 	{
 		irc::string c = command.c_str();
 		/* We don't actually create a proper command handler class for PROTOCTL,
@@ -60,28 +53,28 @@ class ModuleNamesX : public Module
 		{
 			if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX")))
 			{
-				user->Extend("NAMESX");
-				return 1;
+				cap.ext.set(user, 1);
+				return MOD_RES_DENY;
 			}
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
+	void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)
 	{
-		if (!issuer->GetExt("NAMESX"))
+		if (!cap.ext.get(issuer))
 			return;
 
 		/* Some module hid this from being displayed, dont bother */
 		if (nick.empty())
 			return;
 
-		prefixes = channel->GetAllPrefixChars(user);
+		prefixes = memb->chan->GetAllPrefixChars(memb->user);
 	}
 
-	virtual void OnEvent(Event *ev)
+	void OnEvent(Event *ev)
 	{
-		GenericCapHandler(ev, "NAMESX", "multi-prefix");
+		cap.HandleEvent(ev);
 	}
 };