Removed old no longer implemented command

Fixed issue with prefix without command
Alf-Melmac · Jul 7, 2021 · fe49fd7 · fe49fd7
1 parent 9783bd8
commit fe49fd7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/src/main/java/de/webalf/slotbot/model/bot/Commands.java b/src/main/java/de/webalf/slotbot/model/bot/Commands.java
@@ -69,7 +69,6 @@ public enum Event implements CommandEnum {
 		ADD_SLOT(AddSlot.class),
 		BLOCK_SLOT(BlockSlot.class),
 		DEL_SLOT(DelSlot.class),
-		EVENT_JSON(Admin.class),
 		EVENT_PING(EventPing.class),
 		EVENT_PRINT(EventPrint.class),
 		RANDOM_SLOT(RandomSlot.class),

diff --git a/src/main/java/de/webalf/slotbot/service/bot/listener/MessageReceivedListener.java b/src/main/java/de/webalf/slotbot/service/bot/listener/MessageReceivedListener.java
@@ -20,11 +20,8 @@
 import org.thymeleaf.util.ArrayUtils;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import static de.webalf.slotbot.model.bot.Commands.Event.EVENT_JSON;
 import static de.webalf.slotbot.util.StringUtils.isNotEmpty;
 import static de.webalf.slotbot.util.bot.MessageUtils.replyAndDelete;
 import static de.webalf.slotbot.util.bot.MessageUtils.sendDmAndDeleteMessage;
@@ -52,6 +49,8 @@ public void onMessageReceived(@NonNull MessageReceivedEvent event) {
 		final String args = messageText.substring(discordProperties.getPrefix().length()); //Remove prefix
 		List<String> argList = getArgList(args);
 
+		if (argList.isEmpty()) return;
+		@SuppressWarnings("ConstantConditions") //Checked with if above
 		final CommandEnum commandEnum = Commands.get(ListUtils.shift(argList));
 		//Exit if command doesn't exist
 		if (commandEnum == null) return;
@@ -101,17 +100,10 @@ private boolean validate(Message message, List<String> argList, CommandEnum comm
 	 * Returns the arguments as a list
 	 *
 	 * @param args all arguments
-	 * @return arguments {@link StringUtils#splitOnSpacesExceptQuotes(String)} or only command and arguments as second string for special commands
+	 * @return arguments {@link StringUtils#splitOnSpacesExceptQuotes(String)}
 	 */
 	private List<String> getArgList(@NonNull String args) {
-		List<String> argList;
-		if (Arrays.stream(EVENT_JSON.getAnnotation().names()).noneMatch(args.toLowerCase()::matches)) {
-			argList = StringUtils.splitOnSpacesExceptQuotes(args);
-		} else {
-			//For these special commands everything after the command is handled as one argument. Validation and potential splitting must be done by the position called up
-			argList = new ArrayList<>(Arrays.asList(args.split(" ", 2)));
-		}
-		return argList;
+		return StringUtils.splitOnSpacesExceptQuotes(args);
 	}
 
 	/**