X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fftopic.cpp;h=2f9813860fe8803cae12fb202c1ebebe9d047927;hb=c71361e8e4f22cb4f72881399bce2832eb080b0e;hp=3c76c928aa6a7d773390547f5ee9b46e02516a32;hpb=6fe1f4e1136f2ab95a88e68af1894bf6002d03f4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp
index 3c76c928a..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,7 +26,7 @@
 #include "commands.h"
 
 /** FTOPIC command */
-CmdResult CommandFTopic::Handle(User* user, std::vector<std::string>& params)
+CmdResult CommandFTopic::Handle(User* user, Params& params)
 {
 	Channel* c = ServerInstance->FindChan(params[0]);
 	if (!c)
@@ -46,7 +50,7 @@ CmdResult CommandFTopic::Handle(User* user, std::vector<std::string>& params)
 	/*
 	 * 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
@@ -63,19 +67,7 @@ CmdResult CommandFTopic::Handle(User* user, std::vector<std::string>& params)
 			return CMD_FAILURE;
 	}
 
-	if (c->topic != newtopic)
-	{
-		// Update topic only when it differs from current topic
-		c->topic.assign(newtopic, 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(setter, 0, 128);
-	c->topicset = ts;
-
-	FOREACH_MOD(OnPostTopicChange, (user, c, c->topic));
-
+	c->SetTopic(user, newtopic, ts, &setter);
 	return CMD_SUCCESS;
 }