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 9f32963a02c55adb1e645b8e9b32e675a882eff9..989e8b3e41a9c5de4db1f996255a1661eb67f2a4 100644 (file)
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -1,9 +1,9 @@
 #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.
@@ -68,28 +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;
 
        std::string outdata;
-
-       /* 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], outdata);
-               modedata[n] = 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
@@ -97,8 +94,8 @@ 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);
                }
        }
 }
@@ -179,28 +176,3 @@ void SpanningTreeProtocolInterface::SendUserNotice(User* target, const std::stri
                }
        }
 }
-
-void SpanningTreeProtocolInterface::Introduce(User* user)
-{
-       if (IS_LOCAL(user))
-       {
-               std::deque<std::string> params;
-               params.push_back(user->uuid);
-               params.push_back(ConvToStr(user->age));
-               params.push_back(user->nick);
-               params.push_back(user->host);
-               params.push_back(user->dhost);
-               params.push_back(user->ident);
-               params.push_back(user->GetIPString());
-               params.push_back(ConvToStr(user->signon));
-               params.push_back("+"+std::string(user->FormatModes(true)));
-               params.push_back(":"+std::string(user->fullname));
-               Utils->DoOneToMany(ServerInstance->Config->GetSID(), "UID", params);
-       }
-
-       TreeServer* SourceServer = Utils->FindServer(user->server);
-       if (SourceServer)
-       {
-               SourceServer->SetUserCount(1); // increment by 1
-       }
-}