fix:修正merge带来的问题
This commit is contained in:
@@ -142,7 +142,7 @@ class ActionModifier:
|
||||
|
||||
async def _get_deactivated_actions_by_type(
|
||||
self,
|
||||
actions_with_info: Dict[str, Any],
|
||||
actions_with_info: Dict[str, ActionInfo],
|
||||
chat_content: str = "",
|
||||
) -> List[tuple[str, str]]:
|
||||
"""
|
||||
@@ -164,7 +164,7 @@ class ActionModifier:
|
||||
random.shuffle(actions_to_check)
|
||||
|
||||
for action_name, action_info in actions_to_check:
|
||||
activation_type = action_info.get("activation_type", "")
|
||||
activation_type = action_info.activation_type
|
||||
if not activation_type:
|
||||
activation_type = action_info.get("focus_activation_type", "")
|
||||
|
||||
|
||||
@@ -95,7 +95,7 @@ class BaseWillingManager(ABC):
|
||||
|
||||
def setup(self, message: dict, chat: ChatStream):
|
||||
person_id = PersonInfoManager.get_person_id(chat.platform, chat.user_info.user_id) # type: ignore
|
||||
self.ongoing_messages[message.message_info.message_id] = WillingInfo( # type: ignore
|
||||
self.ongoing_messages[message.get("message_id", "")] = WillingInfo( # type: ignore
|
||||
message=message,
|
||||
chat=chat,
|
||||
person_info_manager=get_person_info_manager(),
|
||||
|
||||
Reference in New Issue
Block a user