Greg dev #25

Merged
greg6775 merged 2 commits from greg-dev into master 2019-10-31 11:16:04 +01:00
2 changed files with 6 additions and 6 deletions
Showing only changes of commit e664b18455 - Show all commits

View file

@ -38,10 +38,10 @@ public class KickCommand implements Command {
} else if (event.getMessage().getMentionedMembers().size() == 0) {
EmbedBuilder builder = new EmbedBuilder();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to mention a user!").build()).queue();
} else {
} else {
EmbedBuilder builder = new EmbedBuilder();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("We will be adding multiple kicking within a command in the future.").build()).queue();
}
}
}
}

View file

@ -17,12 +17,12 @@ public class CommandListener extends ListenerAdapter {
@Override
public void onMessageReceived(MessageReceivedEvent event) {
if (event.isFromType(ChannelType.TEXT)) {
if (event.getMessage().getContentRaw().startsWith(Rethink.get("user", "id", event.getAuthor().getId(), "prefix"))) {
if (!event.getAuthor().isBot()) {
if (!event.getAuthor().isBot()) {
if (event.getMessage().getContentRaw().startsWith(Rethink.get("user", "id", event.getAuthor().getId(), "prefix"))) {
CommandHandler.handleCommand(CommandParser.parser(event.getMessage().getContentRaw(), event));
} else if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_ADD_REACTION)) {
event.getMessage().addReaction("🙅").queue();
}
} else if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_ADD_REACTION)) {
event.getMessage().addReaction("🙅").queue();
}
}
}