fix(message): 落库保留消息中的 @艾特; 同步前端

Author: lengxi-root

core/bot/event.py

@@ -23,6 +23,7 @@
     SILENT_TYPES,
 )
 from core.message.parsers import IdentityHelper
+from core.message.parsers.base import MessageUtils
 
 log = get_logger(FRAMEWORK, '事件处理')
 
@@ -213,7 +214,9 @@ async def _on_event(self, event):
             msg_id = event.message_id or ''
             uid = event.user_id or ''
             gid = event.group_id or ''
-            content = event.content or ''
+            content = MessageUtils.sanitize_content(event.raw_content, keep_at=True) or event.content or ''
+            if event.image_url and f'<{event.image_url}>' not in content:
+                content = f'{content}<{event.image_url}>' if content else f'<{event.image_url}>'
             raw_json = json.dumps(event.raw, ensure_ascii=False)
             bot.log_service.add_sync('message', {
                 'message_id': msg_id, 'user_id': uid,

core/message/parsers/base.py

@@ -14,14 +14,14 @@ class MessageUtils:
     _AT_PATTERN = re.compile(r'<@!?[A-Za-z0-9]+>')
 
     @staticmethod
-    def sanitize_content(content):
-        """内容清洗: face 标签→[face id=X], @圈人信息剔除, 去除首尾空白"""
+    def sanitize_content(content, *, keep_at=False):
+        """内容清洗: face 标签→[face id=X], @圈人信息剔除(keep_at=True 保留), 去首尾空白"""
         if not content:
             return ''
         text = str(content)
         if '<faceType' in text:
             text = MessageUtils._FACE_PATTERN.sub(r'[face id=\1]', text)
-        if '<@' in text:
+        if not keep_at and '<@' in text:
             text = MessageUtils._AT_PATTERN.sub('', text)
         return text.strip()