X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fftopic.cpp;h=69d3af56520c7e72f3601799b28073e49bbfd056;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=2ed813b0f8cdb7f4f4e630cad987400181adeaee;hpb=b683e9dccb18cd5dc22455d31cf99369049b0599;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp
index 2ed813b0f..69d3af565 100644
--- a/src/modules/m_spanningtree/ftopic.cpp
+++ b/src/modules/m_spanningtree/ftopic.cpp
@@ -1,62 +1,69 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/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"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+/** FTOPIC command */
+CmdResult CommandFTopic::Handle(const std::vector<std::string>& params, User *user)
+{
+	Channel* c = ServerInstance->FindChan(params[0]);
+	if (!c)
+		return CMD_FAILURE;
 
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
+	time_t ChanTS = ConvToInt(params[1]);
+	if (!ChanTS)
+		return CMD_INVALID;
 
+	if (c->age < ChanTS)
+		// Our channel TS is older, nothing to do
+		return CMD_FAILURE;
 
-/** FTOPIC command */
-bool TreeSocket::ForceTopic(const std::string &source, std::deque<std::string> &params)
-{
-	if (params.size() != 4)
-		return true;
-	time_t ts = atoi(params[1].c_str());
-	Channel* c = this->Instance->FindChan(params[0]);
-	if (c)
-	{
-		if ((ts >= c->topicset) || (c->topic.empty()))
-		{
-			if (c->topic != params[3])
-			{
-				User* user = this->Instance->FindNick(source);
-				// Update topic only when it differs from current topic
-				c->topic.assign(params[3], 0, Instance->Config->Limits.MaxTopic);
-				if (!user)
-				{
-					c->WriteChannelWithServ(Instance->Config->ServerName, "TOPIC %s :%s", c->name.c_str(), c->topic.c_str());
-				}
-				else
-				{
-					c->WriteChannel(user, "TOPIC %s :%s", c->name.c_str(), c->topic.c_str());
-				}
-			}
-
-			// Always update setter and settime.
-			c->setby.assign(params[2], 0, 127);
-			c->topicset = ts;
-
-			/* all done, send it on its way */
-			params[3] = ":" + params[3];
-			Utils->DoOneToAllButSender(source,"FTOPIC",params,source);
-		}
+	time_t ts = ConvToInt(params[2]);
+	if (!ts)
+		return CMD_INVALID;
+
+	// Channel::topicset is initialized to 0 on channel creation, so their ts will always win if we never had a topic
+	if (ts < c->topicset)
+		return CMD_FAILURE;
+
+	/*
+	 * If the topics were updated at the exact same second, accept
+	 * the remote only when it's "bigger" than ours as defined by
+	 * string comparision, so non-empty topics always overridde
+	 * empty topics if their timestamps are equal
+	 */
+	if ((ts == c->topicset) && (c->topic > params[4]))
+		return CMD_FAILURE; // Topics were set at the exact same time, keep our topic and setter
 
+	if (c->topic != params[4])
+	{
+		// Update topic only when it differs from current topic
+		c->topic.assign(params[4], 0, ServerInstance->Config->Limits.MaxTopic);
+		c->WriteChannel(user, "TOPIC %s :%s", c->name.c_str(), c->topic.c_str());
 	}
-	return true;
+
+	// Update setter and settime
+	c->setby.assign(params[3], 0, 127);
+	c->topicset = ts;
+
+	return CMD_SUCCESS;
 }