Merge branch 'dev' of https://github.com/A0000Xz/MaiBot into dev

src/chat/message_receive/storage.py

@@ -4,7 +4,7 @@ from typing import Union
 # from ...common.database.database import db  # db is now Peewee's SqliteDatabase instance
 from .message import MessageSending, MessageRecv
 from .chat_stream import ChatStream
-from ...common.database.database_model import Messages, RecalledMessages  # Import Peewee models
+from ...common.database.database_model import Messages, RecalledMessages, Images  # Import Peewee models
 from src.common.logger import get_logger
 
 logger = get_logger("message_storage")
@@ -25,6 +25,7 @@ class MessageStorage:
             # print(processed_plain_text)
 
             if processed_plain_text:
+                processed_plain_text = MessageStorage.replace_image_descriptions(processed_plain_text)
                 filtered_processed_plain_text = re.sub(pattern, "", processed_plain_text, flags=re.DOTALL)
             else:
                 filtered_processed_plain_text = ""
@@ -35,9 +36,13 @@ class MessageStorage:
                     filtered_display_message = re.sub(pattern, "", display_message, flags=re.DOTALL)
                 else:
                     filtered_display_message = ""
+
+                reply_to = message.reply_to
             else:
                 filtered_display_message = ""
 
+                reply_to = ""
+
             chat_info_dict = chat_stream.to_dict()
             user_info_dict = message.message_info.user_info.to_dict()
 
@@ -59,6 +64,7 @@ class MessageStorage:
                 time=float(message.message_info.time),
                 chat_id=chat_stream.stream_id,
                 # Flattened chat_info
+                reply_to=reply_to,
                 chat_info_stream_id=chat_info_dict.get("stream_id"),
                 chat_info_platform=chat_info_dict.get("platform"),
                 chat_info_user_platform=user_info_from_chat.get("platform"),
@@ -136,3 +142,29 @@ class MessageStorage:
 
         except Exception as e:
             logger.error(f"更新消息ID失败: {e}")
+
+    @staticmethod
+    def replace_image_descriptions(text: str) -> str:
+        """将[图片：描述]替换为[picid:image_id]"""
+        # 先检查文本中是否有图片标记
+        pattern = r"\[图片：([^\]]+)\]"
+        matches = re.findall(pattern, text)
+
+        if not matches:
+            logger.debug("文本中没有图片标记，直接返回原文本")
+            return text
+
+        def replace_match(match):
+            description = match.group(1).strip()
+            try:
+                image_record = (
+                    Images.select().where(Images.description == description).order_by(Images.timestamp.desc()).first()
+                )
+                if image_record:
+                    return f"[picid:{image_record.image_id}]"
+                else:
+                    return match.group(0)  # 保持原样
+            except Exception:
+                return match.group(0)
+
+        return re.sub(r"\[图片：([^\]]+)\]", replace_match, text)