diff --git a/src/chat/focus_chat/planners/actions/emoji_action.py b/src/chat/focus_chat/planners/actions/emoji_action.py index cf7673228..b46481cc6 100644 --- a/src/chat/focus_chat/planners/actions/emoji_action.py +++ b/src/chat/focus_chat/planners/actions/emoji_action.py @@ -20,13 +20,14 @@ class EmojiAction(BaseAction): """ action_name: str = "emoji" - action_description: str = "当你想发送一个表情" + action_description: str = "当你想发送一个表情辅助你的回复表达" action_parameters: dict[str:str] = { - "description": "描述你想要发送的表情", + "description": "文字描述你想要发送的表情", } action_require: list[str] = [ "你想要发送一个表情", "表达情绪时可以选择使用", + "一般在你回复之后可以选择性使用" ] associated_types: list[str] = ["emoji"] @@ -90,8 +91,7 @@ class EmojiAction(BaseAction): "description": "描述你想要发送的表情" } """ - logger.info(f"{self.log_prefix} 决定发送表情: {self.reasoning}") - + logger.info(f"{self.log_prefix} 决定发送表情") # 从聊天观察获取锚定消息 # chatting_observation: ChattingObservation = next( # obs for obs in self.observations if isinstance(obs, ChattingObservation) diff --git a/src/chat/focus_chat/replyer/default_replyer.py b/src/chat/focus_chat/replyer/default_replyer.py index c3aa9bf3d..43430c92e 100644 --- a/src/chat/focus_chat/replyer/default_replyer.py +++ b/src/chat/focus_chat/replyer/default_replyer.py @@ -193,12 +193,17 @@ class DefaultReplyer: try: + has_sent_something = False + sent_msg_list = [] reply = [] with Timer("选择表情", cycle_timers): emoji_keyword = action_data.get("description", []) - emoji_base64 = await self._choose_emoji(emoji_keyword) + emoji_base64, description = await self._choose_emoji(emoji_keyword) if emoji_base64: + logger.info(f"选择表情: {description}") reply.append(("emoji", emoji_base64)) + else: + logger.warning(f"{self.log_prefix} 没有找到合适表情") if reply: @@ -559,11 +564,12 @@ class DefaultReplyer: 选择表情,根据send_emoji文本选择表情,返回表情base64 """ emoji_base64 = "" + description = "" emoji_raw = await emoji_manager.get_emoji_for_text(send_emoji) if emoji_raw: - emoji_path, _description = emoji_raw + emoji_path, description = emoji_raw emoji_base64 = image_path_to_base64(emoji_path) - return emoji_base64 + return emoji_base64, description async def _build_single_sending_message( self, diff --git a/src/plugins/test_plugin/actions/mute_action.py b/src/plugins/test_plugin/actions/mute_action.py index 4069bf8a6..afd31eaae 100644 --- a/src/plugins/test_plugin/actions/mute_action.py +++ b/src/plugins/test_plugin/actions/mute_action.py @@ -22,7 +22,7 @@ class MuteAction(PluginAction): "当有人发了擦边,或者色情内容时使用", "当有人要求禁言自己时使用", ] - default = True # 默认动作,是否手动添加到使用集 + default = False # 默认动作,是否手动添加到使用集 associated_types = ["command", "text"] # associated_types = ["text"]