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

diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp
index 69d3af565..2f9813860 100644
--- a/src/modules/m_spanningtree/ftopic.cpp
+++ b/src/modules/m_spanningtree/ftopic.cpp
@@ -1,7 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -22,48 +26,68 @@
 #include "commands.h"
 
 /** FTOPIC command */
-CmdResult CommandFTopic::Handle(const std::vector<std::string>& params, User *user)
+CmdResult CommandFTopic::Handle(User* user, Params& params)
 {
 	Channel* c = ServerInstance->FindChan(params[0]);
 	if (!c)
 		return CMD_FAILURE;
 
-	time_t ChanTS = ConvToInt(params[1]);
-	if (!ChanTS)
-		return CMD_INVALID;
-
-	if (c->age < ChanTS)
+	if (c->age < ServerCommand::ExtractTS(params[1]))
 		// 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
+	time_t ts = ServerCommand::ExtractTS(params[2]);
 	if (ts < c->topicset)
 		return CMD_FAILURE;
 
+	// The topic text is always the last parameter
+	const std::string& newtopic = params.back();
+
+	// If there is a setter in the message use that, otherwise use the message source
+	const std::string& setter = ((params.size() > 4) ? params[3] : (ServerInstance->Config->FullHostInTopic ? user->GetFullHost() : user->nick));
+
 	/*
 	 * 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
+	 * string comparison, so non-empty topics always overridde
 	 * empty topics if their timestamps are equal
+	 *
+	 * Similarly, if the topic texts are equal too, keep one topic
+	 * setter and discard the other
 	 */
-	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)
 	{
-		// 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());
-	}
+		// Discard if their topic text is "smaller"
+		if (c->topic > newtopic)
+			return CMD_FAILURE;
 
-	// Update setter and settime
-	c->setby.assign(params[3], 0, 127);
-	c->topicset = ts;
+		// If the texts are equal in addition to the timestamps, decide which setter to keep
+		if ((c->topic == newtopic) && (c->setby >= setter))
+			return CMD_FAILURE;
+	}
 
+	c->SetTopic(user, newtopic, ts, &setter);
 	return CMD_SUCCESS;
 }
 
+// Used when bursting and in reply to RESYNC, contains topic setter as the 4th parameter
+CommandFTopic::Builder::Builder(Channel* chan)
+	: CmdBuilder("FTOPIC")
+{
+	push(chan->name);
+	push_int(chan->age);
+	push_int(chan->topicset);
+	push(chan->setby);
+	push_last(chan->topic);
+}
+
+// Used when changing the topic, the setter is the message source
+CommandFTopic::Builder::Builder(User* user, Channel* chan)
+	: CmdBuilder(user, "FTOPIC")
+{
+	push(chan->name);
+	push_int(chan->age);
+	push_int(chan->topicset);
+	push_last(chan->topic);
+}