diff --git a/src/chat/emoji_system/emoji_manager.py b/src/chat/emoji_system/emoji_manager.py index 80b2c409b..071f57a4a 100644 --- a/src/chat/emoji_system/emoji_manager.py +++ b/src/chat/emoji_system/emoji_manager.py @@ -739,7 +739,7 @@ class EmojiManager: emoji = await self.get_emoji_from_manager(emoji_hash) if emoji and emoji.emotion: logger.info(f"[缓存命中] 从内存获取表情包描述: {emoji.emotion}...") - return emoji.emotion + return ",".join(emoji.emotion) # 如果内存中没有,从数据库查找 try: diff --git a/src/chat/planner_actions/planner.py b/src/chat/planner_actions/planner.py index 2d945cd94..77cb2dcc6 100644 --- a/src/chat/planner_actions/planner.py +++ b/src/chat/planner_actions/planner.py @@ -39,7 +39,7 @@ def init_prompt(): {identity_block} {custom_prompt_block} -{chat_context_description},以下是具体的聊天内容,其中[mxxx]是消息id。 +{chat_context_description},以下是具体的聊天内容。 {chat_content_block} {moderation_prompt} diff --git a/src/config/config.py b/src/config/config.py index 61246ddb5..367266987 100644 --- a/src/config/config.py +++ b/src/config/config.py @@ -80,8 +80,8 @@ def get_key_comment(toml_table, key): return item.trivia.comment if hasattr(toml_table, "keys"): for k in toml_table.keys(): - if isinstance(k, KeyType) and k.key == key: # type: ignore - return k.trivia.comment # type: ignore + if isinstance(k, KeyType) and k.key == key: # type: ignore + return k.trivia.comment # type: ignore return None