X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=beac968ef0c19e0a4693cddb053f1fe0e291dd31;hb=124c17e14134a4999afc1a5e981ab7c75b3694b9;hp=2e206003271838f2398479e0ef55c87be0ed08ae;hpb=1db0e984be491125d8f954aa22f17cad1d4c453f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 2e2060032..beac968ef 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -25,7 +25,7 @@
 
 class ModuleNamesX : public Module
 {
-	GenericCap cap;
+	Cap::Capability cap;
  public:
 	ModuleNamesX() : cap(this, "multi-prefix")
 	{
@@ -52,56 +52,37 @@ class ModuleNamesX : public Module
 		{
 			if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX")))
 			{
-				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) CXX11_OVERRIDE
+	ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE
 	{
-		if (!cap.ext.get(issuer))
-			return;
+		if (cap.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, Channel* chan, std::string& line) CXX11_OVERRIDE
+	ModResult OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
 	{
-		if ((!chan) || (!cap.ext.get(source)))
-			return;
-
-		// Channel names can contain ":", and ":" as a 'start-of-token' delimiter is
-		// only ever valid after whitespace, so... find the actual delimiter first!
-		// Thanks to FxChiP for pointing this out.
-		std::string::size_type pos = line.find(" :");
-		if (pos == std::string::npos || pos == 0)
-			return;
-		pos--;
-		// Don't do anything if the user has no prefixes
-		if ((line[pos] == 'H') || (line[pos] == 'G') || (line[pos] == '*'))
-			return;
-
-		// 352 21DAAAAAB #chan ident localhost insp21.test 21DAAAAAB H@ :0 a
-		//                                                            pos
+		if ((!memb) || (!cap.get(source)))
+			return MOD_RES_PASSTHRU;
 
 		// 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;
+			return MOD_RES_PASSTHRU;
 
-		line.erase(pos, 1);
-		line.insert(pos, prefixes);
-	}
+		// #chan ident localhost insp22.test nick H@ :0 Attila
+		if (numeric.GetParams().size() < 6)
+			return MOD_RES_PASSTHRU;
 
-	void OnEvent(Event& ev) CXX11_OVERRIDE
-	{
-		cap.HandleEvent(ev);
+		numeric.GetParams()[5].append(prefixes, 1, std::string::npos);
+		return MOD_RES_PASSTHRU;
 	}
 };