m_spanningtree Remove duplicate code for sending channel messages from RouteCommand()

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / ftopic.cpp

diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp
index de91c216df22ad76d68c19a431c495ea04e1fcb7..0a4a95f9ec9dbc1c3a9244e5680583516b1b2888 100644 (file)
--- a/src/modules/m_spanningtree/ftopic.cpp
+++ b/src/modules/m_spanningtree/ftopic.cpp
@@ -1,75 +1,69 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
-#include "socket.h"
-#include "wildcard.h"
-#include "xline.h"
-#include "transport.h"
-#include "m_hash.h"
-#include "socketengine.h"
-
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
 
-/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_hash.h */
+#include "inspircd.h"
+#include "commands.h"
 
 /** FTOPIC command */
-bool TreeSocket::ForceTopic(const std::string &source, std::deque<std::string> &params)
+CmdResult CommandFTopic::Handle(User* user, std::vector<std::string>& params)
 {
-       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]);
-       if (c)
-       {
-               if ((ts >= c->topicset) || (!*c->topic))
-               {
-                       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])
-                       {
-                               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;
-                               }
-                               /* all done, send it on its way */
-                               params[3] = ":" + params[3];
-                               Utils->DoOneToAllButSender(source,"FTOPIC",params,nsource);
-                       }
-               }
+       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)
+               // 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
+       if (ts < c->topicset)
+               return CMD_FAILURE;
+
+       /*
+        * 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[4], 0, ServerInstance->Config->Limits.MaxTopic);
+               c->WriteChannel(user, "TOPIC %s :%s", c->name.c_str(), c->topic.c_str());
        }
-       return true;
+
+       // Update setter and settime
+       c->setby.assign(params[3], 0, 127);
+       c->topicset = ts;
+
+       return CMD_SUCCESS;
 }