perm:audit improvment.

master
Pingex aka Raphaël 9 years ago
parent f8134a4f8b
commit 9b47800da4

@ -41,7 +41,7 @@ public class PermissionsCommands implements IWithCommands
private static final Command permissionAudit = Command.builder("permissions:audit") private static final Command permissionAudit = Command.builder("permissions:audit")
.aliases("perm:audit", "auditperm") .aliases("perm:audit", "auditperm")
.description("Audits permissions status for an user to run a command.") .description("Audits permissions status for an user to run a command.")
.usage("<command> <user#disc|uid|me> [serverid]") .usage("<command> <user#disc|uid|me> [server|sid|*]")
.options(Collections.singleton(new DefaultPermissionOption(DefaultPermissionOption.Value.EVERYONE))) .options(Collections.singleton(new DefaultPermissionOption(DefaultPermissionOption.Value.EVERYONE)))
.build(PermissionsCommands::permissionAuditImpl); .build(PermissionsCommands::permissionAuditImpl);
@ -85,14 +85,18 @@ public class PermissionsCommands implements IWithCommands
} }
// argchk#4 serverid // argchk#4 serverid
Optional<IGuild> targetGuild = Optional.empty(); Optional<IGuild> targetGuild = context.getGuild() != null ? Optional.of(context.getGuild()) : Optional.empty();
if(context.getArguments().size() == 3) if(context.getArguments().size() == 3)
{ {
targetGuild = ArgumentParser.checkParseGuildOrID(context.getArguments().get(2), context.getClient()); if(context.getArguments().get(2).equals("*")) targetGuild = Optional.empty();
if(!targetGuild.isPresent()) else
{ {
DiscordInteractionsUtil.sendMessage(context.getChannel(), "Target guild not found."); targetGuild = ArgumentParser.checkParseGuildOrID(context.getArguments().get(2), context.getClient());
return; if(!targetGuild.isPresent())
{
DiscordInteractionsUtil.sendMessage(context.getChannel(), "Target guild not found.");
return;
}
} }
} }
@ -113,7 +117,7 @@ public class PermissionsCommands implements IWithCommands
sb.append("\n\n"); sb.append("\n\n");
// Result // Result
sb.append("Audit Results\n") sb.append("Audit results\n")
.append("=> OPCode: ").append(result.getOpcode()).append("\n") .append("=> OPCode: ").append(result.getOpcode()).append("\n")
.append("=> Message: ").append(result.getMessage() != null ? result.getMessage() : "N/A").append("\n\n"); .append("=> Message: ").append(result.getMessage() != null ? result.getMessage() : "N/A").append("\n\n");