summaryrefslogtreecommitdiff
path: root/modules/commands/ns_set.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'modules/commands/ns_set.cpp')
-rw-r--r--modules/commands/ns_set.cpp19
1 files changed, 13 insertions, 6 deletions
diff --git a/modules/commands/ns_set.cpp b/modules/commands/ns_set.cpp
index deaec6c62..ae7f10376 100644
--- a/modules/commands/ns_set.cpp
+++ b/modules/commands/ns_set.cpp
@@ -33,6 +33,7 @@ class CommandNSSet : public Command
source.Reply(_("Sets various nickname options. \037option\037 can be one of:"));
Anope::string this_name = source.command;
+ bool hide_privileged_commands = Config->GetBlock("options")->Get<bool>("hideprivilegedcommands");
for (CommandInfo::map::const_iterator it = source.service->commands.begin(), it_end = source.service->commands.end(); it != it_end; ++it)
{
const Anope::string &c_name = it->first;
@@ -40,12 +41,18 @@ class CommandNSSet : public Command
if (c_name.find_ci(this_name + " ") == 0)
{
- ServiceReference<Command> command("Command", info.name);
- if (command)
- {
- source.command = c_name;
- command->OnServHelp(source);
- }
+ ServiceReference<Command> c("Command", info.name);
+ if (!c)
+ continue;
+ else if (!hide_privileged_commands)
+ ; // Always show with hide_privileged_commands disabled
+ else if (!c->AllowUnregistered() && !source.GetAccount())
+ continue;
+ else if (!info.permission.empty() && !source.HasCommand(info.permission))
+ continue;
+
+ source.command = c_name;
+ c->OnServHelp(source);
}
}