X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_spanningtree%2Fcapab.cpp;h=52404aa1d6e71c973dca9642001d5099e21195e0;hb=b7d84270bce15507775c7ec216dc1d5ad8b02a53;hp=fa10c79fe9a57714188bc66fa0c40d372c2e4daa;hpb=debe102133f478e2fbff597f6da92215bb8c2524;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index fa10c79fe..52404aa1d 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -28,17 +28,18 @@
 
 std::string TreeSocket::MyModules(int filter)
 {
-	std::vector<std::string> modlist = ServerInstance->Modules->GetAllModuleNames(filter);
+	const ModuleManager::ModuleMap& modlist = ServerInstance->Modules->GetModules();
 
 	std::string capabilities;
-	sort(modlist.begin(),modlist.end());
-	for (std::vector<std::string>::const_iterator i = modlist.begin(); i != modlist.end(); ++i)
+	for (ModuleManager::ModuleMap::const_iterator i = modlist.begin(); i != modlist.end(); ++i)
 	{
+		Version v = i->second->GetVersion();
+		if (!(v.Flags & filter))
+			continue;
+
 		if (i != modlist.begin())
 			capabilities.push_back(' ');
-		capabilities.append(*i);
-		Module* m = ServerInstance->Modules->Find(*i);
-		Version v = m->GetVersion();
+		capabilities.append(i->first);
 		if (!v.link_data.empty())
 		{
 			capabilities.push_back('=');
@@ -58,15 +59,18 @@ static std::string BuildModeList(ModeType type)
 		{
 			std::string mdesc = mh->name;
 			mdesc.push_back('=');
-			if (mh->GetPrefix())
-				mdesc.push_back(mh->GetPrefix());
-			if (mh->GetModeChar())
-				mdesc.push_back(mh->GetModeChar());
+			PrefixMode* pm = mh->IsPrefixMode();
+			if (pm)
+			{
+				if (pm->GetPrefix())
+					mdesc.push_back(pm->GetPrefix());
+			}
+			mdesc.push_back(mh->GetModeChar());
 			modes.push_back(mdesc);
 		}
 	}
 	sort(modes.begin(), modes.end());
-	irc::stringjoiner line(" ", modes, 0, modes.size() - 1);
+	irc::stringjoiner line(modes);
 	return line.GetJoined();
 }