From 4a160ad42b537dc75d733f22b8253929440212a9 Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Fri, 24 Jun 2022 19:10:39 +0800
Subject: [PATCH] =?UTF-8?q?refactor(config):=20=E6=9B=B4=E6=94=B9=20BotCon?=
 =?UTF-8?q?fig.enabled=20=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC=E4=B8=BA=20f?=
 =?UTF-8?q?alse.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更改 enabled 的默认值, 以防止意外启动 Bot.
同时让 bot.json 在初始化时设为 true, 方便用户改完就能启动.
---
 scalabot-app/src/main/kotlin/AppConfigs.kt | 7 ++++---
 scalabot-meta/src/main/kotlin/Configs.kt   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/scalabot-app/src/main/kotlin/AppConfigs.kt b/scalabot-app/src/main/kotlin/AppConfigs.kt
index 326beb5..293136e 100644
--- a/scalabot-app/src/main/kotlin/AppConfigs.kt
+++ b/scalabot-app/src/main/kotlin/AppConfigs.kt
@@ -131,7 +131,7 @@ internal enum class AppPaths(
                 GsonConst.botConfigGson.toJson(
                     setOf(
                         BotConfig(
-                            enabled = false,
+                            enabled = true,
                             proxy = ProxyConfig(),
                             account = BotAccount(
                                 "Bot Username",
@@ -226,14 +226,15 @@ private object GsonConst {
         .create()
 
     val appConfigGson: Gson = baseGson.newBuilder()
-        .registerTypeAdapter(DefaultBotOptions.ProxyType::class.java, ProxyTypeSerializer)
+        .registerTypeAdapter(ProxyType::class.java, ProxyTypeSerializer)
         .registerTypeAdapter(MavenRepositoryConfig::class.java, MavenRepositoryConfigSerializer)
         .registerTypeAdapter(Authentication::class.java, AuthenticationSerializer)
         .registerTypeAdapter(UsernameAuthenticator::class.java, UsernameAuthenticatorSerializer)
         .create()
 
     val botConfigGson: Gson = baseGson.newBuilder()
-        .registerTypeAdapter(DefaultBotOptions.ProxyType::class.java, ProxyTypeSerializer)
+        .registerTypeAdapter(ProxyType::class.java, ProxyTypeSerializer)
+        .registerTypeAdapter(BotConfig::class.java, BotConfigSerializer)
         .registerTypeAdapter(Artifact::class.java, ArtifactSerializer)
         .create()
 }
diff --git a/scalabot-meta/src/main/kotlin/Configs.kt b/scalabot-meta/src/main/kotlin/Configs.kt
index 60a335d..c1039d9 100644
--- a/scalabot-meta/src/main/kotlin/Configs.kt
+++ b/scalabot-meta/src/main/kotlin/Configs.kt
@@ -33,7 +33,7 @@ data class BotAccount(
  * @property proxy 为该机器人单独设置的代理配置, 如无设置, 则使用 AppConfig 中的代理配置.
  */
 data class BotConfig(
-    val enabled: Boolean = true,
+    val enabled: Boolean = false,
     val account: BotAccount,
     val disableBuiltInAbility: Boolean = false,
     val autoUpdateCommandList: Boolean = false,