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 6d99edcc6eeb1176880312bf2d7b0ee6cd3c21e5..0417f1a0cf422e6a1ebcb48088693a251eaa8be1 100644 (file)
--- a/src/coremods/core_channel/cmd_topic.cpp
+++ b/src/coremods/core_channel/cmd_topic.cpp
@@ -25,6 +25,7 @@
 
 CommandTopic::CommandTopic(Module* parent)
        : SplitCommand(parent, "TOPIC", 1, 2)
+       , exemptionprov(parent)
        , secretmode(parent, "secret")
        , topiclockmode(parent, "topiclock")
 {
@@ -32,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;
        }
 
@@ -45,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;
                }
 
@@ -73,10 +74,14 @@ CmdResult CommandTopic::HandleLocal(const std::vector<std::string>& parameters,
                        user->WriteNumeric(ERR_NOTONCHANNEL, c->name, "You're not on that channel!");
                        return CMD_FAILURE;
                }
-               if (c->IsModeSet(topiclockmode) && !ServerInstance->OnCheckExemption(user, c, "topiclock").check(c->GetPrefixValue(user) >= HALFOP_VALUE))
+               if (c->IsModeSet(topiclockmode))
                {
-                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, c->name, "You do not have access to change the topic on this channel");
-                       return CMD_FAILURE;
+                       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");
+                               return CMD_FAILURE;
+                       }
                }
        }