From 9566f38da726ef427dcdea678ad6261537052a1d Mon Sep 17 00:00:00 2001 From: Venal Date: Thu, 25 Jan 2018 22:50:43 -0500 Subject: [PATCH 1/2] switch isInt method to appropriate class --- src/main/java/io/rixa/bot/utils/DiscordUtils.java | 11 +---------- src/main/java/io/rixa/bot/utils/Utils.java | 9 +++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/io/rixa/bot/utils/DiscordUtils.java b/src/main/java/io/rixa/bot/utils/DiscordUtils.java index 328f225..2ac9a4f 100644 --- a/src/main/java/io/rixa/bot/utils/DiscordUtils.java +++ b/src/main/java/io/rixa/bot/utils/DiscordUtils.java @@ -11,16 +11,7 @@ import java.util.Optional; import java.util.stream.Collectors; public class DiscordUtils { - - public static boolean isInt(String s) { - try { - Integer.parseInt(s); - return true; - } catch (NumberFormatException ex) { - return false; - } - } - + public static List memberSearch(Guild guild, String string, boolean bots) { List members = new ArrayList<>(); String finalString = string.toLowerCase(); diff --git a/src/main/java/io/rixa/bot/utils/Utils.java b/src/main/java/io/rixa/bot/utils/Utils.java index cd024a2..1ddc2eb 100644 --- a/src/main/java/io/rixa/bot/utils/Utils.java +++ b/src/main/java/io/rixa/bot/utils/Utils.java @@ -2,6 +2,15 @@ package io.rixa.bot.utils; public class Utils { + public static boolean isInt(String s) { + try { + Integer.parseInt(s); + return true; + } catch (NumberFormatException ex) { + return false; + } + } + public static boolean isInteger(String s) { return isInteger(s,10); } From f0b36ba46657a10952bbb2042609d3a3e27028c2 Mon Sep 17 00:00:00 2001 From: Venal Date: Thu, 25 Jan 2018 23:25:40 -0500 Subject: [PATCH 2/2] usersWithRole = sendingSuccess Is leaderboard complete?? --- .../java/io/rixa/bot/commands/cmds/admin/PMCommand.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/rixa/bot/commands/cmds/admin/PMCommand.java b/src/main/java/io/rixa/bot/commands/cmds/admin/PMCommand.java index 04ac55a..0e3cee2 100644 --- a/src/main/java/io/rixa/bot/commands/cmds/admin/PMCommand.java +++ b/src/main/java/io/rixa/bot/commands/cmds/admin/PMCommand.java @@ -31,13 +31,13 @@ public class PMCommand extends Command { return; } msg = msg.replaceFirst(role.getAsMention(), "").replaceFirst("@" + role.getName(),""); - int usersWithRole = 0; + int sendingSuccess = 0; int sendingFailed = 0; String finalMsg = msg; for (Member memberWithRole : guild.getMembersWithRoles(role)) { try { memberWithRole.getUser().openPrivateChannel().queue(privateChannel -> privateChannel.sendMessage(finalMsg).queue()); - usersWithRole++; + sendingSuccess++; } catch (ErrorResponseException ex) { if (ex.getErrorResponse() == ErrorResponse.CANNOT_SEND_TO_USER) sendingFailed++; @@ -46,6 +46,6 @@ public class PMCommand extends Command { MessageFactory.create(msg) .setAuthor("Private Message: " + role.getName(), guild.getIconUrl()) .setTimestamp() - .footer("Successful Deliveries: " + usersWithRole + " | Failed Deliveries: " + sendingFailed, guild.getIconUrl()).queue(channel); + .footer("Successful Deliveries: " + sendingSuccess + " | Failed Deliveries: " + sendingFailed, guild.getIconUrl()).queue(channel); } } \ No newline at end of file