From 95d60c3e953d29ac57dca8b2be4749b4089e6bed Mon Sep 17 00:00:00 2001 From: Pingex Date: Sun, 11 Sep 2016 16:24:04 +0200 Subject: [PATCH] Restricted commands are now filtered. --- src/main/java/net/pingex/dcf/commands/InternalCommands.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/pingex/dcf/commands/InternalCommands.java b/src/main/java/net/pingex/dcf/commands/InternalCommands.java index 9a5db99..2a6347c 100644 --- a/src/main/java/net/pingex/dcf/commands/InternalCommands.java +++ b/src/main/java/net/pingex/dcf/commands/InternalCommands.java @@ -2,11 +2,13 @@ package net.pingex.dcf.commands; import net.pingex.dcf.core.Configuration; import net.pingex.dcf.permissions.DefaultPermission; +import net.pingex.dcf.permissions.PermissionsHandler; import net.pingex.dcf.util.ArgumentParser; import net.pingex.dcf.util.DiscordInteractionsUtil; import org.apache.commons.lang3.StringUtils; import sx.blah.discord.handle.impl.events.MessageReceivedEvent; import java.util.*; +import java.util.stream.Collectors; /** * Internal commands of DCF. @@ -47,7 +49,9 @@ public class InternalCommands implements IWithCommands public void execute(MessageReceivedEvent event, List arguments) { // Parameters - Set bank = CommandRegistry.getRegistry(); + Set bank = CommandRegistry.getRegistry() + .stream().filter(command -> PermissionsHandler.canRunCommand(event.getMessage(), command)).collect(Collectors.toSet()); + int amountPages = (int) Math.ceil(bank.size()/(double)COMMANDS_PER_PAGE); int requestedPage; int longestCommand = bank.stream().max((o1, o2) -> Integer.compare(o1.getName().length(), o2.getName().length())).get().getName().length();