#include "inspircd.h"
+enum
+{
+ // InspIRCd-specific.
+ RPL_ENDOFPROPLIST = 960,
+ RPL_PROPLIST = 961
+};
+
static void DisplayList(LocalUser* user, Channel* channel)
{
- Numeric::ParamBuilder<1> numeric(user, 961);
+ Numeric::ParamBuilder<1> numeric(user, RPL_PROPLIST);
numeric.AddStatic(channel->name);
const ModeParser::ModeHandlerMap& mhs = ServerInstance->Modes->GetModes(MODETYPE_CHANNEL);
if (!channel->IsModeSet(mh))
continue;
numeric.Add("+" + mh->name);
- if (mh->GetNumParams(true))
+ if (mh->NeedsParam(true))
{
if ((mh->name == "key") && (!channel->HasUser(user)) && (!user->HasPrivPermission("channels/auspex")))
numeric.Add("<key>");
}
}
numeric.Flush();
- user->WriteNumeric(960, channel->name, "End of mode list");
+ user->WriteNumeric(RPL_ENDOFPROPLIST, channel->name, "End of mode list");
}
class CommandProp : public SplitCommand
CommandProp(Module* parent)
: SplitCommand(parent, "PROP", 1)
{
- syntax = "<user|channel> {[+-]<mode> [<value>]}*";
+ syntax = "<channel> [[(+|-)]<mode> [<value>]]";
}
- CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* src)
+ CmdResult HandleLocal(LocalUser* src, const Params& parameters) CXX11_OVERRIDE
{
Channel* const chan = ServerInstance->FindChan(parameters[0]);
if (!chan)
{
- src->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
+ src->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
return CMD_FAILURE;
}
ModeHandler* mh = ServerInstance->Modes->FindMode(prop, MODETYPE_CHANNEL);
if (mh)
{
- if (mh->GetNumParams(plus))
+ if (mh->NeedsParam(plus))
{
if (i != parameters.size())
modes.push(mh, plus, parameters[i++]);
}
// Handle /MODE #chan Z
- void DisplayList(User* user, Channel* chan)
+ void DisplayList(User* user, Channel* chan) CXX11_OVERRIDE
{
if (IS_LOCAL(user))
::DisplayList(static_cast<LocalUser*>(user), chan);
return Version("Provides the ability to manipulate modes via long names.",VF_VENDOR);
}
- void Prioritize()
+ void Prioritize() CXX11_OVERRIDE
{
ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_FIRST);
}
}
curr.param.clear();
- if (mh->GetNumParams(curr.adding))
+ if (mh->NeedsParam(curr.adding))
{
if (value.empty())
{