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

diff --git a/src/modules/m_spanningtree/metadata.cpp b/src/modules/m_spanningtree/metadata.cpp
index 72aff0012..cf386cf21 100644
--- a/src/modules/m_spanningtree/metadata.cpp
+++ b/src/modules/m_spanningtree/metadata.cpp
@@ -1,59 +1,75 @@
-/*       +------------------------------------+
- *       | 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) 2010 Daniel De Graaf <danieldg@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 "commands.h"
+
+CmdResult CommandMetadata::Handle(User* srcuser, std::vector<std::string>& params)
+{
+	if (params[0] == "*")
+	{
+		std::string value = params.size() < 3 ? "" : params[2];
+		FOREACH_MOD(OnDecodeMetaData, (NULL,params[1],value));
+		return CMD_SUCCESS;
+	}
 
-#include "treesocket.h"
-#include "treeserver.h"
-#include "utils.h"
+	if (params[0][0] == '#')
+	{
+		// Channel METADATA has an additional parameter: the channel TS
+		// :22D METADATA #channel 12345 extname :extdata
+		if (params.size() < 3)
+			return CMD_INVALID;
 
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
+		Channel* c = ServerInstance->FindChan(params[0]);
+		if (!c)
+			return CMD_FAILURE;
 
+		time_t ChanTS = ConvToInt(params[1]);
+		if (!ChanTS)
+			return CMD_INVALID;
 
-bool TreeSocket::MetaData(const std::string &prefix, std::deque<std::string> &params)
-{
-	if (params.size() < 2)
-		return true;
-	else if (params.size() < 3)
-		params.push_back("");
-	TreeServer* ServerSource = Utils->FindServer(prefix);
-	if (ServerSource)
+		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->unserialize(FORMAT_NETWORK, c, value);
+		FOREACH_MOD(OnDecodeMetaData, (c,params[2],value));
+	}
+	else
 	{
-		if (params[0] == "*")
-		{
-			FOREACH_MOD_I(this->ServerInstance,I_OnDecodeMetaData,OnDecodeMetaData(TYPE_OTHER,NULL,params[1],params[2]));
-		}
-		else if (*(params[0].c_str()) == '#')
-		{
-			Channel* c = this->ServerInstance->FindChan(params[0]);
-			if (c)
-			{
-				FOREACH_MOD_I(this->ServerInstance,I_OnDecodeMetaData,OnDecodeMetaData(TYPE_CHANNEL,c,params[1],params[2]));
-			}
-		}
-		else if (*(params[0].c_str()) != '#')
+		User* u = ServerInstance->FindUUID(params[0]);
+		if ((u) && (!IS_SERVER(u)))
 		{
-			User* u = this->ServerInstance->FindNick(params[0]);
-			if (u)
-			{
-				FOREACH_MOD_I(this->ServerInstance,I_OnDecodeMetaData,OnDecodeMetaData(TYPE_USER,u,params[1],params[2]));
-			}
+			ExtensionItem* item = ServerInstance->Extensions.GetItem(params[1]);
+			std::string value = params.size() < 3 ? "" : params[2];
+
+			if (item)
+				item->unserialize(FORMAT_NETWORK, u, value);
+			FOREACH_MOD(OnDecodeMetaData, (u,params[1],value));
 		}
 	}
 
-	params[2] = ":" + params[2];
-	Utils->DoOneToAllButSender(prefix,"METADATA",params,prefix);
-	return true;
+	return CMD_SUCCESS;
 }