X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Faddline.cpp;h=5124339fbe9dc5a2d69b28be31ca08c4c992af62;hb=f2e3fd5952b23209b084bde4f464e6643c8a00ff;hp=020526eb3b05004615369b41430e42cc627dc1af;hpb=c6b911132caba237f86280d1b2cb32ad3123f0da;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp
index 020526eb3..5124339fb 100644
--- a/src/modules/m_spanningtree/addline.cpp
+++ b/src/modules/m_spanningtree/addline.cpp
@@ -20,56 +20,37 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "treesocket.h"
 #include "treeserver.h"
 #include "utils.h"
+#include "commands.h"
 
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
-
-bool TreeSocket::AddLine(const std::string &prefix, parameterlist &params)
+CmdResult CommandAddLine::Handle(User* usr, Params& params)
 {
-	if (params.size() < 6)
-	{
-		const std::string& servername = MyRoot->GetName();
-		ServerInstance->SNO->WriteToSnoMask('d', "%s sent me a malformed ADDLINE", servername.c_str());
-		return true;
-	}
-
 	XLineFactory* xlf = ServerInstance->XLines->GetFactory(params[0]);
-
-	std::string setter = "<unknown>";
-	User* usr = ServerInstance->FindNick(prefix);
-	if (usr)
-		setter = usr->nick;
-	else
-	{
-		TreeServer* t = Utils->FindServer(prefix);
-		if (t)
-			setter = t->GetName();
-	}
+	const std::string& setter = usr->nick;
 
 	if (!xlf)
 	{
-		ServerInstance->SNO->WriteToSnoMask('d',"%s sent me an unknown ADDLINE type (%s).",setter.c_str(),params[0].c_str());
-		return true;
+		ServerInstance->SNO->WriteToSnoMask('x',"%s sent me an unknown ADDLINE type (%s).",setter.c_str(),params[0].c_str());
+		return CMD_FAILURE;
 	}
 
 	XLine* xl = NULL;
 	try
 	{
-		xl = xlf->Generate(ServerInstance->Time(), ConvToInt(params[4]), params[2], params[5], params[1]);
+		xl = xlf->Generate(ServerInstance->Time(), ConvToNum<unsigned long>(params[4]), params[2], params[5], params[1]);
 	}
 	catch (ModuleException &e)
 	{
-		ServerInstance->SNO->WriteToSnoMask('d',"Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason());
-		return true;
+		ServerInstance->SNO->WriteToSnoMask('x',"Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason().c_str());
+		return CMD_FAILURE;
 	}
-	xl->SetCreateTime(ConvToInt(params[3]));
+	xl->SetCreateTime(ConvToNum<time_t>(params[3]));
 	if (ServerInstance->XLines->AddLine(xl, NULL))
 	{
 		if (xl->duration)
 		{
-			std::string timestr = ServerInstance->TimeString(xl->expiry);
+			std::string timestr = InspIRCd::TimeString(xl->expiry);
 			ServerInstance->SNO->WriteToSnoMask('X',"%s added %s%s on %s to expire on %s: %s",setter.c_str(),params[0].c_str(),params[0].length() == 1 ? "-line" : "",
 					params[1].c_str(), timestr.c_str(), params[5].c_str());
 		}
@@ -78,20 +59,29 @@ bool TreeSocket::AddLine(const std::string &prefix, parameterlist &params)
 			ServerInstance->SNO->WriteToSnoMask('X',"%s added permanent %s%s on %s: %s",setter.c_str(),params[0].c_str(),params[0].length() == 1 ? "-line" : "",
 					params[1].c_str(),params[5].c_str());
 		}
-		params[5] = ":" + params[5];
 
-		User* u = ServerInstance->FindNick(prefix);
-		Utils->DoOneToAllButSender(prefix, "ADDLINE", params, u ? u->server : prefix);
-		TreeServer *remoteserver = Utils->FindServer(u ? u->server : prefix);
+		TreeServer* remoteserver = TreeServer::Get(usr);
 
-		if (!remoteserver->bursting)
+		if (!remoteserver->IsBursting())
 		{
 			ServerInstance->XLines->ApplyLines();
 		}
+		return CMD_SUCCESS;
 	}
 	else
+	{
 		delete xl;
-
-	return true;
+		return CMD_FAILURE;
+	}
 }
 
+CommandAddLine::Builder::Builder(XLine* xline, User* user)
+	: CmdBuilder(user, "ADDLINE")
+{
+	push(xline->type);
+	push(xline->Displayable());
+	push(xline->source);
+	push_int(xline->set_time);
+	push_int(xline->duration);
+	push_last(xline->reason);
+}