X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_channel%2Fcmd_topic.cpp;h=ab60f54f5afe452c195ea02603cdc3f8204a15c5;hb=78db7544d26cdeffeb2bd8045529fe90bd5d852d;hp=ec6ed974490dadc4499eef374a140a9202c19af7;hpb=a3e0768758ca68429a29d9c78ce672f2d938c6e7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/coremods/core_channel/cmd_topic.cpp b/src/coremods/core_channel/cmd_topic.cpp index ec6ed9744..ab60f54f5 100644 --- a/src/coremods/core_channel/cmd_topic.cpp +++ b/src/coremods/core_channel/cmd_topic.cpp @@ -1,10 +1,15 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2019 Matt Schatz + * Copyright (C) 2017-2018 Sadie Powell + * Copyright (C) 2017 B00mX0r + * Copyright (C) 2013-2016 Attila Molnar + * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2007-2008 Robin Burchell - * Copyright (C) 2008 Craig Edwards - * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006, 2010 Craig Edwards * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public @@ -29,24 +34,24 @@ CommandTopic::CommandTopic(Module* parent) , secretmode(parent, "secret") , topiclockmode(parent, "topiclock") { - syntax = " []"; + syntax = " [:]"; Penalty = 2; } -CmdResult CommandTopic::HandleLocal(const std::vector& 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; } if (parameters.size() == 1) { - if ((c->IsModeSet(secretmode)) && (!c->HasUser(user))) + if ((c->IsModeSet(secretmode)) && (!c->HasUser(user) && !user->HasPrivPermission("channels/auspex"))) { - user->WriteNumeric(Numerics::NoSuchNick(c->name)); + user->WriteNumeric(Numerics::NoSuchChannel(c->name)); return CMD_FAILURE; } @@ -76,8 +81,7 @@ CmdResult CommandTopic::HandleLocal(const std::vector& 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");