Remove unneeded ProtocolInterface::Introduce

[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 edec3ed54eef54921914b7cfe7134c51fe6d2e69..989e8b3e41a9c5de4db1f996255a1661eb67f2a4 100644 (file)
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -1,16 +1,37 @@
 #include "inspircd.h"
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/protocolinterface.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)
+{
+       sl.clear();
+       for (server_hash::iterator i = Utils->serverlist.begin(); i != Utils->serverlist.end(); i++)
+       {
+               ProtoServer 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.gecos = i->second->GetDesc();
+               ps.latencyms = i->second->rtt;
+               sl.push_back(ps);
+       }
+}
 
 void SpanningTreeProtocolInterface::SendEncapsulatedData(parameterlist &encap)
 {
        Utils->DoOneToMany(ServerInstance->Config->GetSID(), "ENCAP", encap);
 }
 
-void SpanningTreeProtocolInterface::SendMetaData(void* target, int type, const std::string &key, const std::string &data)
+void SpanningTreeProtocolInterface::SendMetaData(void* target, TargetTypeFlags type, const std::string &key, const std::string &data)
 {
        parameterlist params;
 
@@ -18,13 +39,16 @@ void SpanningTreeProtocolInterface::SendMetaData(void* target, int type, const s
        {
                case TYPE_USER:
                        params.push_back(((User*)target)->uuid);
-               break;
+                       break;
                case TYPE_CHANNEL:
                        params.push_back(((Channel*)target)->name);
-               break;
+                       break;
                case TYPE_SERVER:
                        params.push_back("*");
-               break;
+                       break;
+               default:
+                       throw CoreException("I don't know how to handle TYPE_OTHER.");
+                       break;
        }
        params.push_back(key);
        params.push_back(":" + data);
@@ -44,23 +68,25 @@ void SpanningTreeProtocolInterface::SendTopic(Channel* channel, std::string &top
        Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FTOPIC", params);
 }
 
-void SpanningTreeProtocolInterface::SendMode(const std::string &target, parameterlist &modedata)
+void SpanningTreeProtocolInterface::SendMode(const std::string &target, const parameterlist &modedata, const std::vector<TranslateType> &translate)
 {
        if (modedata.empty())
                return;
 
-       /* Warning: in-place translation is only safe for type TR_NICK */
-       for (size_t n = 0; n < modedata.size(); n++)
-               ServerInstance->Parser->TranslateUIDs(TR_NICK, modedata[n], modedata[n]);
+       std::string outdata;
+       ServerInstance->Parser->TranslateUIDs(translate, modedata, outdata);
 
        std::string uidtarget;
        ServerInstance->Parser->TranslateUIDs(TR_NICK, target, uidtarget);
-       modedata.insert(modedata.begin(), uidtarget);
+
+       parameterlist outlist;
+       outlist.push_back(uidtarget);
+       outlist.push_back(outdata);
 
        User* a = ServerInstance->FindNick(uidtarget);
        if (a)
        {
-               Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODE",modedata);
+               Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODE",outlist);
                return;
        }
        else
@@ -68,19 +94,12 @@ void SpanningTreeProtocolInterface::SendMode(const std::string &target, paramete
                Channel* c = ServerInstance->FindChan(target);
                if (c)
                {
-                       modedata.insert(modedata.begin() + 1, ConvToStr(c->age));
-                       Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FMODE",modedata);
+                       outlist.insert(outlist.begin() + 1, ConvToStr(c->age));
+                       Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FMODE",outlist);
                }
        }
 }
 
-void SpanningTreeProtocolInterface::SendOperNotice(const std::string &text)
-{
-       parameterlist p;
-       p.push_back(":" + text);
-       Utils->DoOneToMany(ServerInstance->Config->GetSID(), "OPERNOTICE", p);
-}
-
 void SpanningTreeProtocolInterface::SendModeNotice(const std::string &modes, const std::string &text)
 {
        parameterlist p;
@@ -124,12 +143,12 @@ void SpanningTreeProtocolInterface::SendChannel(Channel* target, char status, co
 
 void SpanningTreeProtocolInterface::SendChannelPrivmsg(Channel* target, char status, const std::string &text)
 {
-       SendChannel(target, status, ServerInstance->Config->GetSID()+" PRIVMSG "+target->name+" :"+text);
+       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);
+       SendChannel(target, status, ":" + ServerInstance->Config->GetSID()+" NOTICE "+target->name+" :"+text);
 }
 
 void SpanningTreeProtocolInterface::SendUserPrivmsg(User* target, const std::string &text)
@@ -140,7 +159,7 @@ void SpanningTreeProtocolInterface::SendUserPrivmsg(User* target, const std::str
                TreeSocket* sock = serv->GetSocket();
                if (sock)
                {
-                       sock->WriteLine(ServerInstance->Config->GetSID() + " PRIVMSG " + target->nick + " :"+text);
+                       sock->WriteLine(":" + ServerInstance->Config->GetSID() + " PRIVMSG " + target->nick + " :"+text);
                }
        }
 }
@@ -153,8 +172,7 @@ void SpanningTreeProtocolInterface::SendUserNotice(User* target, const std::stri
                TreeSocket* sock = serv->GetSocket();
                if (sock)
                {
-                       sock->WriteLine(ServerInstance->Config->GetSID() + " NOTICE " + target->nick + " :"+text);
+                       sock->WriteLine(":" + ServerInstance->Config->GetSID() + " NOTICE " + target->nick + " :"+text);
                }
        }
 }
-