X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_spanningtree%2Fftopic.cpp;h=2413a67d37677edab033a379d9b38ead6737c63c;hb=dce58b1611e275118d418bfb3b4402bd14d279dd;hp=15a2c962fda38a7f76a1e9dac48f5f9b7bd35dfe;hpb=60f3d89d5907049a2627d134b652c675b052602b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp
index 15a2c962f..2413a67d3 100644
--- a/src/modules/m_spanningtree/ftopic.cpp
+++ b/src/modules/m_spanningtree/ftopic.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,55 +12,33 @@
  */
 
 #include "inspircd.h"
-#include "xline.h"
-
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
-
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
+#include "commands.h"
 
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /** FTOPIC command */
-bool TreeSocket::ForceTopic(const std::string &source, std::deque<std::string> &params)
+CmdResult CommandFTopic::Handle(const std::vector<std::string>& params, User *user)
 {
-	if (params.size() != 4)
-		return true;
 	time_t ts = atoi(params[1].c_str());
-	std::string nsource = source;
-	Channel* c = this->Instance->FindChan(params[0]);
+	Channel* c = ServerInstance->FindChan(params[0]);
 	if (c)
 	{
-		if ((ts >= c->topicset) || (!*c->topic))
+		if ((ts >= c->topicset) || (c->topic.empty()))
 		{
-			std::string oldtopic = c->topic;
-			strlcpy(c->topic,params[3].c_str(),MAXTOPIC);
-			strlcpy(c->setby,params[2].c_str(),127);
-			c->topicset = ts;
-			/* if the topic text is the same as the current topic,
-			 * dont bother to send the TOPIC command out, just silently
-			 * update the set time and set nick.
-			 */
-			if (oldtopic != params[3])
+			if (c->topic != params[3])
 			{
-				User* user = this->Instance->FindNick(source);
-				if (!user)
-				{
-					c->WriteChannelWithServ(Instance->Config->ServerName, "TOPIC %s :%s", c->name, c->topic);
-				}
-				else
-				{
-					c->WriteChannel(user, "TOPIC %s :%s", c->name, c->topic);
-					nsource = user->server;
-				}
+				// 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());
 			}
 
-			/* all done, send it on its way */
-			params[3] = ":" + params[3];
-			Utils->DoOneToAllButSender(source,"FTOPIC",params,nsource);
+			// Always update setter and settime.
+			c->setby.assign(params[2], 0, 127);
+			c->topicset = ts;
 		}
-
 	}
-	return true;
+	return CMD_SUCCESS;
 }