Remove ProtocolInterface::PushToClient()

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / protocolinterface.cpp

diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index 5fd598d1d291e8a8265fdf48e65375c73b8c045d..957638517bd083e994f5cfe8c610c805f9aaafb3 100644 (file)
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -22,6 +22,7 @@
 #include "utils.h"
 #include "treeserver.h"
 #include "protocolinterface.h"
+#include "commands.h"
 
 /*
  * For documentation on this class, see include/protocol.h.
@@ -43,87 +44,72 @@ void SpanningTreeProtocolInterface::GetServerList(ServerList& sl)
        }
 }
 
-bool SpanningTreeProtocolInterface::SendEncapsulatedData(const parameterlist &encap)
+bool SpanningTreeProtocolInterface::SendEncapsulatedData(const std::string& targetmask, const std::string& cmd, const parameterlist& params, User* source)
 {
-       if (encap[0].find_first_of("*?") != std::string::npos)
-       {
-               Utils->DoOneToMany(ServerInstance->Config->GetSID(), "ENCAP", encap);
-               return true;
-       }
-       return Utils->DoOneToOne(ServerInstance->Config->GetSID(), "ENCAP", encap, encap[0]);
-}
+       if (!source)
+               source = ServerInstance->FakeClient;
 
-void SpanningTreeProtocolInterface::SendMetaData(Extensible* target, const std::string &key, const std::string &data)
-{
-       parameterlist params;
+       CmdBuilder encap(source, "ENCAP");
 
-       User* u = dynamic_cast<User*>(target);
-       Channel* c = dynamic_cast<Channel*>(target);
-       if (u)
-               params.push_back(u->uuid);
-       else if (c)
+       // Are there any wildcards in the target string?
+       if (targetmask.find_first_of("*?") != std::string::npos)
        {
-               params.push_back(c->name);
-               params.push_back(ConvToStr(c->age));
+               // Yes, send the target string as-is; servers will decide whether or not it matches them
+               encap.push(targetmask).push(cmd).insert(params).Broadcast();
        }
        else
-               params.push_back("*");
+       {
+               // No wildcards which means the target string has to be the name of a known server
+               TreeServer* server = Utils->FindServer(targetmask);
+               if (!server)
+                       return false;
 
-       params.push_back(key);
-       params.push_back(":" + data);
+               // Use the SID of the target in the message instead of the server name
+               encap.push(server->GetID()).push(cmd).insert(params).Unicast(server->ServerUser);
+       }
 
-       Utils->DoOneToMany(ServerInstance->Config->GetSID(),"METADATA",params);
+       return true;
 }
 
-void SpanningTreeProtocolInterface::SendTopic(Channel* channel, std::string &topic)
+void SpanningTreeProtocolInterface::BroadcastEncap(const std::string& cmd, const parameterlist& params, User* source, User* omit)
 {
-       parameterlist params;
+       if (!source)
+               source = ServerInstance->FakeClient;
 
-       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);
+       // If omit is non-NULL we pass the route belonging to the user to Forward(),
+       // otherwise we pass NULL, which is equivalent to Broadcast()
+       TreeServer* server = (omit ? TreeServer::Get(omit)->GetRoute() : NULL);
+       CmdBuilder(source, "ENCAP * ").push_raw(cmd).insert(params).Forward(server);
+}
 
-       Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FTOPIC", params);
+void SpanningTreeProtocolInterface::SendMetaData(User* u, const std::string& key, const std::string& data)
+{
+       CommandMetadata::Builder(u, key, data).Broadcast();
 }
 
-void SpanningTreeProtocolInterface::SendMode(User* source, User* u, Channel* c, const parameterlist& modedata, const std::vector<TranslateType>& translate)
+void SpanningTreeProtocolInterface::SendMetaData(Channel* c, const std::string& key, const std::string& data)
 {
-       parameterlist params;
+       CommandMetadata::Builder(c, key, data).Broadcast();
+}
 
-       if (u)
-       {
-               if (u->registered != REG_ALL)
-                       return;
+void SpanningTreeProtocolInterface::SendMetaData(const std::string& key, const std::string& data)
+{
+       CommandMetadata::Builder(key, data).Broadcast();
+}
 
-               params.push_back(u->uuid);
-               params.insert(params.end(), modedata.begin(), modedata.end());
-               Utils->DoOneToMany(source->uuid, "MODE", params);
-       }
-       else
-       {
-               params.push_back(c->name);
-               params.push_back(ConvToStr(c->age));
-               params.push_back(CommandParser::TranslateUIDs(translate, modedata));
-               Utils->DoOneToMany(source->uuid, "FMODE", params);
-       }
+void SpanningTreeProtocolInterface::Server::SendMetaData(const std::string& key, const std::string& data)
+{
+       sock->WriteLine(CommandMetadata::Builder(key, data));
 }
 
-void SpanningTreeProtocolInterface::SendSNONotice(const std::string &snomask, const std::string &text)
+void SpanningTreeProtocolInterface::SendTopic(Channel* channel, std::string &topic)
 {
-       parameterlist p;
-       p.push_back(snomask);
-       p.push_back(":" + text);
-       Utils->DoOneToMany(ServerInstance->Config->GetSID(), "SNONOTICE", p);
+       CommandFTopic::Builder(ServerInstance->FakeClient, channel).Broadcast();
 }
 
-void SpanningTreeProtocolInterface::PushToClient(User* target, const std::string &rawline)
+void SpanningTreeProtocolInterface::SendSNONotice(char snomask, const std::string &text)
 {
-       parameterlist p;
-       p.push_back(target->uuid);
-       p.push_back(":" + rawline);
-       Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH", p, target->server);
+       CmdBuilder("SNONOTICE").push(snomask).push_last(text).Broadcast();
 }
 
 void SpanningTreeProtocolInterface::SendMessage(Channel* target, char status, const std::string& text, MessageType msgtype)
@@ -135,9 +121,8 @@ void SpanningTreeProtocolInterface::SendMessage(Channel* target, char status, co
 
 void SpanningTreeProtocolInterface::SendMessage(User* target, const std::string& text, MessageType msgtype)
 {
-       const char* cmd = (msgtype == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE");
-       parameterlist p;
+       CmdBuilder p(msgtype == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE");
        p.push_back(target->uuid);
-       p.push_back(":" + text);
-       Utils->DoOneToOne(ServerInstance->Config->GetSID(), cmd, p, target->server);
+       p.push_last(text);
+       p.Unicast(target);
 }