X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fprotocolinterface.cpp;h=5fd598d1d291e8a8265fdf48e65375c73b8c045d;hb=61d586b1a3ad689669f6dcdc285b0d021ca814bd;hp=efc00334d96faf5f4ec791b665a6160e1696600c;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index efc00334d..5fd598d1d 100644
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -19,27 +19,24 @@
 
 
 #include "inspircd.h"
-#include "main.h"
 #include "utils.h"
 #include "treeserver.h"
-#include "treesocket.h"
 #include "protocolinterface.h"
 
 /*
  * For documentation on this class, see include/protocol.h.
  */
 
-void SpanningTreeProtocolInterface::GetServerList(ProtoServerList &sl)
+void SpanningTreeProtocolInterface::GetServerList(ServerList& sl)
 {
-	sl.clear();
 	for (server_hash::iterator i = Utils->serverlist.begin(); i != Utils->serverlist.end(); i++)
 	{
-		ProtoServer ps;
+		ServerInfo ps;
 		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);
@@ -48,7 +45,7 @@ void SpanningTreeProtocolInterface::GetServerList(ProtoServerList &sl)
 
 bool SpanningTreeProtocolInterface::SendEncapsulatedData(const parameterlist &encap)
 {
-	if (encap[0].find('*') != std::string::npos)
+	if (encap[0].find_first_of("*?") != std::string::npos)
 	{
 		Utils->DoOneToMany(ServerInstance->Config->GetSID(), "ENCAP", encap);
 		return true;
@@ -65,7 +62,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 +80,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 +88,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);
 	}
 }
 
@@ -135,55 +126,18 @@ void SpanningTreeProtocolInterface::PushToClient(User* target, const std::string
 	Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH", p, target->server);
 }
 
-void SpanningTreeProtocolInterface::SendChannel(Channel* target, char status, const std::string &text)
+void SpanningTreeProtocolInterface::SendMessage(Channel* target, char status, const std::string& text, MessageType msgtype)
 {
-	std::string cname = target->name;
-	if (status)
-		cname = status + cname;
-	TreeServerList list;
+	const char* cmd = (msgtype == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE");
 	CUList exempt_list;
-	Utils->GetListOfServersForChannel(target,list,status,exempt_list);
-	for (TreeServerList::iterator i = list.begin(); i != list.end(); i++)
-	{
-		TreeSocket* Sock = i->second->GetSocket();
-		if (Sock)
-			Sock->WriteLine(text);
-	}
+	Utils->SendChannelMessage(ServerInstance->Config->GetSID(), target, text, status, exempt_list, cmd);
 }
 
-
-void SpanningTreeProtocolInterface::SendChannelPrivmsg(Channel* target, char status, const std::string &text)
+void SpanningTreeProtocolInterface::SendMessage(User* target, const std::string& text, MessageType msgtype)
 {
-	SendChannel(target, status, ":" + ServerInstance->Config->GetSID()+" PRIVMSG "+target->name+" :"+text);
-}
-
-void SpanningTreeProtocolInterface::SendChannelNotice(Channel* target, char status, const std::string &text)
-{
-	SendChannel(target, status, ":" + ServerInstance->Config->GetSID()+" NOTICE "+target->name+" :"+text);
-}
-
-void SpanningTreeProtocolInterface::SendUserPrivmsg(User* target, const std::string &text)
-{
-	TreeServer* serv = Utils->FindServer(target->server);
-	if (serv)
-	{
-		TreeSocket* sock = serv->GetSocket();
-		if (sock)
-		{
-			sock->WriteLine(":" + ServerInstance->Config->GetSID() + " PRIVMSG " + target->nick + " :"+text);
-		}
-	}
-}
-
-void SpanningTreeProtocolInterface::SendUserNotice(User* target, const std::string &text)
-{
-	TreeServer* serv = Utils->FindServer(target->server);
-	if (serv)
-	{
-		TreeSocket* sock = serv->GetSocket();
-		if (sock)
-		{
-			sock->WriteLine(":" + ServerInstance->Config->GetSID() + " NOTICE " + target->nick + " :"+text);
-		}
-	}
+	const char* cmd = (msgtype == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE");
+	parameterlist p;
+	p.push_back(target->uuid);
+	p.push_back(":" + text);
+	Utils->DoOneToOne(ServerInstance->Config->GetSID(), cmd, p, target->server);
 }