From 7de27abc8d4101f8bf57ca572f90776c69903a53 Mon Sep 17 00:00:00 2001 From: Soulter <905617992@qq.com> Date: Fri, 7 Mar 2025 09:05:00 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20Telegram=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=99=A8=E4=BD=BF=E7=94=A8=E4=BB=A3=E7=90=86=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E5=9B=BE=E7=89=87?= =?UTF-8?q?=20#723?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- astrbot/core/config/default.py | 1 + .../core/platform/sources/telegram/tg_adapter.py | 8 +++++++- packages/python_interpreter/main.py | 16 ++++++++++++---- packages/session_controller/main.py | 2 +- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/astrbot/core/config/default.py b/astrbot/core/config/default.py index b6ee5c0a9..e67cd2f1b 100644 --- a/astrbot/core/config/default.py +++ b/astrbot/core/config/default.py @@ -165,6 +165,7 @@ CONFIG_METADATA_2 = { "telegram_token": "your_bot_token", "start_message": "Hello, I'm AstrBot!", "telegram_api_base_url": "https://api.telegram.org/bot", + "telegram_file_base_url": "https://api.telegram.org/file/bot", }, }, "items": { diff --git a/astrbot/core/platform/sources/telegram/tg_adapter.py b/astrbot/core/platform/sources/telegram/tg_adapter.py index 0eed9036b..ffeff87af 100644 --- a/astrbot/core/platform/sources/telegram/tg_adapter.py +++ b/astrbot/core/platform/sources/telegram/tg_adapter.py @@ -51,13 +51,19 @@ class TelegramPlatformAdapter(Platform): if not base_url: base_url = "https://api.telegram.org/bot" + file_base_url = self.config.get( + "telegram_file_base_url", "https://api.telegram.org/file/bot" + ) + if not file_base_url: + file_base_url = "https://api.telegram.org/file/bot" + self.base_url = base_url self.application = ( ApplicationBuilder() .token(self.config["telegram_token"]) .base_url(base_url) - .base_file_url(base_url) + .base_file_url(file_base_url) .build() ) message_handler = TelegramMessageHandler( diff --git a/packages/python_interpreter/main.py b/packages/python_interpreter/main.py index 556c8609a..20eae0c3c 100644 --- a/packages/python_interpreter/main.py +++ b/packages/python_interpreter/main.py @@ -303,9 +303,13 @@ class Main(star.Star): uid = event.get_sender_id() if uid in self.user_waiting: self.user_waiting.pop(uid) - yield event.plain_result(f"代码执行器: {event.get_sender_name()}/{event.get_sender_id()} 已清理。") + yield event.plain_result( + f"代码执行器: {event.get_sender_name()}/{event.get_sender_id()} 已清理。" + ) else: - yield event.plain_result(f"代码执行器: {event.get_sender_name()}/{event.get_sender_id()} 没有等待上传文件。") + yield event.plain_result( + f"代码执行器: {event.get_sender_name()}/{event.get_sender_id()} 没有等待上传文件。" + ) @pi.command("list") async def pi_file_list(self, event: AstrMessageEvent): @@ -313,9 +317,13 @@ class Main(star.Star): uid = event.get_sender_id() if uid in self.user_file_msg_buffer: files = self.user_file_msg_buffer[uid] - yield event.plain_result(f"代码执行器: {event.get_sender_name()}/{event.get_sender_id()} 上传的文件: {files}") + yield event.plain_result( + f"代码执行器: {event.get_sender_name()}/{event.get_sender_id()} 上传的文件: {files}" + ) else: - yield event.plain_result(f"代码执行器: {event.get_sender_name()}/{event.get_sender_id()} 没有上传文件。") + yield event.plain_result( + f"代码执行器: {event.get_sender_name()}/{event.get_sender_id()} 没有上传文件。" + ) @llm_tool("python_interpreter") async def python_interpreter(self, event: AstrMessageEvent): diff --git a/packages/session_controller/main.py b/packages/session_controller/main.py index 280371042..c2fbf644d 100644 --- a/packages/session_controller/main.py +++ b/packages/session_controller/main.py @@ -1,9 +1,9 @@ - from astrbot.api.event import AstrMessageEvent, filter from astrbot.api.star import Context, Star, register from astrbot.core.utils.session_waiter import SessionWaiter, USER_SESSIONS from sys import maxsize + @register( "session_controller", "Cvandia & Soulter",