From f8e438d295cfd03b1f57af799d3695e275d98dca Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 14 Dec 2019 13:03:01 +0100 Subject: [PATCH] Clear All --- .../hadder/commands/moderation/ClearCommand.java | 15 ++++++++++++++- .../Translations/Translations_en.properties | 4 +++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java index a1f643e..98e0599 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java @@ -23,7 +23,20 @@ public class ClearCommand implements Command { if (event.getGuild().getMemberById(event.getAuthor().getId()).hasPermission(Permission.MESSAGE_MANAGE) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) { if (event.getGuild().getMemberById(event.getJDA().getSelfUser().getId()).hasPermission(Permission.MESSAGE_MANAGE)) { if (args[0].equals("all")) { - event.getMessage().delete().queue(); + List msg = event.getTextChannel().getIterableHistory().complete(); + for (Message message : msg) { + message.delete().queue(); + } + Message message = event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.lear.all.success.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.lear.all.success.description", String.valueOf(msg.size()))) + .build()).complete(); + try { + TimeUnit.SECONDS.sleep(2); + } catch (InterruptedException e) { + e.printStackTrace(); + } + message.delete().queue(); } else { try { int nbToDelete = Integer.parseInt(args[0]); diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index edb8cae..16ae60d 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -10,7 +10,7 @@ Hadder = Hadder searchterm = username = -number = +number = /all guildprefix = prefix = vc-name/id = @@ -90,6 +90,8 @@ commands.moderation.ban.myself.error.description = I can not ban myself! commands.moderation.ban.yourself.error.description = You can not ban yourself! commands.moderation.ban.massban.success.description = I successfully baned %extra% Members! commands.moderation.ban.help.description = Bans one ore more user from the server +commands.moderation.lear.all.success.title = Successfully deleted +commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99! commands.moderation.clear.success.description = Successfully deleted %extra% messages. commands.moderation.clear.message.error.title = No messages!