X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmetadata.cpp;h=816d0758ab1f14de274e45708766192cb716ca5c;hb=a4305d8f3c3e613be839bdcd61a1d14c87fed5aa;hp=40c0367eaa89501c6c91e50c516139088c2668b5;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/metadata.cpp b/src/modules/m_spanningtree/metadata.cpp
index 40c0367ea..816d0758a 100644
--- a/src/modules/m_spanningtree/metadata.cpp
+++ b/src/modules/m_spanningtree/metadata.cpp
@@ -21,39 +21,76 @@
 #include "inspircd.h"
 #include "commands.h"
 
-#include "treesocket.h"
-#include "treeserver.h"
-#include "utils.h"
-
-CmdResult CommandMetadata::Handle(const std::vector<std::string>& params, User *srcuser)
+CmdResult CommandMetadata::Handle(User* srcuser, Params& params)
 {
-	std::string value = params.size() < 3 ? "" : params[2];
-	ExtensionItem* item = ServerInstance->Extensions.GetItem(params[1]);
 	if (params[0] == "*")
 	{
-		FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(NULL,params[1],value));
+		std::string value = params.size() < 3 ? "" : params[2];
+		FOREACH_MOD(OnDecodeMetaData, (NULL,params[1],value));
+		return CMD_SUCCESS;
 	}
-	else if (*(params[0].c_str()) == '#')
+
+	if (params[0][0] == '#')
 	{
+		// Channel METADATA has an additional parameter: the channel TS
+		// :22D METADATA #channel 12345 extname :extdata
+		if (params.size() < 3)
+			throw ProtocolException("Insufficient parameters for channel METADATA");
+
 		Channel* c = ServerInstance->FindChan(params[0]);
-		if (c)
-		{
-			if (item)
-				item->unserialize(FORMAT_NETWORK, c, value);
-			FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(c,params[1],value));
-		}
+		if (!c)
+			return CMD_FAILURE;
+
+		time_t ChanTS = ServerCommand::ExtractTS(params[1]);
+		if (c->age < ChanTS)
+			// Their TS is newer than ours, discard this command and do not propagate
+			return CMD_FAILURE;
+
+		std::string value = params.size() < 4 ? "" : params[3];
+
+		ExtensionItem* item = ServerInstance->Extensions.GetItem(params[2]);
+		if ((item) && (item->type == ExtensionItem::EXT_CHANNEL))
+			item->FromNetwork(c, value);
+		FOREACH_MOD(OnDecodeMetaData, (c,params[2],value));
 	}
-	else if (*(params[0].c_str()) != '#')
+	else
 	{
-		User* u = ServerInstance->FindNick(params[0]);
+		User* u = ServerInstance->FindUUID(params[0]);
 		if (u)
 		{
-			if (item)
-				item->unserialize(FORMAT_NETWORK, u, value);
-			FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(u,params[1],value));
+			ExtensionItem* item = ServerInstance->Extensions.GetItem(params[1]);
+			std::string value = params.size() < 3 ? "" : params[2];
+
+			if ((item) && (item->type == ExtensionItem::EXT_USER))
+				item->FromNetwork(u, value);
+			FOREACH_MOD(OnDecodeMetaData, (u,params[1],value));
 		}
 	}
 
 	return CMD_SUCCESS;
 }
 
+CommandMetadata::Builder::Builder(User* user, const std::string& key, const std::string& val)
+	: CmdBuilder("METADATA")
+{
+	push(user->uuid);
+	push(key);
+	push_last(val);
+}
+
+CommandMetadata::Builder::Builder(Channel* chan, const std::string& key, const std::string& val)
+	: CmdBuilder("METADATA")
+{
+	push(chan->name);
+	push_int(chan->age);
+	push(key);
+	push_last(val);
+}
+
+CommandMetadata::Builder::Builder(const std::string& key, const std::string& val)
+	: CmdBuilder("METADATA")
+{
+	push("*");
+	push(key);
+	push_last(val);
+}