From 24e150c64e6dc7e9f817ca599188b3179773d2aa Mon Sep 17 00:00:00 2001 From: Pliosauroidea Date: Sat, 15 Mar 2025 15:55:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8B=BF=E4=B8=8D?= =?UTF-8?q?=E5=88=B0at=E5=AF=B9=E8=B1=A1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/chat/utils_user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/chat/utils_user.py b/src/plugins/chat/utils_user.py index 90c93eeb2..973e7933d 100644 --- a/src/plugins/chat/utils_user.py +++ b/src/plugins/chat/utils_user.py @@ -6,7 +6,7 @@ def get_user_nickname(user_id: int) -> str: if int(user_id) == int(global_config.BOT_QQ): return global_config.BOT_NICKNAME # print(user_id) - return relationship_manager.get_name(user_id) + return relationship_manager.get_name(int(user_id)) def get_user_cardname(user_id: int) -> str: From 1e0abb0a9b0f8d5be3f64c0a8a0f4693b12ee890 Mon Sep 17 00:00:00 2001 From: Pliosauroidea Date: Sat, 15 Mar 2025 16:16:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=AF=B9reply?= =?UTF-8?q?=E7=9A=84=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/chat/cq_code.py | 5 +---- src/plugins/chat/message_cq.py | 5 ++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/chat/cq_code.py b/src/plugins/chat/cq_code.py index 5a20b0479..b23fda77e 100644 --- a/src/plugins/chat/cq_code.py +++ b/src/plugins/chat/cq_code.py @@ -249,11 +249,8 @@ class CQCode: if self.reply_message is None: return None - if hasattr(self.reply_message, "group_id"): - group_info = GroupInfo( - platform="qq", group_id=self.reply_message.group_id, group_name="" - ) + group_info = GroupInfo(platform="qq", group_id=self.reply_message.group_id, group_name="") else: group_info = None diff --git a/src/plugins/chat/message_cq.py b/src/plugins/chat/message_cq.py index 435bdf19e..a52386154 100644 --- a/src/plugins/chat/message_cq.py +++ b/src/plugins/chat/message_cq.py @@ -64,10 +64,13 @@ class MessageRecvCQ(MessageCQ): self.message_segment = None # 初始化为None self.raw_message = raw_message # 异步初始化在外部完成 + + #添加对reply的解析 + self.reply_message = reply_message async def initialize(self): """异步初始化方法""" - self.message_segment = await self._parse_message(self.raw_message) + self.message_segment = await self._parse_message(self.raw_message,self.reply_message) async def _parse_message(self, message: str, reply_message: Optional[Dict] = None) -> Seg: """异步解析消息内容为Seg对象"""