From 87f3fc7b33daebcd3c9335a7a37a4c3794e2f79a Mon Sep 17 00:00:00 2001 From: meng_xi_pan <1903647908@qq.com> Date: Fri, 4 Apr 2025 14:22:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=A4=84=E7=90=86=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E5=A4=8D=E5=90=88=E6=B6=88=E6=81=AF=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/chat/message_buffer.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/plugins/chat/message_buffer.py b/src/plugins/chat/message_buffer.py index 9919e6cf7..a7be8abcd 100644 --- a/src/plugins/chat/message_buffer.py +++ b/src/plugins/chat/message_buffer.py @@ -122,11 +122,11 @@ class MassageBuffer: keep_msgs = OrderedDict() combined_text = [] found = False - is_text = False + type = "text" for msg_id, msg in self.buffer_pool[person_id_].items(): if msg_id == message.message_info.message_id: found = True - is_text = msg.message.message_segment.type == "text" + type = msg.message.message_segment.type combined_text.append(msg.message.processed_plain_text) continue if found: @@ -141,9 +141,15 @@ class MassageBuffer: logger.debug(f"异常未处理信息id： {msg.message.message_info.message_id}") # 更新当前消息的processed_plain_text - if combined_text and combined_text[0] != message.processed_plain_text and is_text: - message.processed_plain_text = "".join(combined_text) - logger.debug(f"整合了{len(combined_text)-1}条F消息的内容到当前消息") + if combined_text and combined_text[0] != message.processed_plain_text: + if type == "text": + message.processed_plain_text = "".join(combined_text) + logger.debug(f"整合了{len(combined_text)-1}条F消息的内容到当前消息") + elif type == "image": + combined_text.pop() + message.processed_plain_text = "".join(combined_text) + message.is_emoji = False + logger.debug(f"整合了{len(combined_text)-1}条F消息的内容，覆盖当前image消息") self.buffer_pool[person_id_] = keep_msgs return result