X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fprotocolinterface.cpp;h=0f5c40cc10884269dd66646d5f78e292e5e602c3;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=aacf5ce8dd3a891d702fc0719ec1e674e1672c2c;hpb=da28fe0b8c0bec9ab111044b1004f24cbf2d742e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index aacf5ce8d..0f5c40cc1 100644
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -19,10 +19,8 @@
 
 
 #include "inspircd.h"
-#include "main.h"
 #include "utils.h"
 #include "treeserver.h"
-#include "treesocket.h"
 #include "protocolinterface.h"
 
 /*
@@ -38,8 +36,8 @@ void SpanningTreeProtocolInterface::GetServerList(ProtoServerList &sl)
 		ps.servername = i->second->GetName();
 		TreeServer* s = i->second->GetParent();
 		ps.parentname = s ? s->GetName() : "";
-		ps.usercount = i->second->GetUserCount();
-		ps.opercount = i->second->GetOperCount();
+		ps.usercount = i->second->UserCount;
+		ps.opercount = i->second->OperCount;
 		ps.gecos = i->second->GetDesc();
 		ps.latencyms = i->second->rtt;
 		sl.push_back(ps);
@@ -65,7 +63,10 @@ void SpanningTreeProtocolInterface::SendMetaData(Extensible* target, const std::
 	if (u)
 		params.push_back(u->uuid);
 	else if (c)
+	{
 		params.push_back(c->name);
+		params.push_back(ConvToStr(c->age));
+	}
 	else
 		params.push_back("*");
 
@@ -80,6 +81,7 @@ void SpanningTreeProtocolInterface::SendTopic(Channel* channel, std::string &top
 	parameterlist params;
 
 	params.push_back(channel->name);
+	params.push_back(ConvToStr(channel->age));
 	params.push_back(ConvToStr(ServerInstance->Time()));
 	params.push_back(ServerInstance->Config->ServerName);
 	params.push_back(":" + topic);
@@ -87,35 +89,25 @@ void SpanningTreeProtocolInterface::SendTopic(Channel* channel, std::string &top
 	Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FTOPIC", params);
 }
 
-void SpanningTreeProtocolInterface::SendMode(const std::string &target, const parameterlist &modedata, const std::vector<TranslateType> &translate)
+void SpanningTreeProtocolInterface::SendMode(User* source, User* u, Channel* c, const parameterlist& modedata, const std::vector<TranslateType>& translate)
 {
-	if (modedata.empty())
-		return;
-
-	std::string outdata;
-	ServerInstance->Parser->TranslateUIDs(translate, modedata, outdata);
-
-	std::string uidtarget;
-	ServerInstance->Parser->TranslateUIDs(TR_NICK, target, uidtarget);
-
-	parameterlist outlist;
-	outlist.push_back(uidtarget);
-	outlist.push_back(outdata);
+	parameterlist params;
 
-	User* a = ServerInstance->FindNick(uidtarget);
-	if (a)
+	if (u)
 	{
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODE",outlist);
-		return;
+		if (u->registered != REG_ALL)
+			return;
+
+		params.push_back(u->uuid);
+		params.insert(params.end(), modedata.begin(), modedata.end());
+		Utils->DoOneToMany(source->uuid, "MODE", params);
 	}
 	else
 	{
-		Channel* c = ServerInstance->FindChan(target);
-		if (c)
-		{
-			outlist.insert(outlist.begin() + 1, ConvToStr(c->age));
-			Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FMODE",outlist);
-		}
+		params.push_back(c->name);
+		params.push_back(ConvToStr(c->age));
+		params.push_back(CommandParser::TranslateUIDs(translate, modedata));
+		Utils->DoOneToMany(source->uuid, "FMODE", params);
 	}
 }