/*
* InspIRCd -- Internet Relay Chat Daemon
*
- * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- * Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2013, 2017-2018, 2020 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2012, 2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ * Copyright (C) 2007-2008 Craig Edwards <brain@inspircd.org>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
*
* 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
#include "inspircd.h"
#include "core_info.h"
+enum
+{
+ // InspIRCd-specific.
+ RPL_COMMANDS = 700,
+ RPL_COMMANDSEND = 701
+};
+
CommandCommands::CommandCommands(Module* parent)
: Command(parent, "COMMANDS", 0, 0)
{
/** Handle /COMMANDS
*/
-CmdResult CommandCommands::Handle (const std::vector<std::string>&, User *user)
+CmdResult CommandCommands::Handle(User* user, const Params& parameters)
{
const CommandParser::CommandMap& commands = ServerInstance->Parser.GetCommands();
std::vector<std::string> list;
list.reserve(commands.size());
for (CommandParser::CommandMap::const_iterator i = commands.begin(); i != commands.end(); ++i)
{
- // Don't show S2S commands to users
- if (i->second->flags_needed == FLAG_SERVERONLY)
+ // Don't show privileged commands to users without the privilege.
+ if (i->second->flags_needed && !user->IsModeSet(i->second->flags_needed))
continue;
Module* src = i->second->creator;
- list.push_back(InspIRCd::Format(":%s %03d %s :%s %s %d %d", ServerInstance->Config->ServerName.c_str(),
- RPL_COMMANDS, user->nick.c_str(), i->second->name.c_str(), src->ModuleSourceFile.c_str(),
+ list.push_back(InspIRCd::Format("%s %s %d %d", i->second->name.c_str(), src->ModuleSourceFile.c_str(),
i->second->min_params, i->second->Penalty));
}
std::sort(list.begin(), list.end());
for(unsigned int i=0; i < list.size(); i++)
- user->Write(list[i]);
- user->WriteNumeric(RPL_COMMANDSEND, ":End of COMMANDS list");
+ user->WriteNumeric(RPL_COMMANDS, list[i]);
+ user->WriteNumeric(RPL_COMMANDSEND, "End of COMMANDS list");
return CMD_SUCCESS;
}