gardel/Mofox-Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新消息存储和查询逻辑，支持MongoDB风格的操作符，修改消息ID字段类型为TextField

Browse Source
This commit is contained in:
墨梓柒
2025-05-15 19:03:47 +08:00
parent 4c2cfd5c73
commit a18524ce61
4 changed files with 74 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/chat/message_receive/storage.py
View File

@@ -33,14 +33,13 @@ class MessageStorage:
chat_info_dict = chat_stream.to_dict()
user_info_dict = message.message_info.user_info.to_dict()
# Ensure message_id is an int if the model field is IntegerField
try:
msg_id = int(message.message_info.message_id)
except ValueError:
logger.error(
f"Message ID {message.message_info.message_id} is not a valid integer. Storing as 0 or consider changing model field type."
)
msg_id = 0 # Or handle as appropriate, e.g. skip storing, or change model field to TextField
# message_id 现在是 TextField，直接使用字符串值
msg_id = message.message_info.message_id
# 安全地获取 group_info, 如果为 None 则视为空字典
group_info_from_chat = chat_info_dict.get("group_info") or {}
# 安全地获取 user_info, 如果为 None 则视为空字典 (以防万一)
user_info_from_chat = chat_info_dict.get("user_info") or {}
Messages.create(
message_id=msg_id,
@@ -49,13 +48,13 @@ class MessageStorage:
# Flattened chat_info
chat_info_stream_id=chat_info_dict.get("stream_id"),
chat_info_platform=chat_info_dict.get("platform"),
chat_info_user_platform=chat_info_dict.get("user_info", {}).get("platform"),
chat_info_user_id=chat_info_dict.get("user_info", {}).get("user_id"),
chat_info_user_nickname=chat_info_dict.get("user_info", {}).get("user_nickname"),
chat_info_user_cardname=chat_info_dict.get("user_info", {}).get("user_cardname"),
chat_info_group_platform=chat_info_dict.get("group_info", {}).get("platform"),
chat_info_group_id=chat_info_dict.get("group_info", {}).get("group_id"),
chat_info_group_name=chat_info_dict.get("group_info", {}).get("group_name"),
chat_info_user_platform=user_info_from_chat.get("platform"),
chat_info_user_id=user_info_from_chat.get("user_id"),
chat_info_user_nickname=user_info_from_chat.get("user_nickname"),
chat_info_user_cardname=user_info_from_chat.get("user_cardname"),
chat_info_group_platform=group_info_from_chat.get("platform"),
chat_info_group_id=group_info_from_chat.get("group_id"),
chat_info_group_name=group_info_from_chat.get("group_name"),
chat_info_create_time=float(chat_info_dict.get("create_time", 0.0)),
chat_info_last_active_time=float(chat_info_dict.get("last_active_time", 0.0)),
# Flattened user_info (message sender)

12
src/chat/person_info/person_info.py
View File

@@ -39,13 +39,13 @@ logger = get_logger("person_info")
person_info_default = {
"person_id": None,
"person_name": None,
"person_name": None, # 模型中已设为 null=True，此默认值OK
"name_reason": None,
"platform": None,
"user_id": None,
"nickname": None,
"platform": "unknown", # 提供非None的默认值
"user_id": "unknown", # 提供非None的默认值
"nickname": "Unknown", # 提供非None的默认值
"relationship_value": 0,
"konw_time": 0,
"know_time": 0, # 修正拼写：konw_time -> know_time
"msg_interval": 2000,
"msg_interval_list": [], # 将作为 JSON 字符串存储在 Peewee 的 TextField
"user_cardname": None, # 注意：此字段不在 PersonInfo Peewee 模型中
@@ -561,7 +561,7 @@ class PersonInfoManager:
"platform": platform,
"user_id": str(user_id),
"nickname": nickname,
"konw_time": int(datetime.datetime.now().timestamp()),
"know_time": int(datetime.datetime.now().timestamp()), # 修正拼写：konw_time -> know_time
}
model_fields = PersonInfo._meta.fields.keys()
filtered_initial_data = {k: v for k, v in initial_data.items() if v is not None and k in model_fields}