From 1a92edf8bea02ce18821c5e1fbd947f84bc3b205 Mon Sep 17 00:00:00 2001
From: Raven95676 <Raven95676@gmail.com>
Date: Sun, 30 Mar 2025 14:38:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=97=A0?=
 =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=83=85=E5=86=B5=E4=B8=8B=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=BA=BA=E6=A0=BC=E7=9A=84=E5=8F=8D=E9=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/astrbot/main.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/astrbot/main.py b/packages/astrbot/main.py
index fc5ee3f32..3887fc929 100644
--- a/packages/astrbot/main.py
+++ b/packages/astrbot/main.py
@@ -1018,6 +1018,13 @@ UID: {user_id} 此 ID 可用于设置管理员。
             message.set_result(MessageEventResult().message("取消人格成功。"))
         else:
             ps = "".join(l[1:]).strip()
+            if not cid:
+                message.set_result(
+                    MessageEventResult().message(
+                        "当前没有对话，请先开始对话或使用 /new 创建一个对话。"
+                    )
+                )
+                return
             if persona := next(
                 builtins.filter(
                     lambda persona: persona["name"] == ps,

From fe76c41ed865961ce16cc3d16bc349a9da8e3c43 Mon Sep 17 00:00:00 2001
From: Raven95676 <Raven95676@gmail.com>
Date: Sun, 30 Mar 2025 15:18:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?perf:=20=E8=8B=A5=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9B=E5=95=86=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=88=B0=E5=8F=A6=E4=B8=80=E4=B8=AA=E5=8F=AF=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E4=BE=9B=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 astrbot/core/provider/manager.py | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/astrbot/core/provider/manager.py b/astrbot/core/provider/manager.py
index ef9040445..71647a5ac 100644
--- a/astrbot/core/provider/manager.py
+++ b/astrbot/core/provider/manager.py
@@ -306,10 +306,42 @@ class ProviderManager:
 
         if len(self.provider_insts) == 0:
             self.curr_provider_inst = None
+        elif (
+            self.curr_provider_inst is None
+            and len(self.provider_insts) > 0
+            and self.provider_enabled
+        ):
+            self.curr_provider_inst = self.provider_insts[0]
+            self.selected_provider_id = self.curr_provider_inst.meta().id
+            logger.info(
+                f"自动选择 {self.curr_provider_inst.meta().id} 作为当前提供商适配器。"
+            )
+
         if len(self.stt_provider_insts) == 0:
             self.curr_stt_provider_inst = None
+        elif (
+            self.curr_stt_provider_inst is None
+            and len(self.stt_provider_insts) > 0
+            and self.stt_enabled
+        ):
+            self.curr_stt_provider_inst = self.stt_provider_insts[0]
+            self.selected_stt_provider_id = self.curr_stt_provider_inst.meta().id
+            logger.info(
+                f"自动选择 {self.curr_stt_provider_inst.meta().id} 作为当前语音转文本提供商适配器。"
+            )
+
         if len(self.tts_provider_insts) == 0:
             self.curr_tts_provider_inst = None
+        elif (
+            self.curr_tts_provider_inst is None
+            and len(self.tts_provider_insts) > 0
+            and self.tts_enabled
+        ):
+            self.curr_tts_provider_inst = self.tts_provider_insts[0]
+            self.selected_tts_provider_id = self.curr_tts_provider_inst.meta().id
+            logger.info(
+                f"自动选择 {self.curr_tts_provider_inst.meta().id} 作为当前文本转语音提供商适配器。"
+            )
 
     def get_insts(self):
         return self.provider_insts