X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fftopic.cpp;h=0a4a95f9ec9dbc1c3a9244e5680583516b1b2888;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=bf1ff8a78dee3e0b6303b6a22396320e744a6648;hpb=a7b70492bb7f30ae375d2ce48684348acbaf578b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp
index bf1ff8a78..0a4a95f9e 100644
--- a/src/modules/m_spanningtree/ftopic.cpp
+++ b/src/modules/m_spanningtree/ftopic.cpp
@@ -21,18 +21,22 @@
 #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)
+CmdResult CommandFTopic::Handle(User* user, std::vector<std::string>& params)
 {
 	Channel* c = ServerInstance->FindChan(params[0]);
 	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;
 
@@ -46,18 +50,18 @@ CmdResult CommandFTopic::Handle(const std::vector<std::string>& params, User *us
 	 * string comparision, so non-empty topics always overridde
 	 * empty topics if their timestamps are equal
 	 */
-	if ((ts == c->topicset) && (c->topic > params[3]))
+	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[3])
+	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());
 	}
 
 	// Update setter and settime
-	c->setby.assign(params[2], 0, 127);
+	c->setby.assign(params[3], 0, 127);
 	c->topicset = ts;
 
 	return CMD_SUCCESS;