Fix build of m_spanningtree and display of dependency regeneration

[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 e18187087fa8fa1320b6c9d589b90a6e15b1d21a..8ba5f90ab177e43f47850b694d60684adad1eb84 100644 (file)
--- 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-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
@@ -27,41 +27,34 @@ bool TreeSocket::ForceTopic(const std::string &source, std::deque<std::string> &
        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 = this->ServerInstance->FindChan(params[0]);
        if (c)
        {
                if ((ts >= c->topicset) || (c->topic.empty()))
                {
-                       std::string oldtopic = c->topic;
-                       c->topic.assign(params[3], 0, Instance->Config->Limits.MaxTopic);
-                       c->setby.assign(params[2], 0, 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);
+                               User* user = this->ServerInstance->FindNick(source);
+                               // Update topic only when it differs from current topic
+                               c->topic.assign(params[3], 0, ServerInstance->Config->Limits.MaxTopic);
                                if (!user)
                                {
-                                       c->WriteChannelWithServ(Instance->Config->ServerName, "TOPIC %s :%s", c->name.c_str(), c->topic.c_str());
+                                       std::string sourceserv = Utils->FindServer(source)->GetName();
+                                       c->WriteChannelWithServ(sourceserv.c_str(), "TOPIC %s :%s", c->name.c_str(), c->topic.c_str());
                                }
                                else
                                {
                                        c->WriteChannel(user, "TOPIC %s :%s", c->name.c_str(), c->topic.c_str());
-                                       nsource = user->server;
                                }
                        }
 
+                       // Always update setter and settime.
+                       c->setby.assign(params[2], 0, 127);
+                       c->topicset = ts;
+
                        /* all done, send it on its way */
                        params[3] = ":" + params[3];
-                       User* u = Instance->FindNick(nsource);
-                       if (u)
-                               Utils->DoOneToAllButSender(u->uuid,"FTOPIC",params,u->server);
-                       else
-                               Utils->DoOneToAllButSender(source,"FTOPIC",params,nsource);
+                       Utils->DoOneToAllButSender(source,"FTOPIC",params,source);
                }
 
        }