]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_spanningtree/protocolinterface.cpp
Change type of snomask parameter to char in ProtocolInterface::SendSNONotice()
[user/henk/code/inspircd.git] / src / modules / m_spanningtree / protocolinterface.cpp
index 3ab5dae9df0c9aa5b54fed4fc8c53e4f244bb10d..7a2b033d93c03875d709ff2cd0f0410c93b1506c 100644 (file)
 
 
 #include "inspircd.h"
-#include "main.h"
 #include "utils.h"
 #include "treeserver.h"
-#include "treesocket.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() : "";
-               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,132 +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;
-
-       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);
-       else
-               params.push_back("*");
-
-       params.push_back(key);
-       params.push_back(":" + data);
-
-       Utils->DoOneToMany(ServerInstance->Config->GetSID(),"METADATA",params);
+       CommandMetadata::Builder(u, key, data).Broadcast();
 }
 
-void SpanningTreeProtocolInterface::SendTopic(Channel* channel, std::string &topic)
+void SpanningTreeProtocolInterface::SendMetaData(Channel* c, const std::string& key, const std::string& data)
 {
-       parameterlist params;
-
-       params.push_back(channel->name);
-       params.push_back(ConvToStr(ServerInstance->Time()));
-       params.push_back(ServerInstance->Config->ServerName);
-       params.push_back(":" + topic);
-
-       Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FTOPIC", params);
+       CommandMetadata::Builder(c, key, data).Broadcast();
 }
 
-void SpanningTreeProtocolInterface::SendMode(const std::string &target, const parameterlist &modedata, const std::vector<TranslateType> &translate)
+void SpanningTreeProtocolInterface::SendMetaData(const std::string& key, const std::string& data)
 {
-       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)
-       {
-               Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODE",outlist);
-               return;
-       }
-       else
-       {
-               Channel* c = ServerInstance->FindChan(target);
-               if (c)
-               {
-                       outlist.insert(outlist.begin() + 1, ConvToStr(c->age));
-                       Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FMODE",outlist);
-               }
-       }
+       CommandMetadata::Builder(key, data).Broadcast();
 }
 
-void SpanningTreeProtocolInterface::SendSNONotice(const std::string &snomask, const std::string &text)
+void SpanningTreeProtocolInterface::Server::SendMetaData(const std::string& key, const std::string& data)
 {
-       parameterlist p;
-       p.push_back(snomask);
-       p.push_back(":" + text);
-       Utils->DoOneToMany(ServerInstance->Config->GetSID(), "SNONOTICE", p);
+       sock->WriteLine(CommandMetadata::Builder(key, data));
 }
 
-void SpanningTreeProtocolInterface::PushToClient(User* target, const std::string &rawline)
+void SpanningTreeProtocolInterface::SendTopic(Channel* channel, std::string &topic)
 {
-       parameterlist p;
-       p.push_back(target->uuid);
-       p.push_back(":" + rawline);
-       Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH", p, target->server);
+       CommandFTopic::Builder(ServerInstance->FakeClient, channel).Broadcast();
 }
 
-void SpanningTreeProtocolInterface::SendChannel(Channel* target, char status, const std::string &text)
+void SpanningTreeProtocolInterface::SendMode(User* source, User* u, Channel* c, const std::vector<std::string>& modedata, const std::vector<TranslateType>& translate)
 {
-       std::string cname = target->name;
-       if (status)
-               cname = status + cname;
-       TreeServerList list;
-       CUList exempt_list;
-       Utils->GetListOfServersForChannel(target,list,status,exempt_list);
-       for (TreeServerList::iterator i = list.begin(); i != list.end(); i++)
+       if (u)
        {
-               TreeSocket* Sock = i->second->GetSocket();
-               if (Sock)
-                       Sock->WriteLine(text);
+               if (u->registered != REG_ALL)
+                       return;
+
+               CmdBuilder params(source, "MODE");
+               params.push_back(u->uuid);
+               params.insert(modedata);
+               params.Broadcast();
+       }
+       else
+       {
+               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::SendChannelPrivmsg(Channel* target, char status, const std::string &text)
+void SpanningTreeProtocolInterface::SendSNONotice(char snomask, const std::string &text)
 {
-       SendChannel(target, status, ":" + ServerInstance->Config->GetSID()+" PRIVMSG "+target->name+" :"+text);
+       CmdBuilder("SNONOTICE").push(snomask).push_last(text).Broadcast();
 }
 
-void SpanningTreeProtocolInterface::SendChannelNotice(Channel* target, char status, const std::string &text)
+void SpanningTreeProtocolInterface::PushToClient(User* target, const std::string &rawline)
 {
-       SendChannel(target, status, ":" + ServerInstance->Config->GetSID()+" NOTICE "+target->name+" :"+text);
+       CmdBuilder("PUSH").push(target->uuid).push_last(rawline).Unicast(target);
 }
 
-void SpanningTreeProtocolInterface::SendUserPrivmsg(User* target, const std::string &text)
+void SpanningTreeProtocolInterface::SendMessage(Channel* target, char status, const std::string& text, MessageType msgtype)
 {
-       parameterlist p;
-       p.push_back(target->uuid);
-       p.push_back(":" + text);
-       Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PRIVMSG", p, target->server);
+       const char* cmd = (msgtype == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE");
+       CUList exempt_list;
+       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);
 }