🤖 自动格式化代码 [skip ci]
This commit is contained in:
@@ -101,10 +101,11 @@ class MessageStorage:
|
|||||||
except Exception:
|
except Exception:
|
||||||
logger.exception("删除撤回消息失败")
|
logger.exception("删除撤回消息失败")
|
||||||
|
|
||||||
|
|
||||||
# 如果需要其他存储相关的函数,可以在这里添加
|
# 如果需要其他存储相关的函数,可以在这里添加
|
||||||
@staticmethod
|
@staticmethod
|
||||||
async def update_message(message: MessageRecv) -> None: # 用于实时更新数据库的自身发送消息ID,目前能处理text,reply,image和emoji
|
async def update_message(
|
||||||
|
message: MessageRecv,
|
||||||
|
) -> None: # 用于实时更新数据库的自身发送消息ID,目前能处理text,reply,image和emoji
|
||||||
"""更新最新一条匹配消息的message_id"""
|
"""更新最新一条匹配消息的message_id"""
|
||||||
try:
|
try:
|
||||||
if message.message_segment.type == "notify":
|
if message.message_segment.type == "notify":
|
||||||
@@ -117,15 +118,13 @@ class MessageStorage:
|
|||||||
logger.info("消息不存在message_id,无法更新")
|
logger.info("消息不存在message_id,无法更新")
|
||||||
return
|
return
|
||||||
# 查询最新一条匹配消息
|
# 查询最新一条匹配消息
|
||||||
matched_message = Messages.select().where(
|
matched_message = (
|
||||||
(Messages.message_id == mmc_message_id)
|
Messages.select().where((Messages.message_id == mmc_message_id)).order_by(Messages.time.desc()).first()
|
||||||
).order_by(Messages.time.desc()).first()
|
)
|
||||||
|
|
||||||
if matched_message:
|
if matched_message:
|
||||||
# 更新找到的消息记录
|
# 更新找到的消息记录
|
||||||
Messages.update(message_id=qq_message_id).where(
|
Messages.update(message_id=qq_message_id).where(Messages.id == matched_message.id).execute()
|
||||||
Messages.id == matched_message.id
|
|
||||||
).execute()
|
|
||||||
logger.info(f"更新消息ID成功: {matched_message.message_id} -> {qq_message_id}")
|
logger.info(f"更新消息ID成功: {matched_message.message_id} -> {qq_message_id}")
|
||||||
else:
|
else:
|
||||||
logger.debug("未找到匹配的消息")
|
logger.debug("未找到匹配的消息")
|
||||||
|
|||||||
@@ -160,10 +160,7 @@ class DefaultReplyer:
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
async def generate_reply_with_context(
|
async def generate_reply_with_context(
|
||||||
self,
|
self, reply_data: Dict[str, Any], enable_splitter: bool = True, enable_chinese_typo: bool = True
|
||||||
reply_data: Dict[str, Any],
|
|
||||||
enable_splitter: bool=True,
|
|
||||||
enable_chinese_typo: bool=True
|
|
||||||
) -> Tuple[bool, Optional[List[str]]]:
|
) -> Tuple[bool, Optional[List[str]]]:
|
||||||
"""
|
"""
|
||||||
回复器 (Replier): 核心逻辑,负责生成回复文本。
|
回复器 (Replier): 核心逻辑,负责生成回复文本。
|
||||||
@@ -216,10 +213,7 @@ class DefaultReplyer:
|
|||||||
return False, None
|
return False, None
|
||||||
|
|
||||||
async def rewrite_reply_with_context(
|
async def rewrite_reply_with_context(
|
||||||
self,
|
self, reply_data: Dict[str, Any], enable_splitter: bool = True, enable_chinese_typo: bool = True
|
||||||
reply_data: Dict[str, Any],
|
|
||||||
enable_splitter: bool=True,
|
|
||||||
enable_chinese_typo: bool=True
|
|
||||||
) -> Tuple[bool, Optional[List[str]]]:
|
) -> Tuple[bool, Optional[List[str]]]:
|
||||||
"""
|
"""
|
||||||
表达器 (Expressor): 核心逻辑,负责生成回复文本。
|
表达器 (Expressor): 核心逻辑,负责生成回复文本。
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ async def generate_reply(
|
|||||||
action_data: Dict[str, Any] = None,
|
action_data: Dict[str, Any] = None,
|
||||||
chat_id: str = None,
|
chat_id: str = None,
|
||||||
enable_splitter: bool = True,
|
enable_splitter: bool = True,
|
||||||
enable_chinese_typo: bool=True
|
enable_chinese_typo: bool = True,
|
||||||
) -> Tuple[bool, List[Tuple[str, Any]]]:
|
) -> Tuple[bool, List[Tuple[str, Any]]]:
|
||||||
"""生成回复
|
"""生成回复
|
||||||
|
|
||||||
@@ -99,9 +99,7 @@ async def generate_reply(
|
|||||||
|
|
||||||
# 调用回复器生成回复
|
# 调用回复器生成回复
|
||||||
success, reply_set = await replyer.generate_reply_with_context(
|
success, reply_set = await replyer.generate_reply_with_context(
|
||||||
reply_data=action_data or {},
|
reply_data=action_data or {}, enable_splitter=enable_splitter, enable_chinese_typo=enable_chinese_typo
|
||||||
enable_splitter=enable_splitter,
|
|
||||||
enable_chinese_typo=enable_chinese_typo
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if success:
|
if success:
|
||||||
@@ -121,7 +119,7 @@ async def rewrite_reply(
|
|||||||
reply_data: Dict[str, Any] = None,
|
reply_data: Dict[str, Any] = None,
|
||||||
chat_id: str = None,
|
chat_id: str = None,
|
||||||
enable_splitter: bool = True,
|
enable_splitter: bool = True,
|
||||||
enable_chinese_typo: bool=True
|
enable_chinese_typo: bool = True,
|
||||||
) -> Tuple[bool, List[Tuple[str, Any]]]:
|
) -> Tuple[bool, List[Tuple[str, Any]]]:
|
||||||
"""重写回复
|
"""重写回复
|
||||||
|
|
||||||
@@ -146,9 +144,7 @@ async def rewrite_reply(
|
|||||||
|
|
||||||
# 调用回复器重写回复
|
# 调用回复器重写回复
|
||||||
success, reply_set = await replyer.rewrite_reply_with_context(
|
success, reply_set = await replyer.rewrite_reply_with_context(
|
||||||
reply_data=reply_data or {},
|
reply_data=reply_data or {}, enable_splitter=enable_splitter, enable_chinese_typo=enable_chinese_typo
|
||||||
enable_splitter=enable_splitter,
|
|
||||||
enable_chinese_typo=enable_chinese_typo
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if success:
|
if success:
|
||||||
|
|||||||
Reference in New Issue
Block a user