X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=f211b01d88a75af838c527b283ef68c81517750d;hb=9d72ec55ae98960bf996dd3d92c29598a5e3c825;hp=a890ba16f531e30704a022c1a17d4a0916b1e7ae;hpb=d9d99cd02dadf34bfcc220734ba0c422f0acb3e6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index a890ba16f..f211b01d8 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -23,8 +23,6 @@
 #include "inspircd.h"
 #include "modules/cap.h"
 
-/* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */
-
 class ModuleNamesX : public Module
 {
 	GenericCap cap;
@@ -33,12 +31,6 @@ class ModuleNamesX : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent, I_OnSendWhoLine };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
 	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR);
@@ -67,21 +59,17 @@ class ModuleNamesX : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick) CXX11_OVERRIDE
+	ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE
 	{
-		if (!cap.ext.get(issuer))
-			return;
+		if (cap.ext.get(issuer))
+			prefixes = memb->GetAllPrefixChars();
 
-		/* Some module hid this from being displayed, dont bother */
-		if (nick.empty())
-			return;
-
-		prefixes = memb->chan->GetAllPrefixChars(memb->user);
+		return MOD_RES_PASSTHRU;
 	}
 
-	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, std::string& line) CXX11_OVERRIDE
+	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
 	{
-		if (!cap.ext.get(source))
+		if ((!memb) || (!cap.ext.get(source)))
 			return;
 
 		// Channel names can contain ":", and ":" as a 'start-of-token' delimiter is
@@ -96,20 +84,10 @@ class ModuleNamesX : public Module
 			return;
 
 		// 352 21DAAAAAB #chan ident localhost insp21.test 21DAAAAAB H@ :0 a
-		//              a     b                                       pos
-		std::string::size_type a = 4 + source->nick.length() + 1;
-		std::string::size_type b = line.find(' ', a);
-		if (b == std::string::npos)
-			return;
-
-		// Try to find this channel
-		std::string channame = line.substr(a, b-a);
-		Channel* chan = ServerInstance->FindChan(channame);
-		if (!chan)
-			return;
+		//                                                            pos
 
 		// Don't do anything if the user has only one prefix
-		std::string prefixes = chan->GetAllPrefixChars(user);
+		std::string prefixes = memb->GetAllPrefixChars();
 		if (prefixes.length() <= 1)
 			return;