From 12820e6c643b367a707aa114e8b5b34c9ee7b365 Mon Sep 17 00:00:00 2001 From: RockChinQ <1010553892@qq.com> Date: Wed, 7 Feb 2024 23:21:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81qq-botpy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/audit/center/apigroup.py | 1 + pkg/command/cmdmgr.py | 2 - pkg/platform/manager.py | 18 +- pkg/platform/sources/aiocqhttp.py | 1 + pkg/platform/sources/qqbotpy.py | 395 ++++++++++++++++++++++++++++++ requirements.txt | 1 + templates/platform.json | 8 + 7 files changed, 412 insertions(+), 14 deletions(-) create mode 100644 pkg/platform/sources/qqbotpy.py diff --git a/pkg/audit/center/apigroup.py b/pkg/audit/center/apigroup.py index 439ec6e6..9d35c05e 100644 --- a/pkg/audit/center/apigroup.py +++ b/pkg/audit/center/apigroup.py @@ -34,6 +34,7 @@ async def _do( headers: dict = {}, **kwargs ): + self._runtime_info['account_id'] = "{}".format(self.ap.im_mgr.bot_account_id) url = self.prefix + path data = json.dumps(data) diff --git a/pkg/command/cmdmgr.py b/pkg/command/cmdmgr.py index 03f84e21..1e622b97 100644 --- a/pkg/command/cmdmgr.py +++ b/pkg/command/cmdmgr.py @@ -106,8 +106,6 @@ async def execute( if f'{query.launcher_type.value}_{query.launcher_id}' in self.ap.system_cfg.data['admin-sessions']: privilege = 2 - - print(f'privilege: {privilege}') ctx = entities.ExecuteContext( query=query, diff --git a/pkg/platform/manager.py b/pkg/platform/manager.py index 3b359ee0..469cd330 100644 --- a/pkg/platform/manager.py +++ b/pkg/platform/manager.py @@ -42,14 +42,11 @@ async def initialize(self): aiocqhttp_config = self.ap.platform_cfg.data['aiocqhttp-config'] self.adapter = AiocqhttpAdapter(aiocqhttp_config, self.ap) - # elif config['msg_source_adapter'] == 'nakuru': - # from pkg.platform.sources.nakuru import NakuruProjectAdapter - # self.adapter = NakuruProjectAdapter(config['nakuru_config']) - # self.bot_account_id = self.adapter.bot_account_id - - # 保存 account_id 到审计模块 - from ..audit.center import apigroup - apigroup.APIGroup._runtime_info['account_id'] = "{}".format(self.bot_account_id) + elif self.ap.platform_cfg.data['platform-adapter'] == 'qq-botpy': + from pkg.platform.sources.qqbotpy import OfficialAdapter + + qqbotpy_config = self.ap.platform_cfg.data['qq-botpy-config'] + self.adapter = OfficialAdapter(qqbotpy_config, self.ap) async def on_friend_message(event: FriendMessage): @@ -137,10 +134,7 @@ async def on_group_message(event: GroupMessage): async def send(self, event, msg, check_quote=True, check_at_sender=True): if check_at_sender and self.ap.platform_cfg.data['at-sender'] and isinstance(event, GroupMessage): - msg.insert( - 0, - Plain(" \n") - ) + msg.insert( 0, At( diff --git a/pkg/platform/sources/aiocqhttp.py b/pkg/platform/sources/aiocqhttp.py index c29c4b5c..169aca8b 100644 --- a/pkg/platform/sources/aiocqhttp.py +++ b/pkg/platform/sources/aiocqhttp.py @@ -213,6 +213,7 @@ def __init__(self, config: dict, ap: app.Application): async def send_message( self, target_type: str, target_id: str, message: mirai.MessageChain ): + # TODO 实现发送消息 return super().send_message(target_type, target_id, message) async def reply_message( diff --git a/pkg/platform/sources/qqbotpy.py b/pkg/platform/sources/qqbotpy.py new file mode 100644 index 00000000..7f725615 --- /dev/null +++ b/pkg/platform/sources/qqbotpy.py @@ -0,0 +1,395 @@ +from __future__ import annotations + +import logging +import typing +import datetime +import asyncio +import re +import traceback +import json +import threading + +import mirai +import botpy +import botpy.message as botpy_message +import botpy.types.message as botpy_message_type + +from .. import adapter as adapter_model +from ...pipeline.longtext.strategies import forward +from ...core import app + + +class OfficialGroupMessage(mirai.GroupMessage): + pass + + +event_handler_mapping = { + mirai.GroupMessage: ["on_at_message_create", "on_group_at_message_create"], + mirai.FriendMessage: ["on_direct_message_create"], +} + + +cached_message_ids = {} +"""由于QQ官方的消息id是字符串，而YiriMirai的消息id是整数，所以需要一个索引来进行转换""" + +id_index = 0 + +def save_msg_id(message_id: str) -> int: + """保存消息id""" + global id_index, cached_message_ids + + crt_index = id_index + id_index += 1 + cached_message_ids[str(crt_index)] = message_id + return crt_index + +cached_member_openids = {} +"""QQ官方 用户的id是字符串，而YiriMirai的用户id是整数，所以需要一个索引来进行转换""" + +member_openid_index = 100 + +def save_member_openid(member_openid: str) -> int: + """保存用户id""" + global member_openid_index, cached_member_openids + + if member_openid in cached_member_openids.values(): + return list(cached_member_openids.keys())[list(cached_member_openids.values()).index(member_openid)] + + crt_index = member_openid_index + member_openid_index += 1 + cached_member_openids[str(crt_index)] = member_openid + return crt_index + +cached_group_openids = {} +"""QQ官方 群组的id是字符串，而YiriMirai的群组id是整数，所以需要一个索引来进行转换""" + +group_openid_index = 1000 + +def save_group_openid(group_openid: str) -> int: + """保存群组id""" + global group_openid_index, cached_group_openids + + if group_openid in cached_group_openids.values(): + return list(cached_group_openids.keys())[list(cached_group_openids.values()).index(group_openid)] + + crt_index = group_openid_index + group_openid_index += 1 + cached_group_openids[str(crt_index)] = group_openid + return crt_index + + +class OfficialMessageConverter(adapter_model.MessageConverter): + """QQ 官方消息转换器""" + @staticmethod + def yiri2target(message_chain: mirai.MessageChain): + """将 YiriMirai 的消息链转换为 QQ 官方消息""" + + msg_list = [] + if type(message_chain) is mirai.MessageChain: + msg_list = message_chain.__root__ + elif type(message_chain) is list: + msg_list = message_chain + else: + raise Exception("Unknown message type: " + str(message_chain) + str(type(message_chain))) + + offcial_messages: list[dict] = [] + """ + { + "type": "text", + "content": "Hello World!" + } + + { + "type": "image", + "content": "https://example.com/example.jpg" + } + """ + + # 遍历并转换 + for component in msg_list: + if type(component) is mirai.Plain: + offcial_messages.append({ + "type": "text", + "content": component.text + }) + elif type(component) is mirai.Image: + if component.url is not None: + offcial_messages.append( + { + "type": "image", + "content": component.url + } + ) + elif component.path is not None: + offcial_messages.append( + { + "type": "file_image", + "content": component.path + } + ) + elif type(component) is mirai.At: + offcial_messages.append( + { + "type": "at", + "content": "" + } + ) + elif type(component) is mirai.AtAll: + print("上层组件要求发送 AtAll 消息，但 QQ 官方 API 不支持此消息类型，忽略此消息。") + elif type(component) is mirai.Voice: + print("上层组件要求发送 Voice 消息，但 QQ 官方 API 不支持此消息类型，忽略此消息。") + elif type(component) is forward.Forward: + # 转发消息 + yiri_forward_node_list = component.node_list + + # 遍历并转换 + for yiri_forward_node in yiri_forward_node_list: + try: + message_chain = yiri_forward_node.message_chain + + # 平铺 + offcial_messages.extend(OfficialMessageConverter.yiri2target(message_chain)) + except Exception as e: + import traceback + traceback.print_exc() + + return offcial_messages + + @staticmethod + def extract_message_chain_from_obj(message: typing.Union[botpy_message.Message, botpy_message.DirectMessage], message_id: str = None, bot_account_id: int = 0) -> mirai.MessageChain: + yiri_msg_list = [] + + # 存id + + yiri_msg_list.append(mirai.models.message.Source(id=save_msg_id(message_id), time=datetime.datetime.now())) + + if type(message) is not botpy_message.DirectMessage: + yiri_msg_list.append(mirai.At(target=bot_account_id)) + + if hasattr(message, "mentions"): + for mention in message.mentions: + if mention.bot: + continue + + yiri_msg_list.append(mirai.At(target=mention.id)) + + for attachment in message.attachments: + if attachment.content_type == "image": + yiri_msg_list.append(mirai.Image(url=attachment.url)) + else: + logging.warning("不支持的附件类型：" + attachment.content_type + "，忽略此附件。") + + content = re.sub(r"<@!\d+>", "", str(message.content)) + if content.strip() != "": + yiri_msg_list.append(mirai.Plain(text=content)) + + chain = mirai.MessageChain(yiri_msg_list) + + return chain + + +class OfficialEventConverter(adapter_model.EventConverter): + """事件转换器""" + @staticmethod + def yiri2target(event: typing.Type[mirai.Event]): + if event == mirai.GroupMessage: + return botpy_message.Message + elif event == mirai.FriendMessage: + return botpy_message.DirectMessage + else: + raise Exception("未支持转换的事件类型(YiriMirai -> Official): " + str(event)) + + @staticmethod + def target2yiri(event: typing.Union[botpy_message.Message, botpy_message.DirectMessage]) -> mirai.Event: + import mirai.models.entities as mirai_entities + + if type(event) == botpy_message.Message: # 频道内，转群聊事件 + permission = "MEMBER" + + if '2' in event.member.roles: + permission = "ADMINISTRATOR" + elif '4' in event.member.roles: + permission = "OWNER" + + return mirai.GroupMessage( + sender=mirai_entities.GroupMember( + id=event.author.id, + member_name=event.author.username, + permission=permission, + group=mirai_entities.Group( + id=event.channel_id, + name=event.author.username, + permission=mirai_entities.Permission.Member + ), + special_title='', + join_timestamp=int(datetime.datetime.strptime(event.member.joined_at, "%Y-%m-%dT%H:%M:%S%z").timestamp()), + last_speak_timestamp=datetime.datetime.now().timestamp(), + mute_time_remaining=0, + ), + message_chain=OfficialMessageConverter.extract_message_chain_from_obj(event, event.id), + time=int(datetime.datetime.strptime(event.timestamp, "%Y-%m-%dT%H:%M:%S%z").timestamp()), + ) + elif type(event) == botpy_message.DirectMessage: # 私聊，转私聊事件 + return mirai.FriendMessage( + sender=mirai_entities.Friend( + id=event.guild_id, + nickname=event.author.username, + remark=event.author.username, + ), + message_chain=OfficialMessageConverter.extract_message_chain_from_obj(event, event.id), + time=int(datetime.datetime.strptime(event.timestamp, "%Y-%m-%dT%H:%M:%S%z").timestamp()), + ) + elif type(event) == botpy_message.GroupMessage: + + replacing_member_id = save_member_openid(event.author.member_openid) + + return OfficialGroupMessage( + sender=mirai_entities.GroupMember( + id=replacing_member_id, + member_name=replacing_member_id, + permission="MEMBER", + group=mirai_entities.Group( + id=save_group_openid(event.group_openid), + name=replacing_member_id, + permission=mirai_entities.Permission.Member + ), + special_title='', + join_timestamp=int(0), + last_speak_timestamp=datetime.datetime.now().timestamp(), + mute_time_remaining=0, + ), + message_chain=OfficialMessageConverter.extract_message_chain_from_obj(event, event.id), + time=int(datetime.datetime.strptime(event.timestamp, "%Y-%m-%dT%H:%M:%S%z").timestamp()), + ) + + +class OfficialAdapter(adapter_model.MessageSourceAdapter): + """QQ 官方消息适配器""" + bot: botpy.Client = None + + bot_account_id: int = 0 + + message_converter: OfficialMessageConverter = OfficialMessageConverter() + # event_handler: adapter_model.EventHandler = adapter_model.EventHandler() + + cfg: dict = None + + cached_official_messages: dict = {} + """缓存的 qq-botpy 框架消息对象 + + message_id: botpy_message.Message | botpy_message.DirectMessage + """ + + ap: app.Application + + def __init__(self, cfg: dict, ap: app.Application): + """初始化适配器""" + self.cfg = cfg + self.ap = ap + + switchs = {} + + for intent in cfg['intents']: + switchs[intent] = True + + del cfg['intents'] + + intents = botpy.Intents(**switchs) + + self.bot = botpy.Client(intents=intents) + + # TODO 获取机器人id和昵称 + + async def send_message( + self, + target_type: str, + target_id: str, + message: mirai.MessageChain + ): + pass + + async def reply_message( + self, + message_source: mirai.MessageEvent, + message: mirai.MessageChain, + quote_origin: bool = False + ): + message_list = self.message_converter.yiri2target(message) + tasks = [] + + msg_seq = 1 + + for msg in message_list: + args = {} + + if msg['type'] == 'text': + args['content'] = msg['content'] + elif msg['type'] == 'image': + args['image'] = msg['content'] + elif msg['type'] == 'file_image': + args['file_image'] = msg["content"] + else: + continue + + if quote_origin: + args['message_reference'] = botpy_message_type.Reference(message_id=cached_message_ids[str(message_source.message_chain.message_id)]) + + if type(message_source) == mirai.GroupMessage: + args['channel_id'] = str(message_source.sender.group.id) + args['msg_id'] = cached_message_ids[str(message_source.message_chain.message_id)] + await self.bot.api.post_message(**args) + elif type(message_source) == mirai.FriendMessage: + args['guild_id'] = str(message_source.sender.id) + args['msg_id'] = cached_message_ids[str(message_source.message_chain.message_id)] + await self.bot.api.post_dms(**args) + elif type(message_source) == OfficialGroupMessage: + # args['guild_id'] = str(message_source.sender.group.id) + # args['msg_id'] = cached_message_ids[str(message_source.message_chain.message_id)] + # await self.bot.api.post_message(**args) + if 'image' in args or 'file_image' in args: + continue + args['group_openid'] = cached_group_openids[str(message_source.sender.group.id)] + args['msg_id'] = cached_message_ids[str(message_source.message_chain.message_id)] + args['msg_seq'] = msg_seq + msg_seq += 1 + await self.bot.api.post_group_message( + **args + ) + + + async def is_muted(self, group_id: int) -> bool: + return False + + def register_listener( + self, + event_type: typing.Type[mirai.Event], + callback: typing.Callable[[mirai.Event], None] + ): + + try: + + async def wrapper(message: typing.Union[botpy_message.Message, botpy_message.DirectMessage, botpy_message.GroupMessage]): + self.cached_official_messages[str(message.id)] = message + await callback(OfficialEventConverter.target2yiri(message)) + + for event_handler in event_handler_mapping[event_type]: + setattr(self.bot, event_handler, wrapper) + except Exception as e: + traceback.print_exc() + raise e + + def unregister_listener( + self, + event_type: typing.Type[mirai.Event], + callback: typing.Callable[[mirai.Event], None] + ): + delattr(self.bot, event_handler_mapping[event_type]) + + async def run_async(self): + self.ap.logger.info("运行 QQ 官方适配器") + await self.bot.start( + **self.cfg + ) + + def kill(self) -> bool: + return False diff --git a/requirements.txt b/requirements.txt index 1a1274c2..de78dcec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,7 @@ dulwich~=0.21.6 colorlog~=6.6.0 yiri-mirai-rc aiocqhttp +qq-botpy websockets urllib3 func_timeout~=4.3.5 diff --git a/templates/platform.json b/templates/platform.json index 54100038..94162c24 100644 --- a/templates/platform.json +++ b/templates/platform.json @@ -11,6 +11,14 @@ "host": "127.0.0.1", "port": 8080 }, + "qq-botpy-config": { + "appid": "", + "secret": "", + "intents": [ + "public_guild_messages", + "direct_message" + ] + }, "track-function-calls": true, "quote-origin": false, "at-sender": false, From 7366ca59c77a0090b348fc51ed591ae82dc3fb48 Mon Sep 17 00:00:00 2001 From: RockChinQ <1010553892@qq.com> Date: Wed, 7 Feb 2024 23:27:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=E5=BF=BD=E7=95=A5botpy.log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7b2a70a9..2af326f5 100644 --- a/.gitignore +++ b/.gitignore @@ -33,4 +33,5 @@ bard.json !/docker-compose.yaml res/instance_id.json .DS_Store -/data \ No newline at end of file +/data +botpy.log \ No newline at end of file