Use CommandBase::Params instead of std::vector<std::string>.

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

diff --git a/src/modules/m_topiclock.cpp b/src/modules/m_topiclock.cpp
index 8d381d8488043343b3726d47d109851a278b4196..cbe524408b39f133856c8c50452a1229f8499ab8 100644 (file)
--- a/src/modules/m_topiclock.cpp
+++ b/src/modules/m_topiclock.cpp
@@ -18,6 +18,12 @@
 
 #include "inspircd.h"
 
+enum
+{
+       // InspIRCd-specific.
+       ERR_TOPICLOCK = 744
+};
+
 class CommandSVSTOPIC : public Command
 {
  public:
@@ -27,9 +33,9 @@ class CommandSVSTOPIC : public Command
                flags_needed = FLAG_SERVERONLY;
        }
 
-       CmdResult Handle(const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               if (!ServerInstance->ULine(user->server))
+               if (!user->server->IsULine())
                {
                        // Ulines only
                        return CMD_FAILURE;
@@ -45,42 +51,23 @@ class CommandSVSTOPIC : public Command
                        time_t topicts = ConvToInt(parameters[1]);
                        if (!topicts)
                        {
-                               ServerInstance->Logs->Log("m_topiclock", LOG_DEFAULT, "Received SVSTOPIC with a 0 topicts, dropped.");
+                               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Received SVSTOPIC with a 0 topicts, dropped.");
                                return CMD_INVALID;
                        }
 
-                       std::string newtopic;
-                       newtopic.assign(parameters[3], 0, ServerInstance->Config->Limits.MaxTopic);
-                       bool topics_differ = (chan->topic != newtopic);
-                       if ((topics_differ) || (chan->topicset != topicts) || (chan->setby != parameters[2]))
-                       {
-                               // Update when any parameter differs
-                               chan->topicset = topicts;
-                               chan->setby.assign(parameters[2], 0, 127);
-                               chan->topic = newtopic;
-                               // Send TOPIC to clients only if the actual topic has changed, be silent otherwise
-                               if (topics_differ)
-                                       chan->WriteChannel(user, "TOPIC %s :%s", chan->name.c_str(), chan->topic.c_str());
-                       }
+                       chan->SetTopic(user, parameters[3], topicts, &parameters[2]);
                }
                else
                {
                        // 1 parameter version, nuke the topic
-                       bool topic_empty = chan->topic.empty();
-                       if (!topic_empty || !chan->setby.empty())
-                       {
-                               chan->topicset = 0;
-                               chan->setby.clear();
-                               chan->topic.clear();
-                               if (!topic_empty)
-                                       chan->WriteChannel(user, "TOPIC %s :", chan->name.c_str());
-                       }
+                       chan->SetTopic(user, std::string(), 0);
+                       chan->setby.clear();
                }
 
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                return ROUTE_BROADCAST;
        }
@@ -90,11 +77,7 @@ class FlagExtItem : public ExtensionItem
 {
  public:
        FlagExtItem(const std::string& key, Module* owner)
-               : ExtensionItem(key, owner)
-       {
-       }
-
-       ~FlagExtItem()
+               : ExtensionItem(key, ExtensionItem::EXT_CHANNEL, owner)
        {
        }
 
@@ -103,7 +86,7 @@ class FlagExtItem : public ExtensionItem
                return (get_raw(container) != NULL);
        }
 
-       std::string serialize(SerializeFormat format, const Extensible* container, void* item) const
+       std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE
        {
                if (format == FORMAT_USER)
                        return "true";
@@ -111,7 +94,7 @@ class FlagExtItem : public ExtensionItem
                return "1";
        }
 
-       void unserialize(SerializeFormat format, Extensible* container, const std::string& value)
+       void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE
        {
                if (value == "1")
                        set_raw(container, this);
@@ -132,7 +115,7 @@ class FlagExtItem : public ExtensionItem
                unset_raw(container);
        }
 
-       void free(void* item)
+       void free(void* item) CXX11_OVERRIDE
        {
                // nothing to free
        }
@@ -149,19 +132,12 @@ class ModuleTopicLock : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->AddService(cmd);
-               ServerInstance->Modules->AddService(topiclock);
-               ServerInstance->Modules->Attach(I_OnPreTopicChange, this);
-       }
-
        ModResult OnPreTopicChange(User* user, Channel* chan, const std::string &topic) CXX11_OVERRIDE
        {
                // Only fired for local users currently, but added a check anyway
                if ((IS_LOCAL(user)) && (topiclock.get(chan)))
                {
-                       user->WriteNumeric(744, "%s :TOPIC cannot be changed due to topic lock being active on the channel", chan->name.c_str());
+                       user->WriteNumeric(ERR_TOPICLOCK, chan->name, "TOPIC cannot be changed due to topic lock being active on the channel");
                        return MOD_RES_DENY;
                }