Allow providing token via config

Erdragh · Mar 24, 2024 · d40e674 · d40e674
1 parent 9448cc0
commit d40e674
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/common/src/main/kotlin/dev/erdragh/astralbot/Bot.kt b/common/src/main/kotlin/dev/erdragh/astralbot/Bot.kt
@@ -110,15 +110,17 @@ fun startAstralbot(server: MinecraftServer) {
         LOGGER.debug("Created $MODID directory")
     }
 
-    if (!env.containsKey("DISCORD_TOKEN")) {
-        LOGGER.warn("Not starting AstralBot because of missing DISCORD_TOKEN environment variable.")
+    val token: String? = env["DISCORD_TOKEN"] ?: AstralBotConfig.DISCORD_TOKEN.get()
+
+    if (token == null || token == "") {
+        LOGGER.warn("Not starting AstralBot because no token was not provided")
         return
     }
 
     minecraftHandler = MinecraftHandler(server)
 
     jda = JDABuilder.createLight(
-            env["DISCORD_TOKEN"],
+            token,
             GatewayIntent.MESSAGE_CONTENT,
             GatewayIntent.GUILD_MESSAGES,
             GatewayIntent.GUILD_MEMBERS

diff --git a/common/src/main/kotlin/dev/erdragh/astralbot/config/AstralBotConfig.kt b/common/src/main/kotlin/dev/erdragh/astralbot/config/AstralBotConfig.kt
@@ -14,6 +14,12 @@ import java.net.URL
 object AstralBotConfig {
     val SPEC: ForgeConfigSpec
 
+    /**
+     * If the `DISCORD_TOKEN` environment variable isn't set, the bot will
+     * look for a token in this config option.
+     */
+    val DISCORD_TOKEN: ForgeConfigSpec.ConfigValue<String>
+
     /**
      * Whether the default whitelisting process is respected or ignored.
      * Setting this to `true` will *force* every user who wants to join
@@ -80,6 +86,9 @@ object AstralBotConfig {
 
         builder.comment("AstralBot Config")
 
+        DISCORD_TOKEN = builder.comment("Discord token for the bot. Can also be supplied via DISCORD_TOKEN environment variable")
+            .define("token", "")
+
         REQUIRE_LINK_FOR_WHITELIST = builder.comment("Whether to require being linked to be whitelisted")
             .define("requireLinkForWhitelist", false)
         DISCORD_LINK = builder.comment("Link to the discord where your users can run the /link command")