feat: 异常信息支持自定义message提示

SNWCreations · Aug 27, 2024 · 0752eba · 0752eba
1 parent fc97955
commit 0752eba
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/snw/kookbc/impl/command/litecommands/argument/ChannelArgument.java b/src/main/java/snw/kookbc/impl/command/litecommands/argument/ChannelArgument.java
@@ -34,6 +34,7 @@
 
 public class ChannelArgument<T extends Channel> extends ArgumentResolver<CommandSender, T> {
     public static final MessageKey<String> CHANNEL_NOT_FOUND = MessageKey.of("channel_not_found", "Channel not found");
+    public static final MessageKey<CommandException> EMOJI_FOUND_FAILURE = MessageKey.of("emoji_found_failure", "Emoji found failure");
 
     private final HttpAPI httpAPI;
     private final MessageRegistry<CommandSender> messageRegistry;
@@ -60,7 +61,7 @@ protected ParseResult<T> parse(Invocation<CommandSender> invocation, Argument<T>
             }
             return ParseResult.success((T) channel);
         } catch (final Exception e) {
-            return ParseResult.failure(new CommandException("Channel not found", e));
+            return ParseResult.failure(messageRegistry.getInvoked(EMOJI_FOUND_FAILURE, invocation, new CommandException("Channel not found", e)));
         }
     }
 

diff --git a/src/main/java/snw/kookbc/impl/command/litecommands/argument/EmojiArgument.java b/src/main/java/snw/kookbc/impl/command/litecommands/argument/EmojiArgument.java
@@ -49,6 +49,7 @@ public class EmojiArgument extends ArgumentResolver<CommandSender, CustomEmoji>
         }
         return "Unsupported command";
     });
+    public static final MessageKey<CommandException> EMOJI_FOUND_FAILURE = MessageKey.of("emoji_found_failure", "Emoji found failure");
 
     private final KBCClient client;
     private final MessageRegistry<CommandSender> messageRegistry;
@@ -105,7 +106,7 @@ protected ParseResult<CustomEmoji> parse(Invocation<CommandSender> invocation, A
             }
             return ParseResult.failure(messageRegistry.getInvoked(NOT_CHANNEL, invocation, message));
         } catch (final Exception e) {
-            return ParseResult.failure(new CommandException("CustomEmoji not found", e));
+            return ParseResult.failure(messageRegistry.getInvoked(EMOJI_FOUND_FAILURE, invocation, new CommandException("CustomEmoji not found", e)));
         }
     }
 

diff --git a/src/main/java/snw/kookbc/impl/command/litecommands/argument/GuildArgument.java b/src/main/java/snw/kookbc/impl/command/litecommands/argument/GuildArgument.java
@@ -33,6 +33,7 @@
 
 public class GuildArgument extends ArgumentResolver<CommandSender, Guild> {
     public static final MessageKey<String> GUILD_NOT_FOUND = MessageKey.of("guild_not_found", "Guild not found");
+    public static final MessageKey<CommandException> GUILD_FOUND_FAILURE = MessageKey.of("guild_found_failure", "Guild found failure");
 
     private final HttpAPI httpAPI;
     private final MessageRegistry<CommandSender> messageRegistry;
@@ -52,7 +53,7 @@ protected ParseResult<Guild> parse(Invocation<CommandSender> invocation, Argumen
             }
             return ParseResult.success(guild);
         } catch (final Exception e) {
-            return ParseResult.failure(new CommandException("Guild not found", e));
+            return ParseResult.failure(messageRegistry.getInvoked(GUILD_FOUND_FAILURE, invocation, new CommandException("Guild not found", e)));
         }
     }
 

diff --git a/src/main/java/snw/kookbc/impl/command/litecommands/argument/RoleArgument.java b/src/main/java/snw/kookbc/impl/command/litecommands/argument/RoleArgument.java
@@ -49,6 +49,7 @@ public class RoleArgument extends ArgumentResolver<CommandSender, Role> {
         }
         return "Unsupported command";
     });
+    public static final MessageKey<CommandException> ROLE_FOUND_FAILURE = MessageKey.of("role_found_failure", "Role found failure");
 
     private final KBCClient client;
     private final MessageRegistry<CommandSender> messageRegistry;
@@ -102,7 +103,7 @@ protected ParseResult<Role> parse(Invocation<CommandSender> invocation, Argument
             }
             return ParseResult.failure(messageRegistry.getInvoked(NOT_CHANNEL, invocation, message));
         } catch (final Exception e) {
-            return ParseResult.failure(new CommandException("Role not found", e));
+            return ParseResult.failure(messageRegistry.getInvoked(ROLE_FOUND_FAILURE, invocation, new CommandException("Role not found", e)));
         }
     }
 

diff --git a/src/main/java/snw/kookbc/impl/command/litecommands/argument/UserArgument.java b/src/main/java/snw/kookbc/impl/command/litecommands/argument/UserArgument.java
@@ -33,6 +33,7 @@
 
 public class UserArgument extends ArgumentResolver<CommandSender, User> {
     public static final MessageKey<String> USER_NOT_FOUND = MessageKey.of("user_not_found", "User not found");
+    public static final MessageKey<CommandException> USER_FOUND_FAILURE = MessageKey.of("user_found_failure", "User found failure");
 
     private final HttpAPI httpAPI;
     private final MessageRegistry<CommandSender> messageRegistry;
@@ -58,7 +59,7 @@ protected ParseResult<User> parse(Invocation<CommandSender> invocation, Argument
             }
             return ParseResult.success(user);
         } catch (final Exception e) {
-            return ParseResult.failure(new CommandException("User not found", e));
+            return ParseResult.failure(messageRegistry.getInvoked(USER_FOUND_FAILURE, invocation, new CommandException("User not found", e)));
         }
     }