greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Greg dev #269

Merged
greg6775 merged 157 commits from greg-dev into hax-dev 2019-12-28 13:12:48 +01:00
Conversation 0 Commits 157 Files changed 42 +21 -7
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2f72f5e7b8 - Show all commits

24
src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java
View file

@ -50,13 +50,25 @@ public class ClearCommand implements Command {
List<Message> history = event.getTextChannel().getHistory().retrievePast(nbToDelete + 1).complete(); List<Message> history = event.getTextChannel().getHistory().retrievePast(nbToDelete + 1).complete();
List<Message> msgToDelete = new ArrayList<>(history); List<Message> msgToDelete = new ArrayList<>(history);
event.getTextChannel().deleteMessages(msgToDelete).queue(); event.getTextChannel().deleteMessages(msgToDelete).queue();
Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "", "", "commands.moderation.clear.success.description", String.valueOf(nbToDelete)).build()).complete(); if (nbToDelete == 1) {
try { Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.clear.success.title",
TimeUnit.SECONDS.sleep(2); "commands.moderation.clear.success.description.singular").build()).complete();
} catch (InterruptedException e) { try {
e.printStackTrace(); TimeUnit.SECONDS.sleep(2);
} catch (InterruptedException e) {
e.printStackTrace();
}
msg.delete().queue();
} else {
Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.clear.success.title", "",
"commands.moderation.clear.success.description.plural", String.valueOf(nbToDelete)).build()).complete();
try {
TimeUnit.SECONDS.sleep(2);
} catch (InterruptedException e) {
e.printStackTrace();
}
msg.delete().queue();
} }
msg.delete().queue();
} }
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
event.getHelpCommand().sendHelp(this, event); event.getHelpCommand().sendHelp(this, event);

4
src/main/resources/Translations/Translations_en.properties
View file

@ -94,7 +94,9 @@ commands.moderation.ban.help.description = Bans one ore more user from the serve
commands.moderation.lear.all.success.title = Successfully deleted commands.moderation.lear.all.success.title = Successfully deleted
commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. 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.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.success.title = Successfully cleared
commands.moderation.clear.success.description.singular = Successfully deleted one message.
commands.moderation.clear.success.description.plural = Successfully deleted %extra% messages.
commands.moderation.clear.message.error.title = No messages\! commands.moderation.clear.message.error.title = No messages\!
commands.moderation.clear.message.error.description = There are no messages in this channel. commands.moderation.clear.message.error.description = There are no messages in this channel.
commands.moderation.clear.help.description = Deletes the specified number of messages. commands.moderation.clear.help.description = Deletes the specified number of messages.