Pass the Extensible container to ExtensionItem::free().

[user/henk/code/inspircd.git] / src / coremods / core_channel / cmd_topic.cpp

diff --git a/src/coremods/core_channel/cmd_topic.cpp b/src/coremods/core_channel/cmd_topic.cpp
index ec6ed974490dadc4499eef374a140a9202c19af7..0417f1a0cf422e6a1ebcb48088693a251eaa8be1 100644 (file)
--- a/src/coremods/core_channel/cmd_topic.cpp
+++ b/src/coremods/core_channel/cmd_topic.cpp
@@ -33,12 +33,12 @@ CommandTopic::CommandTopic(Module* parent)
        Penalty = 2;
 }
 
-CmdResult CommandTopic::HandleLocal(const std::vector<std::string>& parameters, LocalUser* user)
+CmdResult CommandTopic::HandleLocal(LocalUser* user, const Params& parameters)
 {
        Channel* c = ServerInstance->FindChan(parameters[0]);
        if (!c)
        {
-               user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
+               user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
                return CMD_FAILURE;
        }
 
@@ -46,7 +46,7 @@ CmdResult CommandTopic::HandleLocal(const std::vector<std::string>& parameters,
        {
                if ((c->IsModeSet(secretmode)) && (!c->HasUser(user)))
                {
-                       user->WriteNumeric(Numerics::NoSuchNick(c->name));
+                       user->WriteNumeric(Numerics::NoSuchChannel(c->name));
                        return CMD_FAILURE;
                }
 
@@ -76,8 +76,7 @@ CmdResult CommandTopic::HandleLocal(const std::vector<std::string>& parameters,
                }
                if (c->IsModeSet(topiclockmode))
                {
-                       ModResult MOD_RESULT;
-                       FIRST_MOD_RESULT_CUSTOM(exemptionprov, CheckExemption::EventListener, OnCheckExemption, MOD_RESULT, (user, c, "topiclock"));
+                       ModResult MOD_RESULT = CheckExemption::Call(exemptionprov, user, c, "topiclock");
                        if (!MOD_RESULT.check(c->GetPrefixValue(user) >= HALFOP_VALUE))
                        {
                                user->WriteNumeric(ERR_CHANOPRIVSNEEDED, c->name, "You do not have access to change the topic on this channel");