From 553e0495d6a3a1a55d0740921c298cf82d5e09d1 Mon Sep 17 00:00:00 2001 From: minecraft1024a Date: Sat, 1 Nov 2025 21:15:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(bot):=20=E4=BF=AE=E5=A4=8DEULA=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E5=BE=AA=E7=8E=AF=E4=B8=AD=E6=9C=AA=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD`.env`=E6=96=87=E4=BB=B6=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在EULA检查的循环中，程序没有在每次尝试时重新加载`.env`文件。这导致即使用户已经修改了`EULA_CONFIRMED`为`true`，程序也无法读取到最新的配置，从而陷入无限等待的循环。 本次修改通过在循环内部调用`load_dotenv(override=True)`，强制在每次检查前重新加载环境变量，确保能够及时获取用户的确认状态，解决了该问题。 --- bot.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bot.py b/bot.py index 2fa744f2f..a48d38bad 100644 --- a/bot.py +++ b/bot.py @@ -121,7 +121,9 @@ class EULAManager: confirm_logger.critical("请阅读以下文件：") confirm_logger.critical(" - EULA.md (用户许可协议)") confirm_logger.critical(" - PRIVACY.md (隐私条款)") - confirm_logger.critical("然后编辑 .env 文件，将 'EULA_CONFIRMED=false' 改为 'EULA_CONFIRMED=true'") + confirm_logger.critical( + f"然后编辑 .env 文件，将 'EULA_CONFIRMED=false' 改为 'EULA_CONFIRMED=true'" + ) attempts = 0 while attempts < MAX_EULA_CHECK_ATTEMPTS: @@ -129,6 +131,9 @@ class EULAManager: await asyncio.sleep(EULA_CHECK_INTERVAL) attempts += 1 + # 重新加载.env文件以获取最新更改 + load_dotenv(override=True) + # 从 os.environ 读取，避免重复 I/O eula_confirmed = os.getenv("EULA_CONFIRMED", "").lower() if eula_confirmed == "true": From d57c2aa280ef58448312afcefd5fce48168a7a95 Mon Sep 17 00:00:00 2001 From: tt-P607 <68868379+tt-P607@users.noreply.github.com> Date: Sat, 1 Nov 2025 21:17:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(emoji):=20=E5=B0=86=20QQ=20=E8=A1=A8?= =?UTF-8?q?=E6=83=85=20'=E6=B1=AA=E6=B1=AA'=20=E6=9B=B4=E6=AD=A3=E4=B8=BA?= =?UTF-8?q?=20'=E6=BB=91=E7=A8=BD=E7=8B=97=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/built_in/napcat_adapter_plugin/CONSTS.py | 2 +- .../napcat_adapter_plugin/src/recv_handler/qq_emoji_list.py | 2 +- src/plugins/built_in/social_toolkit_plugin/qq_emoji_list.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/built_in/napcat_adapter_plugin/CONSTS.py b/src/plugins/built_in/napcat_adapter_plugin/CONSTS.py index 70cc45a7b..aac12589d 100644 --- a/src/plugins/built_in/napcat_adapter_plugin/CONSTS.py +++ b/src/plugins/built_in/napcat_adapter_plugin/CONSTS.py @@ -122,7 +122,7 @@ QQ_FACE: dict = { "271": "[表情：吃 瓜]", "272": "[表情：呵呵哒]", "273": "[表情：我酸了]", - "277": "[表情：汪汪]", + "277": "[表情：滑稽狗头]", "281": "[表情：翻白眼]", "282": "[表情：敬礼]", "283": "[表情：狂笑]", diff --git a/src/plugins/built_in/napcat_adapter_plugin/src/recv_handler/qq_emoji_list.py b/src/plugins/built_in/napcat_adapter_plugin/src/recv_handler/qq_emoji_list.py index dbab861f8..3d1dd191a 100644 --- a/src/plugins/built_in/napcat_adapter_plugin/src/recv_handler/qq_emoji_list.py +++ b/src/plugins/built_in/napcat_adapter_plugin/src/recv_handler/qq_emoji_list.py @@ -120,7 +120,7 @@ qq_face: dict = { "271": "[表情：吃 瓜]", "272": "[表情：呵呵哒]", "273": "[表情：我酸了]", - "277": "[表情：汪汪]", + "277": "[表情：滑稽狗头]", "281": "[表情：翻白眼]", "282": "[表情：敬礼]", "283": "[表情：狂笑]", diff --git a/src/plugins/built_in/social_toolkit_plugin/qq_emoji_list.py b/src/plugins/built_in/social_toolkit_plugin/qq_emoji_list.py index cc6143f06..58b49eb36 100644 --- a/src/plugins/built_in/social_toolkit_plugin/qq_emoji_list.py +++ b/src/plugins/built_in/social_toolkit_plugin/qq_emoji_list.py @@ -120,7 +120,7 @@ qq_face: dict = { "271": "[表情：吃 瓜]", "272": "[表情：呵呵哒]", "273": "[表情：我酸了]", - "277": "[表情：汪汪]", + "277": "[表情：滑稽狗头]", "281": "[表情：翻白眼]", "282": "[表情：敬礼]", "283": "[表情：狂笑]",