X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmetadata.cpp;h=13ccabc353584754e189164f4373fed2b31b8ab3;hb=c8f92d97c2cd92a07bbb76b96a67cd089c7e3407;hp=cf386cf21f6527dc4302a892af7137cad0717412;hpb=b14ebbccf08ec34a73e1ba271e67da80d9fe805c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/metadata.cpp b/src/modules/m_spanningtree/metadata.cpp
index cf386cf21..13ccabc35 100644
--- a/src/modules/m_spanningtree/metadata.cpp
+++ b/src/modules/m_spanningtree/metadata.cpp
@@ -35,16 +35,13 @@ CmdResult CommandMetadata::Handle(User* srcuser, std::vector<std::string>& param
 		// Channel METADATA has an additional parameter: the channel TS
 		// :22D METADATA #channel 12345 extname :extdata
 		if (params.size() < 3)
-			return CMD_INVALID;
+			throw ProtocolException("Insufficient parameters for channel METADATA");
 
 		Channel* c = ServerInstance->FindChan(params[0]);
 		if (!c)
 			return CMD_FAILURE;
 
-		time_t ChanTS = ConvToInt(params[1]);
-		if (!ChanTS)
-			return CMD_INVALID;
-
+		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;
@@ -73,3 +70,27 @@ CmdResult CommandMetadata::Handle(User* srcuser, std::vector<std::string>& param
 	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);
+}