Merge pull request #1351 from SaberUK/master+webirc

[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 bd15489a23ace769e44f5d4f5cd4c74e0ff8fbc1..de72d162a4bbeade99d9f98d02009bd027459526 100644 (file)
--- a/src/modules/m_spanningtree/ftopic.cpp
+++ b/src/modules/m_spanningtree/ftopic.cpp
@@ -28,19 +28,12 @@ CmdResult CommandFTopic::Handle(User* user, std::vector<std::string>& params)
        if (!c)
                return CMD_FAILURE;
 
-       time_t ChanTS = ConvToInt(params[1]);
-       if (!ChanTS)
-               return CMD_INVALID;
-
-       if (c->age < ChanTS)
+       if (c->age < ServerCommand::ExtractTS(params[1]))
                // 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
+       time_t ts = ServerCommand::ExtractTS(params[2]);
        if (ts < c->topicset)
                return CMD_FAILURE;
 
@@ -70,19 +63,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;
 }