From dc97bfcd9c92cd99c6b6af64863999d58f502279 Mon Sep 17 00:00:00 2001
From: Nicholas Rose <35816886+nicholasgrose@users.noreply.github.com>
Date: Sat, 5 Aug 2023 16:19:32 -0500
Subject: [PATCH] Add 'stop' and 'rebuild' subcommands to /gateway bot (#90)

---
 .idea/codeStyles/Project.xml                  |  1 -
 .../rose/gateway/discord/bot/DiscordBot.kt    |  2 +-
 .../rose/gateway/minecraft/CommandRegistry.kt | 12 +++-
 .../minecraft/commands/runners/BotCommands.kt | 62 +++++++++++++++----
 4 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index b8ce955a..8c696a38 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,6 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <option name="ENABLE_SECOND_REFORMAT" value="true" />
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
diff --git a/src/main/kotlin/com/rose/gateway/discord/bot/DiscordBot.kt b/src/main/kotlin/com/rose/gateway/discord/bot/DiscordBot.kt
index 4ec9f958..8987a2b9 100644
--- a/src/main/kotlin/com/rose/gateway/discord/bot/DiscordBot.kt
+++ b/src/main/kotlin/com/rose/gateway/discord/bot/DiscordBot.kt
@@ -179,7 +179,7 @@ class DiscordBot : KoinComponent {
     /**
      * Stops the Discord bot such that it can be restarted
      */
-    private suspend fun stop() {
+    suspend fun stop() {
         botStatus = BotStatus.STOPPING
 
         bot?.stop()
diff --git a/src/main/kotlin/com/rose/gateway/minecraft/CommandRegistry.kt b/src/main/kotlin/com/rose/gateway/minecraft/CommandRegistry.kt
index f775d6c1..ee65c6f3 100644
--- a/src/main/kotlin/com/rose/gateway/minecraft/CommandRegistry.kt
+++ b/src/main/kotlin/com/rose/gateway/minecraft/CommandRegistry.kt
@@ -40,12 +40,20 @@ object CommandRegistry : KoinComponent {
 
         command("gateway") {
             subcommand("bot") {
+                subcommand("rebuild") {
+                    runner { context -> BotCommands.restart(context) }
+                }
+
                 subcommand("restart") {
-                    runner { context -> BotCommands.restartBot(context) }
+                    runner { context -> BotCommands.restart(context) }
+                }
+
+                subcommand("stop") {
+                    runner { context -> BotCommands.stop(context) }
                 }
 
                 subcommand("status") {
-                    runner { context -> BotCommands.botStatus(context) }
+                    runner { context -> BotCommands.status(context) }
                 }
             }
 
diff --git a/src/main/kotlin/com/rose/gateway/minecraft/commands/runners/BotCommands.kt b/src/main/kotlin/com/rose/gateway/minecraft/commands/runners/BotCommands.kt
index 86515206..3f8361b6 100644
--- a/src/main/kotlin/com/rose/gateway/minecraft/commands/runners/BotCommands.kt
+++ b/src/main/kotlin/com/rose/gateway/minecraft/commands/runners/BotCommands.kt
@@ -22,25 +22,65 @@ object BotCommands : KoinComponent {
     private val pluginScope: PluginCoroutineScope by inject()
 
     /**
-     * Command that restarts the discord bot
+     * Command that rebuilds the Discord bot
      *
      * @param context A command context without arguments
      * @return Whether the command succeeded
      */
-    fun restartBot(context: CommandExecuteContext<NoArgs>): Boolean {
+    fun rebuild(context: CommandExecuteContext<NoArgs>): Boolean {
+        sendAndLogMessage(context.bukkit.sender, "Rebuilding the Discord bot. This may take a while...")
+
+        pluginScope.launch {
+            bot.rebuild()
+            sendAndLogMessage(
+                context.bukkit.sender,
+                if (bot.botStatus == BotStatus.RUNNING) {
+                    "Discord bot restarted."
+                } else {
+                    "Discord bot failed to restart. Check bot status for more info."
+                },
+            )
+        }
+
+        return true
+    }
+
+    /**
+     * Command that restarts the Discord bot
+     *
+     * @param context A command context without arguments
+     * @return Whether the command succeeded
+     */
+    fun restart(context: CommandExecuteContext<NoArgs>): Boolean {
         sendAndLogMessage(context.bukkit.sender, "Restarting the Discord bot...")
 
         pluginScope.launch {
             bot.restart()
+            sendAndLogMessage(
+                context.bukkit.sender,
+                if (bot.botStatus == BotStatus.RUNNING) {
+                    "Discord bot restarted."
+                } else {
+                    "Discord bot failed to restart. Check bot status for more info."
+                },
+            )
+        }
+
+        return true
+    }
 
-            if (bot.botStatus == BotStatus.RUNNING) {
-                sendAndLogMessage(context.bukkit.sender, "Discord bot restarted.")
-            } else {
-                sendAndLogMessage(
-                    context.bukkit.sender,
-                    "Discord bot failed to restart. Check bot status for more info.",
-                )
-            }
+    /**
+     * Stops the Discord bot
+     *
+     * @param context A command context without arguments
+     * @return Whether the command succeeded
+     */
+    fun stop(context: CommandExecuteContext<NoArgs>): Boolean {
+        sendAndLogMessage(context.bukkit.sender, "Stopping the Discord bot...")
+
+        pluginScope.launch {
+            bot.stop()
+            sendAndLogMessage(context.bukkit.sender, "Discord bot stopped.")
         }
 
         return true
@@ -63,7 +103,7 @@ object BotCommands : KoinComponent {
      * @param context A command context without arguments
      * @return Whether the command succeeded
      */
-    fun botStatus(context: CommandExecuteContext<NoArgs>): Boolean {
+    fun status(context: CommandExecuteContext<NoArgs>): Boolean {
         val status = bot.botStatus
         context.bukkit.sender.sendMessage(
             joinSpace(