diff --git a/src/main/java/net/Broken/Commands/DayTrigger.java b/src/main/java/net/Broken/Commands/DayTrigger.java index e9045be..89440d9 100644 --- a/src/main/java/net/Broken/Commands/DayTrigger.java +++ b/src/main/java/net/Broken/Commands/DayTrigger.java @@ -26,7 +26,9 @@ public class DayTrigger implements Commande{ @Override public void action(String[] args, MessageReceivedEvent event) { + if(!event.isFromType(ChannelType.PRIVATE)) event.getMessage().delete().queue(); + DayListener.getInstance().trigger(); } diff --git a/src/main/java/net/Broken/MainBot.java b/src/main/java/net/Broken/MainBot.java index e02668d..7b789cc 100644 --- a/src/main/java/net/Broken/MainBot.java +++ b/src/main/java/net/Broken/MainBot.java @@ -101,7 +101,14 @@ public class MainBot { if (commandes.containsKey(cmd.commande)) { Commande cmdObj = commandes.get(cmd.commande); - if(!cmdObj.isAdminCmd() || cmd.event.getMember().hasPermission(Permission.ADMINISTRATOR)){ + boolean isAdmin; + if(cmd.event.isFromType(ChannelType.PRIVATE)){ + isAdmin = jda.getGuilds().get(0).getMember(cmd.event.getAuthor()).hasPermission(Permission.ADMINISTRATOR); + } + else + isAdmin = cmd.event.getMember().hasPermission(Permission.ADMINISTRATOR); + + if(!cmdObj.isAdminCmd() || isAdmin){ if(cmd.event.isFromType(ChannelType.PRIVATE) && commandes.get(cmd.commande).isPrivateUsable()) {