Sync helpop chmodes s and p with docs

[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..2f9813860fe8803cae12fb202c1ebebe9d047927 100644 (file)
--- a/src/modules/m_spanningtree/ftopic.cpp
+++ b/src/modules/m_spanningtree/ftopic.cpp
@@ -1,7 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -22,25 +26,18 @@
 #include "commands.h"
 
 /** FTOPIC command */
-CmdResult CommandFTopic::Handle(User* user, std::vector<std::string>& params)
+CmdResult CommandFTopic::Handle(User* user, Params& params)
 {
        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)
+       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;
 
@@ -53,7 +50,7 @@ CmdResult CommandFTopic::Handle(User* user, std::vector<std::string>& params)
        /*
         * 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
+        * string comparison, so non-empty topics always overridde
         * empty topics if their timestamps are equal
         *
         * Similarly, if the topic texts are equal too, keep one topic
@@ -70,19 +67,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;
 }