From e4be8face5d5ce2bd5a7d5c842bfb1ef95164135 Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Mon, 17 Apr 2023 16:31:00 +0700 Subject: [PATCH] this is why you should test the code before commiting --- .../chomens_bot/commands/GrepLogCommand.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/GrepLogCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/GrepLogCommand.java index fb20eba4..f917f962 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/GrepLogCommand.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/GrepLogCommand.java @@ -47,6 +47,11 @@ public class GrepLogCommand implements Command { boolean ignoreCase = false; boolean regex = false; + if (_args[0].equals("stop")) { + bot.grepLog().thread().interrupt(); + return Component.text("success"); + } + // this is a mess if (_args[0].equals("-ignorecase")) { ignoreCase = true; @@ -54,15 +59,14 @@ public class GrepLogCommand implements Command { } else if (_args[0].equals("-regex")) { regex = true; args = Arrays.copyOfRange(_args, 1, _args.length); - } else if (_args[1].equals("-ignorecase")) { + } + + if (_args.length > 1 && _args[1].equals("-ignorecase")) { ignoreCase = true; args = Arrays.copyOfRange(_args, 2, _args.length); - } else if (_args[1].equals("-regex")) { + } else if (_args.length > 1 && _args[1].equals("-regex")) { regex = true; args = Arrays.copyOfRange(_args, 2, _args.length); - } else if (_args[0].equals("stop")) { - bot.grepLog().thread().interrupt(); - return Component.text("success"); } bot.grepLog().query(String.join(" ", args), regex, ignoreCase);