Remove now needless User::ForceNickChange()

[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 918bb7f2c4557d5a808841e9772900c9408140bb..3c76c928aa6a7d773390547f5ee9b46e02516a32 100644 (file)
--- a/src/modules/m_spanningtree/ftopic.cpp
+++ b/src/modules/m_spanningtree/ftopic.cpp
@@ -22,40 +22,80 @@
 #include "commands.h"
 
 /** FTOPIC command */
-CmdResult CommandFTopic::Handle(const std::vector<std::string>& params, User *user)
+CmdResult CommandFTopic::Handle(User* user, std::vector<std::string>& params)
 {
        Channel* c = ServerInstance->FindChan(params[0]);
        if (!c)
                return CMD_FAILURE;
 
-       time_t ts = ConvToInt(params[1]);
-       if (!ts)
-               return CMD_INVALID;
+       if (c->age < ServerCommand::ExtractTS(params[1]))
+               // Our channel TS is older, nothing to do
+               return CMD_FAILURE;
 
        // 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
         * 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[3]))
-               return CMD_FAILURE; // Topics were set at the exact same time, keep our topic and setter
+       if (ts == c->topicset)
+       {
+               // Discard if their topic text is "smaller"
+               if (c->topic > newtopic)
+                       return CMD_FAILURE;
+
+               // 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;
+       }
 
-       if (c->topic != params[3])
+       if (c->topic != newtopic)
        {
                // Update topic only when it differs from current topic
-               c->topic.assign(params[3], 0, ServerInstance->Config->Limits.MaxTopic);
+               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(params[2], 0, 127);
+       c->setby.assign(setter, 0, 128);
        c->topicset = ts;
 
+       FOREACH_MOD(OnPostTopicChange, (user, c, c->topic));
+
        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);
+}