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

diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp
index 3094b38e1..69d3af565 100644
--- a/src/modules/m_spanningtree/ftopic.cpp
+++ b/src/modules/m_spanningtree/ftopic.cpp
@@ -21,10 +21,6 @@
 #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)
 {
@@ -32,7 +28,15 @@ CmdResult CommandFTopic::Handle(const std::vector<std::string>& params, User *us
 	if (!c)
 		return CMD_FAILURE;
 
-	time_t ts = ConvToInt(params[1]);
+	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;
 
@@ -40,15 +44,24 @@ CmdResult CommandFTopic::Handle(const std::vector<std::string>& params, User *us
 	if (ts < c->topicset)
 		return CMD_FAILURE;
 
-	if (c->topic != params[3])
+	/*
+	 * 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[3], 0, ServerInstance->Config->Limits.MaxTopic);
+		c->topic.assign(params[4], 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);
+	// Update setter and settime
+	c->setby.assign(params[3], 0, 127);
 	c->topicset = ts;
 
 	return CMD_SUCCESS;