Command usage and message fixes

DevLeoko · Mar 26, 2020 · f768a45 · f768a45
1 parent d1741aa
commit f768a45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/me/leoko/advancedban/utils/Command.java b/src/main/java/me/leoko/advancedban/utils/Command.java
@@ -30,7 +30,7 @@ public enum Command {
 
     TEMP_BAN(
             PunishmentType.TEMP_BAN.getPerms(),
-            "\\S+ [1-9][0-9]*([wdhms]|mo)( .*)?",
+            "\\S+ ([1-9][0-9]*([wdhms]|mo)|#.+)( .*)?",
             new PunishmentProcessor(PunishmentType.TEMP_BAN),
             PunishmentType.TEMP_BAN.getConfSection("Usage"),
             "tempban"),
@@ -51,7 +51,7 @@ public enum Command {
 
     TEMP_MUTE(
             PunishmentType.TEMP_MUTE.getPerms(),
-            "\\S+ [1-9][0-9]*([wdhms]|mo)( .*)?",
+            "\\S+ ([1-9][0-9]*([wdhms]|mo)|#.+)( .*)?",
             new PunishmentProcessor(PunishmentType.TEMP_MUTE),
             PunishmentType.TEMP_MUTE.getConfSection("Usage"),
             "tempmute"),
@@ -65,7 +65,7 @@ public enum Command {
 
     TEMP_WARN(
             PunishmentType.TEMP_WARNING.getPerms(),
-            "\\S+ [1-9][0-9]*([wdhms]|mo)( .*)?",
+            "\\S+ ([1-9][0-9]*([wdhms]|mo)|#.+)( .*)?",
             new PunishmentProcessor(PunishmentType.TEMP_WARNING),
             PunishmentType.TEMP_WARNING.getConfSection("Usage"),
             "tempwarn"),

diff --git a/src/main/java/me/leoko/advancedban/utils/commands/RevokeByIdProcessor.java b/src/main/java/me/leoko/advancedban/utils/commands/RevokeByIdProcessor.java
@@ -23,7 +23,7 @@ public void accept(Command.CommandInput input) {
 
         Punishment punishment = resolver.apply(id);
         if (punishment == null) {
-            MessageManager.sendMessage(input.getSender(), path + ".NotPunished",
+            MessageManager.sendMessage(input.getSender(), path + ".NotFound",
                     true, "ID", id + "");
             return;
         }