Improve the message sent when overriding channel modes.

[user/henk/code/inspircd.git] / src / coremods / core_info / cmd_commands.cpp

diff --git a/src/coremods/core_info/cmd_commands.cpp b/src/coremods/core_info/cmd_commands.cpp
index 3f0ab99c1bad81ee65de826027d7b57d0521501f..4e81bbb1b07ef7ea718848524079906a4a7ad6a4 100644 (file)
--- a/src/coremods/core_info/cmd_commands.cpp
+++ b/src/coremods/core_info/cmd_commands.cpp
@@ -1,8 +1,13 @@
 /*
  * 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
@@ -19,49 +24,41 @@
 
 
 #include "inspircd.h"
+#include "core_info.h"
 
-/** Handle /COMMANDS.
- */
-class CommandCommands : public Command
+enum
 {
- public:
-       /** Constructor for commands.
-        */
-       CommandCommands(Module* parent) : Command(parent,"COMMANDS",0,0)
-       {
-               Penalty = 3;
-       }
-
-       /** Handle command.
-        * @param parameters The parameters to the command
-        * @param user The user issuing the command
-        * @return A value from CmdResult to indicate command success or failure.
-        */
-       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+       // InspIRCd-specific.
+       RPL_COMMANDS = 700,
+       RPL_COMMANDSEND = 701
 };
 
+CommandCommands::CommandCommands(Module* parent)
+       : Command(parent, "COMMANDS", 0, 0)
+{
+       Penalty = 3;
+}
+
 /** 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(ServerInstance->Parser->cmdlist.size());
-       for (Commandtable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
+       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));
        }
-       sort(list.begin(), list.end());
+       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;
 }
-
-COMMAND_INIT(CommandCommands)