Merge branch 'dev' of https://github.com/MoFox-Studio/MoFox_Bot into dev
This commit is contained in:
@@ -167,7 +167,7 @@ class ExpressionLearner:
|
|||||||
Returns:
|
Returns:
|
||||||
bool: 是否成功触发学习
|
bool: 是否成功触发学习
|
||||||
"""
|
"""
|
||||||
if not self.should_trigger_learning():
|
if not await self.should_trigger_learning():
|
||||||
return False
|
return False
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -1232,7 +1232,7 @@ async def build_anonymous_messages(messages: List[Dict[str, Any]]) -> str:
|
|||||||
|
|
||||||
# 在最前面添加图片映射信息
|
# 在最前面添加图片映射信息
|
||||||
final_output_lines = []
|
final_output_lines = []
|
||||||
pic_mapping_info = build_pic_mapping_info(pic_id_mapping)
|
pic_mapping_info = await build_pic_mapping_info(pic_id_mapping)
|
||||||
if pic_mapping_info:
|
if pic_mapping_info:
|
||||||
final_output_lines.append(pic_mapping_info)
|
final_output_lines.append(pic_mapping_info)
|
||||||
final_output_lines.append("\n\n")
|
final_output_lines.append("\n\n")
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ class EmojiAction(BaseAction):
|
|||||||
emoji_base64, emoji_description = random.choice(all_emojis_data)
|
emoji_base64, emoji_description = random.choice(all_emojis_data)
|
||||||
else:
|
else:
|
||||||
# 获取最近的5条消息内容用于判断
|
# 获取最近的5条消息内容用于判断
|
||||||
recent_messages = message_api.get_recent_messages(chat_id=self.chat_id, limit=5)
|
recent_messages = await message_api.get_recent_messages(chat_id=self.chat_id, limit=5)
|
||||||
messages_text = ""
|
messages_text = ""
|
||||||
if recent_messages:
|
if recent_messages:
|
||||||
messages_text = await message_api.build_readable_messages(
|
messages_text = await message_api.build_readable_messages(
|
||||||
@@ -181,7 +181,7 @@ class EmojiAction(BaseAction):
|
|||||||
elif global_config.emoji.emoji_selection_mode == "description":
|
elif global_config.emoji.emoji_selection_mode == "description":
|
||||||
# --- 详细描述选择模式 ---
|
# --- 详细描述选择模式 ---
|
||||||
# 获取最近的5条消息内容用于判断
|
# 获取最近的5条消息内容用于判断
|
||||||
recent_messages = message_api.get_recent_messages(chat_id=self.chat_id, limit=5)
|
recent_messages = await message_api.get_recent_messages(chat_id=self.chat_id, limit=5)
|
||||||
messages_text = ""
|
messages_text = ""
|
||||||
if recent_messages:
|
if recent_messages:
|
||||||
messages_text = await message_api.build_readable_messages(
|
messages_text = await message_api.build_readable_messages(
|
||||||
|
|||||||
Reference in New Issue
Block a user