X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmetadata.cpp;h=ec89c1d7e61377f4e36de7f58352ca70991d984e;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=4e87dae00379a85e456013123d12f34d9e1b444b;hpb=e80a1296a096ff2c495b3cd2a3913d5e5f6ec450;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/metadata.cpp b/src/modules/m_spanningtree/metadata.cpp
index 4e87dae00..ec89c1d7e 100644
--- a/src/modules/m_spanningtree/metadata.cpp
+++ b/src/modules/m_spanningtree/metadata.cpp
@@ -1,61 +1,101 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2018-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2012-2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
-#include "xline.h"
 
-#include "treesocket.h"
-#include "treeserver.h"
-#include "utils.h"
+#include "inspircd.h"
+#include "commands.h"
 
-bool TreeSocket::MetaData(const std::string &prefix, parameterlist &params)
+CmdResult CommandMetadata::Handle(User* srcuser, Params& params)
 {
-	if (params.size() < 2)
-		return true;
-	else if (params.size() < 3)
-		params.push_back("");
-	TreeServer* ServerSource = Utils->FindServer(prefix);
-	ExtensionItem* item = ServerInstance->Extensions.GetItem(params[1]);
-	if (ServerSource)
+	if (params[0] == "*")
 	{
-		if (params[0] == "*")
-		{
-			FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(NULL,params[1],params[2]));
-		}
-		else if (*(params[0].c_str()) == '#')
-		{
-			Channel* c = ServerInstance->FindChan(params[0]);
-			if (c)
-			{
-				if (item)
-					item->unserialize(FORMAT_NETWORK, c, params[2]);
-				FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(c,params[1],params[2]));
-			}
-		}
-		else if (*(params[0].c_str()) != '#')
+		std::string value = params.size() < 3 ? "" : params[2];
+		FOREACH_MOD(OnDecodeMetaData, (NULL,params[1],value));
+		return CMD_SUCCESS;
+	}
+
+	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)
+			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
+	{
+		User* u = ServerInstance->FindUUID(params[0]);
+		if (u)
 		{
-			User* u = ServerInstance->FindNick(params[0]);
-			if (u)
-			{
-				if (item)
-					item->unserialize(FORMAT_NETWORK, u, params[2]);
-				FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(u,params[1],params[2]));
-			}
+			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));
 		}
 	}
 
-	params[2] = ":" + params[2];
-	Utils->DoOneToAllButSender(prefix,"METADATA",params,prefix);
-	return true;
+	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);
+}