X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fprotocolinterface.cpp;h=2e3237efd89095662c8349e7930210fda4e893c8;hb=0377d937c5d1bf20fa0c29d4a41c7fd89502ab38;hp=386f2bc318e3322cc5d8a9051d218504e356b3b4;hpb=39897f56f5f84d8d4c8903fb46a03c2fdcf733ec;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index 386f2bc31..2e3237efd 100644
--- 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.
@@ -31,22 +31,19 @@ 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(Extensible* target, const std::string &key, const std::string &data)
 {
 	parameterlist params;
 
-	switch (type)
-	{
-		case TYPE_USER:
-			params.push_back(((User*)target)->uuid);
-		break;
-		case TYPE_CHANNEL:
-			params.push_back(((Channel*)target)->name);
-		break;
-		case TYPE_SERVER:
-			params.push_back("*");
-		break;
-	}
+	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);
 
@@ -65,28 +62,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
@@ -94,8 +88,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);
 		}
 	}
 }
@@ -120,7 +114,7 @@ void SpanningTreeProtocolInterface::PushToClient(User* target, const std::string
 {
 	parameterlist p;
 	p.push_back(target->uuid);
-	p.push_back(rawline);
+	p.push_back(":" + rawline);
 	Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH", p, target->server);
 }
 
@@ -176,28 +170,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
-	}
-}