From d1dd1fe7581711326a331aef82a3aac5483f9fc4 Mon Sep 17 00:00:00 2001
From: Aleksei <a.gryczewski999@gmail.com>
Date: Thu, 23 Jul 2020 20:34:06 -0400
Subject: [PATCH] Added default command for fallback catching

---
 .../commands/developer/DefaultCommand.java    | 29 +++++++++++++++++++
 .../dev/salmonllama/fsbot/guthix/Guthix.java  | 12 ++++----
 2 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/dev/salmonllama/fsbot/commands/developer/DefaultCommand.java

diff --git a/src/main/java/dev/salmonllama/fsbot/commands/developer/DefaultCommand.java b/src/main/java/dev/salmonllama/fsbot/commands/developer/DefaultCommand.java
new file mode 100644
index 0000000..ad811a4
--- /dev/null
+++ b/src/main/java/dev/salmonllama/fsbot/commands/developer/DefaultCommand.java
@@ -0,0 +1,29 @@
+package dev.salmonllama.fsbot.commands.developer;
+
+import dev.salmonllama.fsbot.guthix.Command;
+import dev.salmonllama.fsbot.guthix.CommandContext;
+import dev.salmonllama.fsbot.guthix.CommandPermission;
+import dev.salmonllama.fsbot.guthix.PermissionType;
+import org.javacord.api.entity.message.embed.EmbedBuilder;
+
+import java.util.Collection;
+import java.util.Collections;
+
+public class DefaultCommand extends Command {
+    @Override public String name() { return "Default"; }
+    @Override public String description() { return "The command that gets invoked when the prefix is used, but the command is not recognized"; }
+    @Override public String usage() { return "you don't use this command"; }
+    @Override public String category() { return "Invisible"; }
+    @Override public CommandPermission permission() { return new CommandPermission(PermissionType.OWNER); }
+    @Override public Collection<String> aliases() { return Collections.singletonList("default"); }
+
+    @Override
+    public void onCommand(CommandContext ctx) {
+        EmbedBuilder response =  new EmbedBuilder()
+                .setTitle("Oops!")
+                .setAuthor(ctx.getApi().getYourself())
+                .setDescription("That's my prefix, but I don't know that command! Try using `~help` to see what I can do!");
+
+        ctx.reply(response);
+    }
+}
diff --git a/src/main/java/dev/salmonllama/fsbot/guthix/Guthix.java b/src/main/java/dev/salmonllama/fsbot/guthix/Guthix.java
index bda093b..e65f7ae 100644
--- a/src/main/java/dev/salmonllama/fsbot/guthix/Guthix.java
+++ b/src/main/java/dev/salmonllama/fsbot/guthix/Guthix.java
@@ -101,15 +101,15 @@ public class Guthix implements MessageCreateListener {
         RegistryCommand rComm = registry.getCommandInfo(content);
         String cmdString = rComm.getCommand().toLowerCase();
 
-        if (registry.isCommandAlias(cmdString)) {
-
-        } else {
-            return;
-        }
+//        if (registry.isCommandAlias(cmdString)) {
+//
+//        } else {
+//            return;
+//        }
 
         String[] cmdArgs = rComm.getArgs();
 
-        Command cmd = registry.findCommand(cmdString).orElse(null); // TODO: default command here
+        Command cmd = registry.findCommand(cmdString).orElse(new DefaultCommand()); // TODO: default command here
 
         CommandContext ctx = new CommandContext.CommandContextBuilder(
                 event,