AstrBot 4.5.1__py3-none-any.whl → 4.5.2__py3-none-any.whl

astrbot/core/platform/sources/discord/discord_platform_adapter.py

@@ -1,30 +1,32 @@
 import asyncio
-import discord
-import sys
 import re
+import sys
+from typing import Any
+
+import discord
 from discord.abc import Messageable
 from discord.channel import DMChannel
+
+from astrbot import logger
+from astrbot.api.event import MessageChain
+from astrbot.api.message_components import File, Image, Plain
 from astrbot.api.platform import (
-    Platform,
     AstrBotMessage,
     MessageMember,
-    PlatformMetadata,
     MessageType,
+    Platform,
+    PlatformMetadata,
+    register_platform_adapter,
 )
-from astrbot.api.event import MessageChain
-from astrbot.api.message_components import Plain, Image, File
 from astrbot.core.platform.astr_message_event import MessageSesion
-from astrbot.api.platform import register_platform_adapter
-from astrbot import logger
-from .client import DiscordBotClient
-from .discord_platform_event import DiscordPlatformEvent
-
-from typing import Any, Tuple
 from astrbot.core.star.filter.command import CommandFilter
 from astrbot.core.star.filter.command_group import CommandGroupFilter
 from astrbot.core.star.star import star_map
 from astrbot.core.star.star_handler import StarHandlerMetadata, star_handlers_registry
 
+from .client import DiscordBotClient
+from .discord_platform_event import DiscordPlatformEvent
+
 if sys.version_info >= (3, 12):
     from typing import override
 else:
@@ -35,7 +37,10 @@ else:
 @register_platform_adapter("discord", "Discord 适配器 (基于 Pycord)")
 class DiscordPlatformAdapter(Platform):
     def __init__(
-        self, platform_config: dict, platform_settings: dict, event_queue: asyncio.Queue
+        self,
+        platform_config: dict,
+        platform_settings: dict,
+        event_queue: asyncio.Queue,
     ) -> None:
         super().__init__(event_queue)
         self.config = platform_config
@@ -51,7 +56,9 @@ class DiscordPlatformAdapter(Platform):
 
     @override
     async def send_by_session(
-        self, session: MessageSesion, message_chain: MessageChain
+        self,
+        session: MessageSesion,
+        message_chain: MessageChain,
     ):
         """通过会话发送消息"""
         # 创建一个 message_obj 以便在 event 中使用
@@ -71,18 +78,19 @@ class DiscordPlatformAdapter(Platform):
             message_obj.group_id = self._get_channel_id(channel)
         else:
             logger.warning(
-                f"[Discord] Can't get channel info for {channel_id_str}, will guess message type."
+                f"[Discord] Can't get channel info for {channel_id_str}, will guess message type.",
             )
             message_obj.type = MessageType.GROUP_MESSAGE
             message_obj.group_id = session.session_id
 
         message_obj.message_str = message_chain.get_plain_text()
         message_obj.sender = MessageMember(
-            user_id=str(self.client_self_id), nickname=self.client.user.display_name
+            user_id=str(self.client_self_id),
+            nickname=self.client.user.display_name,
         )
         message_obj.self_id = self.client_self_id
         message_obj.session_id = session.session_id
-        message_obj.message = message_chain
+        message_obj.message = message_chain.chain
 
         # 创建临时事件对象来发送消息
         temp_event = DiscordPlatformEvent(
@@ -149,7 +157,9 @@ class DiscordPlatformAdapter(Platform):
             logger.error(f"[Discord] 适配器运行时发生意外错误: {e}", exc_info=True)
 
     def _get_message_type(
-        self, channel: Messageable, guild_id: int | None = None
+        self,
+        channel: Messageable,
+        guild_id: int | None = None,
     ) -> MessageType:
         """根据 channel 对象和 guild_id 判断消息类型"""
         if guild_id is not None:
@@ -201,7 +211,8 @@ class DiscordPlatformAdapter(Platform):
         abm.group_id = self._get_channel_id(message.channel)
         abm.message_str = content
         abm.sender = MessageMember(
-            user_id=str(message.author.id), nickname=message.author.display_name
+            user_id=str(message.author.id),
+            nickname=message.author.display_name,
         )
         message_chain = []
         if abm.message_str:
@@ -209,14 +220,14 @@ class DiscordPlatformAdapter(Platform):
         if message.attachments:
             for attachment in message.attachments:
                 if attachment.content_type and attachment.content_type.startswith(
-                    "image/"
+                    "image/",
                 ):
                     message_chain.append(
-                        Image(file=attachment.url, filename=attachment.filename)
+                        Image(file=attachment.url, filename=attachment.filename),
                     )
                 else:
                     message_chain.append(
-                        File(name=attachment.filename, url=attachment.url)
+                        File(name=attachment.filename, url=attachment.url),
                     )
         abm.message = message_chain
         abm.raw_message = message
@@ -260,7 +271,7 @@ class DiscordPlatformAdapter(Platform):
             if hasattr(message.raw_message, "guild") and message.raw_message.guild:
                 try:
                     bot_member = message.raw_message.guild.get_member(
-                        self.client.user.id
+                        self.client.user.id,
                     )
                 except Exception:
                     bot_member = None
@@ -346,7 +357,7 @@ class DiscordPlatformAdapter(Platform):
                         description="指令的所有参数",
                         type=discord.SlashCommandOptionType.string,
                         required=False,
-                    )
+                    ),
                 ]
 
                 # 创建SlashCommand
@@ -362,7 +373,7 @@ class DiscordPlatformAdapter(Platform):
 
         if registered_commands:
             logger.info(
-                f"[Discord] 准备同步 {len(registered_commands)} 个指令: {', '.join(registered_commands)}"
+                f"[Discord] 准备同步 {len(registered_commands)} 个指令: {', '.join(registered_commands)}",
             )
         else:
             logger.info("[Discord] 没有发现可注册的指令。")
@@ -375,7 +386,9 @@ class DiscordPlatformAdapter(Platform):
     def _create_dynamic_callback(self, cmd_name: str):
         """为每个指令动态创建一个异步回调函数"""
 
-        async def dynamic_callback(ctx: discord.ApplicationContext, params: str = None):
+        async def dynamic_callback(
+            ctx: discord.ApplicationContext, params: str | None = None
+        ):
             # 将平台特定的前缀'/'剥离，以适配通用的CommandFilter
             logger.debug(f"[Discord] 回调函数触发: {cmd_name}")
             logger.debug(f"[Discord] 回调函数参数: {ctx}")
@@ -387,7 +400,7 @@ class DiscordPlatformAdapter(Platform):
             logger.debug(
                 f"[Discord] 斜杠指令 '{cmd_name}' 被触发。 "
                 f"原始参数: '{params}'. "
-                f"构建的指令字符串: '{message_str_for_filter}'"
+                f"构建的指令字符串: '{message_str_for_filter}'",
             )
 
             # 尝试立即响应，防止超时
@@ -404,7 +417,8 @@ class DiscordPlatformAdapter(Platform):
             abm.group_id = self._get_channel_id(ctx.channel)
             abm.message_str = message_str_for_filter
             abm.sender = MessageMember(
-                user_id=str(ctx.author.id), nickname=ctx.author.display_name
+                user_id=str(ctx.author.id),
+                nickname=ctx.author.display_name,
             )
             abm.message = [Plain(text=message_str_for_filter)]
             abm.raw_message = ctx.interaction
@@ -419,8 +433,9 @@ class DiscordPlatformAdapter(Platform):
 
     @staticmethod
     def _extract_command_info(
-        event_filter: Any, handler_metadata: StarHandlerMetadata
-    ) -> Tuple[str, str, CommandFilter] | None:
+        event_filter: Any,
+        handler_metadata: StarHandlerMetadata,
+    ) -> tuple[str, str, CommandFilter] | None:
         """从事件过滤器中提取指令信息"""
         cmd_name = None
         # is_group = False

astrbot/core/platform/sources/discord/discord_platform_event.py

@@ -1,21 +1,23 @@
 import asyncio
-import discord
 import base64
+import binascii
+import sys
 from io import BytesIO
 from pathlib import Path
-from typing import Optional
-import sys
 
+import discord
+
+from astrbot import logger
 from astrbot.api.event import AstrMessageEvent, MessageChain
-from astrbot.api.platform import AstrBotMessage, PlatformMetadata, At
 from astrbot.api.message_components import (
-    Plain,
-    Image,
-    File,
     BaseMessageComponent,
+    File,
+    Image,
+    Plain,
     Reply,
 )
-from astrbot import logger
+from astrbot.api.platform import AstrBotMessage, At, PlatformMetadata
+
 from .client import DiscordBotClient
 from .components import DiscordEmbed, DiscordView
 
@@ -41,7 +43,7 @@ class DiscordPlatformEvent(AstrMessageEvent):
         platform_meta: PlatformMetadata,
         session_id: str,
         client: DiscordBotClient,
-        interaction_followup_webhook: Optional[discord.Webhook] = None,
+        interaction_followup_webhook: discord.Webhook | None = None,
     ):
         super().__init__(message_str, message_obj, platform_meta, session_id)
         self.client = client
@@ -50,7 +52,6 @@ class DiscordPlatformEvent(AstrMessageEvent):
     @override
     async def send(self, message: MessageChain):
         """发送消息到Discord平台"""
-
         # 解析消息链为 Discord 所需的对象
         try:
             (
@@ -90,20 +91,19 @@ class DiscordPlatformEvent(AstrMessageEvent):
                 channel = await self._get_channel()
                 if not channel:
                     return
-                else:
-                    await channel.send(**kwargs)
+                await channel.send(**kwargs)
 
         except Exception as e:
             logger.error(f"[Discord] 发送消息时发生未知错误: {e}", exc_info=True)
 
         await super().send(message)
 
-    async def _get_channel(self) -> Optional[discord.abc.Messageable]:
+    async def _get_channel(self) -> discord.abc.Messageable | None:
         """获取当前事件对应的频道对象"""
         try:
             channel_id = int(self.session_id)
             return self.client.get_channel(
-                channel_id
+                channel_id,
             ) or await self.client.fetch_channel(channel_id)
         except (ValueError, discord.errors.NotFound, discord.errors.Forbidden):
             logger.error(f"[Discord] 无法获取频道 {self.session_id}")
@@ -112,20 +112,20 @@ class DiscordPlatformEvent(AstrMessageEvent):
     async def _parse_to_discord(
         self,
         message: MessageChain,
-    ) -> tuple[str, list[discord.File], Optional[discord.ui.View], list[discord.Embed]]:
+    ) -> tuple[str, list[discord.File], discord.ui.View | None, list[discord.Embed]]:
         """将 MessageChain 解析为 Discord 发送所需的内容"""
-        content = ""
+        content_parts = []
         files = []
         view = None
         embeds = []
         reference_message_id = None
         for i in message.chain:  # 遍历消息链
             if isinstance(i, Plain):  # 如果是文字类型的
-                content += i.text
+                content_parts.append(i.text)
             elif isinstance(i, Reply):
                 reference_message_id = i.id
             elif isinstance(i, At):
-                content += f"<@{i.qq}>"
+                content_parts.append(f"<@{i.qq}>")
             elif isinstance(i, Image):
                 logger.debug(f"[Discord] 开始处理 Image 组件: {i}")
                 try:
@@ -146,13 +146,14 @@ class DiscordPlatformEvent(AstrMessageEvent):
                         continue
 
                     # 2. File URI
-                    elif file_content.startswith("file:///"):
+                    if file_content.startswith("file:///"):
                         logger.debug(f"[Discord] 处理 File URI: {file_content}")
                         path = Path(file_content[8:])
                         if await asyncio.to_thread(path.exists):
                             file_bytes = await asyncio.to_thread(path.read_bytes)
                             discord_file = discord.File(
-                                BytesIO(file_bytes), filename=filename or path.name
+                                BytesIO(file_bytes),
+                                filename=filename or path.name,
                             )
                         else:
                             logger.warning(f"[Discord] 图片文件不存在: {path}")
@@ -166,7 +167,8 @@ class DiscordPlatformEvent(AstrMessageEvent):
                             b64_data += "=" * (4 - missing_padding)
                         img_bytes = base64.b64decode(b64_data)
                         discord_file = discord.File(
-                            BytesIO(img_bytes), filename=filename or "image.png"
+                            BytesIO(img_bytes),
+                            filename=filename or "image.png",
                         )
 
                     # 4. 裸 Base64 或本地路径
@@ -179,17 +181,19 @@ class DiscordPlatformEvent(AstrMessageEvent):
                                 b64_data += "=" * (4 - missing_padding)
                             img_bytes = base64.b64decode(b64_data)
                             discord_file = discord.File(
-                                BytesIO(img_bytes), filename=filename or "image.png"
+                                BytesIO(img_bytes),
+                                filename=filename or "image.png",
                             )
-                        except (ValueError, TypeError, base64.binascii.Error):
+                        except (ValueError, TypeError, binascii.Error):
                             logger.debug(
-                                f"[Discord] 裸 Base64 解码失败，作为本地路径处理: {file_content}"
+                                f"[Discord] 裸 Base64 解码失败，作为本地路径处理: {file_content}",
                             )
                             path = Path(file_content)
                             if await asyncio.to_thread(path.exists):
                                 file_bytes = await asyncio.to_thread(path.read_bytes)
                                 discord_file = discord.File(
-                                    BytesIO(file_bytes), filename=filename or path.name
+                                    BytesIO(file_bytes),
+                                    filename=filename or path.name,
                                 )
                             else:
                                 logger.warning(f"[Discord] 图片文件不存在: {path}")
@@ -212,11 +216,11 @@ class DiscordPlatformEvent(AstrMessageEvent):
                         if await asyncio.to_thread(path.exists):
                             file_bytes = await asyncio.to_thread(path.read_bytes)
                             files.append(
-                                discord.File(BytesIO(file_bytes), filename=i.name)
+                                discord.File(BytesIO(file_bytes), filename=i.name),
                             )
                         else:
                             logger.warning(
-                                f"[Discord] 获取文件失败，路径不存在: {file_path_str}"
+                                f"[Discord] 获取文件失败，路径不存在: {file_path_str}",
                             )
                     else:
                         logger.warning(f"[Discord] 获取文件失败: {i.name}")
@@ -235,6 +239,7 @@ class DiscordPlatformEvent(AstrMessageEvent):
             else:
                 logger.debug(f"[Discord] 忽略了不支持的消息组件: {i.type}")
 
+        content = "".join(content_parts)
         if len(content) > 2000:
             logger.warning("[Discord] 消息内容超过2000字符，将被截断。")
             content = content[:2000]
@@ -244,7 +249,8 @@ class DiscordPlatformEvent(AstrMessageEvent):
         """对原消息添加反应"""
         try:
             if hasattr(self.message_obj, "raw_message") and hasattr(
-                self.message_obj.raw_message, "add_reaction"
+                self.message_obj.raw_message,
+                "add_reaction",
             ):
                 await self.message_obj.raw_message.add_reaction(emoji)
         except Exception as e:
@@ -279,7 +285,8 @@ class DiscordPlatformEvent(AstrMessageEvent):
     def is_mentioned(self) -> bool:
         """判断机器人是否被@"""
         if hasattr(self.message_obj, "raw_message") and hasattr(
-            self.message_obj.raw_message, "mentions"
+            self.message_obj.raw_message,
+            "mentions",
         ):
             return any(
                 mention.id == int(self.message_obj.self_id)
@@ -290,7 +297,8 @@ class DiscordPlatformEvent(AstrMessageEvent):
     def get_mention_clean_content(self) -> str:
         """获取去除@后的清洁内容"""
         if hasattr(self.message_obj, "raw_message") and hasattr(
-            self.message_obj.raw_message, "clean_content"
+            self.message_obj.raw_message,
+            "clean_content",
         ):
             return self.message_obj.raw_message.clean_content
         return self.message_str

astrbot/core/platform/sources/lark/lark_adapter.py

@@ -1,30 +1,35 @@
-import base64
 import asyncio
+import base64
 import json
 import re
 import uuid
-import astrbot.api.message_components as Comp
 
+import lark_oapi as lark
+from lark_oapi.api.im.v1 import *
+
+import astrbot.api.message_components as Comp
+from astrbot import logger
+from astrbot.api.event import MessageChain
 from astrbot.api.platform import (
-    Platform,
     AstrBotMessage,
     MessageMember,
     MessageType,
+    Platform,
     PlatformMetadata,
 )
-from astrbot.api.event import MessageChain
 from astrbot.core.platform.astr_message_event import MessageSesion
-from .lark_event import LarkMessageEvent
+
 from ...register import register_platform_adapter
-from astrbot import logger
-import lark_oapi as lark
-from lark_oapi.api.im.v1 import *
+from .lark_event import LarkMessageEvent
 
 
 @register_platform_adapter("lark", "飞书机器人官方 API 适配器")
 class LarkPlatformAdapter(Platform):
     def __init__(
-        self, platform_config: dict, platform_settings: dict, event_queue: asyncio.Queue
+        self,
+        platform_config: dict,
+        platform_settings: dict,
+        event_queue: asyncio.Queue,
     ) -> None:
         super().__init__(event_queue)
 
@@ -65,14 +70,16 @@ class LarkPlatformAdapter(Platform):
         )
 
     async def send_by_session(
-        self, session: MessageSesion, message_chain: MessageChain
+        self,
+        session: MessageSesion,
+        message_chain: MessageChain,
     ):
         res = await LarkMessageEvent._convert_to_lark(message_chain, self.lark_api)
         wrapped = {
             "zh_cn": {
                 "title": "",
                 "content": res,
-            }
+            },
         }
 
         if session.message_type == MessageType.GROUP_MESSAGE:
@@ -91,7 +98,7 @@ class LarkPlatformAdapter(Platform):
                 .content(json.dumps(wrapped))
                 .msg_type("post")
                 .uuid(str(uuid.uuid4()))
-                .build()
+                .build(),
             )
             .build()
         )
@@ -160,7 +167,7 @@ class LarkPlatformAdapter(Platform):
             content_json_b = _ls
         elif message.message_type == "image":
             content_json_b = [
-                {"tag": "img", "image_key": content_json_b["image_key"], "style": []}
+                {"tag": "img", "image_key": content_json_b["image_key"], "style": []},
             ]
 
         if message.message_type in ("post", "image"):
@@ -200,11 +207,10 @@ class LarkPlatformAdapter(Platform):
                 abm.session_id = abm.group_id
             else:
                 abm.session_id = abm.sender.user_id
+        elif abm.type == MessageType.GROUP_MESSAGE:
+            abm.session_id = f"{abm.sender.user_id}%{abm.group_id}"  # 也保留群组id
         else:
-            if abm.type == MessageType.GROUP_MESSAGE:
-                abm.session_id = f"{abm.sender.user_id}%{abm.group_id}"  # 也保留群组id
-            else:
-                abm.session_id = abm.sender.user_id
+            abm.session_id = abm.sender.user_id
 
         logger.debug(abm)
         await self.handle_msg(abm)

astrbot/core/platform/sources/lark/lark_event.py

@@ -1,27 +1,34 @@
+import base64
 import json
 import os
 import uuid
-import base64
-import lark_oapi as lark
 from io import BytesIO
-from typing import List
-from astrbot.api.event import AstrMessageEvent, MessageChain
-from astrbot.api.message_components import Plain, Image as AstrBotImage, At
-from astrbot.core.utils.io import download_image_by_url
+
+import lark_oapi as lark
 from lark_oapi.api.im.v1 import *
+
 from astrbot import logger
+from astrbot.api.event import AstrMessageEvent, MessageChain
+from astrbot.api.message_components import At, Plain
+from astrbot.api.message_components import Image as AstrBotImage
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
+from astrbot.core.utils.io import download_image_by_url
 
 
 class LarkMessageEvent(AstrMessageEvent):
     def __init__(
-        self, message_str, message_obj, platform_meta, session_id, bot: lark.Client
+        self,
+        message_str,
+        message_obj,
+        platform_meta,
+        session_id,
+        bot: lark.Client,
     ):
         super().__init__(message_str, message_obj, platform_meta, session_id)
         self.bot = bot
 
     @staticmethod
-    async def _convert_to_lark(message: MessageChain, lark_client: lark.Client) -> List:
+    async def _convert_to_lark(message: MessageChain, lark_client: lark.Client) -> list:
         ret = []
         _stage = []
         for comp in message.chain:
@@ -58,7 +65,7 @@ class LarkMessageEvent(AstrMessageEvent):
                         CreateImageRequestBody.builder()
                         .image_type("message")
                         .image(image_file)
-                        .build()
+                        .build(),
                     )
                     .build()
                 )
@@ -83,7 +90,7 @@ class LarkMessageEvent(AstrMessageEvent):
             "zh_cn": {
                 "title": "",
                 "content": res,
-            }
+            },
         }
 
         request = (
@@ -95,7 +102,7 @@ class LarkMessageEvent(AstrMessageEvent):
                 .msg_type("post")
                 .uuid(str(uuid.uuid4()))
                 .reply_in_thread(False)
-                .build()
+                .build(),
             )
             .build()
         )
@@ -114,14 +121,14 @@ class LarkMessageEvent(AstrMessageEvent):
             .request_body(
                 CreateMessageReactionRequestBody.builder()
                 .reaction_type(Emoji.builder().emoji_type(emoji).build())
-                .build()
+                .build(),
             )
             .build()
         )
         response = await self.bot.im.v1.message_reaction.acreate(request)
         if not response.success():
             logger.error(f"发送飞书表情回应失败({response.code}): {response.msg}")
-            return None
+            return
 
     async def send_streaming(self, generator, use_fallback: bool = False):
         buffer = None
@@ -131,7 +138,7 @@ class LarkMessageEvent(AstrMessageEvent):
             else:
                 buffer.chain.extend(chain.chain)
         if not buffer:
-            return
+            return None
         buffer.squash_plain()
         await self.send(buffer)
         return await super().send_streaming(generator, use_fallback)