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

diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp
index d559c6ae5..69d3af565 100644
--- a/src/modules/m_spanningtree/ftopic.cpp
+++ b/src/modules/m_spanningtree/ftopic.cpp
@@ -21,31 +21,49 @@
 #include "inspircd.h"
 #include "commands.h"
 
-#include "treesocket.h"
-#include "treeserver.h"
-#include "utils.h"
-
 /** FTOPIC command */
 CmdResult CommandFTopic::Handle(const std::vector<std::string>& params, User *user)
 {
-	time_t ts = atoi(params[1].c_str());
 	Channel* c = ServerInstance->FindChan(params[0]);
-	if (c)
+	if (!c)
+		return CMD_FAILURE;
+
+	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;
+
+	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])
 	{
-		if ((ts >= c->topicset) || (c->topic.empty()))
-		{
-			if (c->topic != params[3])
-			{
-				// Update topic only when it differs from current topic
-				c->topic.assign(params[3], 0, ServerInstance->Config->Limits.MaxTopic);
-				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;
-		}
+		// 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());
 	}
+
+	// Update setter and settime
+	c->setby.assign(params[3], 0, 127);
+	c->topicset = ts;
+
 	return CMD_SUCCESS;
 }