重构消息处理并用DatabaseMessages替换MessageRecv
-更新PlusCommand以使用DatabaseMessages而不是MessageRecv。 -将消息处理逻辑重构到一个新模块message_processor.py中,以处理消息段并从消息字典中创建DatabaseMessages。 -删除了已弃用的MessageRecv类及其相关逻辑。 -调整了各种插件以适应新的DatabaseMessages结构。 -增强了消息处理功能中的错误处理和日志记录。
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
|
||||
import re
|
||||
|
||||
from src.chat.message_receive.message import MessageRecv
|
||||
from src.common.data_models.database_data_model import DatabaseMessages
|
||||
from src.common.logger import get_logger
|
||||
|
||||
logger = get_logger("anti_injector.message_processor")
|
||||
@@ -15,7 +15,7 @@ logger = get_logger("anti_injector.message_processor")
|
||||
class MessageProcessor:
|
||||
"""消息内容处理器"""
|
||||
|
||||
def extract_text_content(self, message: MessageRecv) -> str:
|
||||
def extract_text_content(self, message: DatabaseMessages) -> str:
|
||||
"""提取消息中的文本内容,过滤掉引用的历史内容
|
||||
|
||||
Args:
|
||||
@@ -64,7 +64,7 @@ class MessageProcessor:
|
||||
return new_content
|
||||
|
||||
@staticmethod
|
||||
def check_whitelist(message: MessageRecv, whitelist: list) -> tuple | None:
|
||||
def check_whitelist(message: DatabaseMessages, whitelist: list) -> tuple | None:
|
||||
"""检查用户白名单
|
||||
|
||||
Args:
|
||||
@@ -74,8 +74,8 @@ class MessageProcessor:
|
||||
Returns:
|
||||
如果在白名单中返回结果元组,否则返回None
|
||||
"""
|
||||
user_id = message.message_info.user_info.user_id
|
||||
platform = message.message_info.platform
|
||||
user_id = message.user_info.user_id
|
||||
platform = message.chat_info.platform
|
||||
|
||||
# 检查用户白名单:格式为 [[platform, user_id], ...]
|
||||
for whitelist_entry in whitelist:
|
||||
|
||||
Reference in New Issue
Block a user