X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fprotocolinterface.cpp;h=a6c826c7bf0c763cdc4006206099c01658e789d6;hb=cc74fb0be4ce4a5f55719dcf4b1045fe156ded1b;hp=93a1387580c909322bb2073df7d3fb74dbae9942;hpb=8790551dc182cd8804ee7d8ef89ccb31067cc2a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index 93a138758..a6c826c7b 100644
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -22,17 +22,17 @@
 #include "utils.h"
 #include "treeserver.h"
 #include "protocolinterface.h"
+#include "commands.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() : "";
@@ -46,121 +46,84 @@ void SpanningTreeProtocolInterface::GetServerList(ProtoServerList &sl)
 
 bool SpanningTreeProtocolInterface::SendEncapsulatedData(const parameterlist &encap)
 {
+	CmdBuilder params("ENCAP");
+	params.insert(encap);
 	if (encap[0].find_first_of("*?") != std::string::npos)
 	{
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(), "ENCAP", encap);
+		params.Broadcast();
 		return true;
 	}
-	return Utils->DoOneToOne(ServerInstance->Config->GetSID(), "ENCAP", encap, encap[0]);
+	return params.Unicast(encap[0]);
 }
 
-void SpanningTreeProtocolInterface::SendMetaData(Extensible* target, const std::string &key, const std::string &data)
+void SpanningTreeProtocolInterface::SendMetaData(User* u, const std::string& key, const std::string& data)
 {
-	parameterlist params;
+	CommandMetadata::Builder(u, key, data).Broadcast();
+}
 
-	User* u = dynamic_cast<User*>(target);
-	Channel* c = dynamic_cast<Channel*>(target);
-	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("*");
+void SpanningTreeProtocolInterface::SendMetaData(Channel* c, const std::string& key, const std::string& data)
+{
+	CommandMetadata::Builder(c, key, data).Broadcast();
+}
 
-	params.push_back(key);
-	params.push_back(":" + data);
+void SpanningTreeProtocolInterface::SendMetaData(const std::string& key, const std::string& data)
+{
+	CommandMetadata::Builder(key, data).Broadcast();
+}
 
-	Utils->DoOneToMany(ServerInstance->Config->GetSID(),"METADATA",params);
+void SpanningTreeProtocolInterface::Server::SendMetaData(const std::string& key, const std::string& data)
+{
+	sock->WriteLine(CommandMetadata::Builder(key, data));
 }
 
 void SpanningTreeProtocolInterface::SendTopic(Channel* channel, std::string &topic)
 {
-	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);
-
-	Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FTOPIC", params);
+	CommandFTopic::Builder(ServerInstance->FakeClient, channel).Broadcast();
 }
 
-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 std::vector<std::string>& 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);
-
-	User* a = ServerInstance->FindNick(uidtarget);
-	if (a)
+	if (u)
 	{
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODE",outlist);
-		return;
+		if (u->registered != REG_ALL)
+			return;
+
+		CmdBuilder params(source, "MODE");
+		params.push_back(u->uuid);
+		params.insert(modedata);
+		params.Broadcast();
 	}
 	else
 	{
-		Channel* c = ServerInstance->FindChan(target);
-		if (c)
-		{
-			outlist.insert(outlist.begin() + 1, ConvToStr(c->age));
-			Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FMODE",outlist);
-		}
+		CmdBuilder params(source, "FMODE");
+		params.push_back(c->name);
+		params.push_back(ConvToStr(c->age));
+		params.push_back(CommandParser::TranslateUIDs(translate, modedata));
+		params.Broadcast();
 	}
 }
 
 void SpanningTreeProtocolInterface::SendSNONotice(const std::string &snomask, const std::string &text)
 {
-	parameterlist p;
-	p.push_back(snomask);
-	p.push_back(":" + text);
-	Utils->DoOneToMany(ServerInstance->Config->GetSID(), "SNONOTICE", p);
+	CmdBuilder("SNONOTICE").push(snomask).push_last(text).Broadcast();
 }
 
 void SpanningTreeProtocolInterface::PushToClient(User* target, const std::string &rawline)
 {
-	parameterlist p;
-	p.push_back(target->uuid);
-	p.push_back(":" + rawline);
-	Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH", p, target->server);
-}
-
-void SpanningTreeProtocolInterface::SendChannelPrivmsg(Channel* target, char status, const std::string &text)
-{
-	CUList exempt_list;
-	Utils->SendChannelMessage(ServerInstance->Config->GetSID(), target, text, status, exempt_list, "PRIVMSG");
+	CmdBuilder("PUSH").push(target->uuid).push_last(rawline).Unicast(target);
 }
 
-void SpanningTreeProtocolInterface::SendChannelNotice(Channel* target, char status, const std::string &text)
+void SpanningTreeProtocolInterface::SendMessage(Channel* target, char status, const std::string& text, MessageType msgtype)
 {
+	const char* cmd = (msgtype == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE");
 	CUList exempt_list;
-	Utils->SendChannelMessage(ServerInstance->Config->GetSID(), target, text, status, exempt_list, "NOTICE");
-}
-
-void SpanningTreeProtocolInterface::SendUserPrivmsg(User* target, const std::string &text)
-{
-	parameterlist p;
-	p.push_back(target->uuid);
-	p.push_back(":" + text);
-	Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PRIVMSG", p, target->server);
+	Utils->SendChannelMessage(ServerInstance->Config->GetSID(), target, text, status, exempt_list, cmd);
 }
 
-void SpanningTreeProtocolInterface::SendUserNotice(User* target, const std::string &text)
+void SpanningTreeProtocolInterface::SendMessage(User* target, const std::string& text, MessageType msgtype)
 {
-	parameterlist p;
+	CmdBuilder p(msgtype == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE");
 	p.push_back(target->uuid);
-	p.push_back(":" + text);
-	Utils->DoOneToOne(ServerInstance->Config->GetSID(), "NOTICE", p, target->server);
+	p.push_last(text);
+	p.Unicast(target);
 }