mirror of https://github.com/Mai-with-u/MaiBot.git
修复str(None)引发的错误理解与可能风险
parent
82e5a710c3
commit
4bee6002ff
|
|
@ -76,9 +76,13 @@ class BaseAction(ABC):
|
|||
self.action_require: list[str] = getattr(self.__class__, "action_require", []).copy()
|
||||
|
||||
# 设置激活类型实例属性(从类属性复制,提供默认值)
|
||||
self.focus_activation_type = getattr(self.__class__, "focus_activation_type", ActionActivationType.ALWAYS) #已弃用
|
||||
self.focus_activation_type = getattr(
|
||||
self.__class__, "focus_activation_type", ActionActivationType.ALWAYS
|
||||
) # 已弃用
|
||||
"""FOCUS模式下的激活类型"""
|
||||
self.normal_activation_type = getattr(self.__class__, "normal_activation_type", ActionActivationType.ALWAYS) #已弃用
|
||||
self.normal_activation_type = getattr(
|
||||
self.__class__, "normal_activation_type", ActionActivationType.ALWAYS
|
||||
) # 已弃用
|
||||
"""NORMAL模式下的激活类型"""
|
||||
self.activation_type = getattr(self.__class__, "activation_type", self.focus_activation_type)
|
||||
"""激活类型"""
|
||||
|
|
@ -116,8 +120,16 @@ class BaseAction(ABC):
|
|||
self.has_action_message = True
|
||||
|
||||
if self.action_name != "no_action":
|
||||
self.group_id = str(self.action_message.chat_info.group_info.group_id if self.action_message.chat_info.group_info else None)
|
||||
self.group_name = self.action_message.chat_info.group_info.group_name if self.action_message.chat_info.group_info else None
|
||||
self.group_id = (
|
||||
str(self.action_message.chat_info.group_info.group_id)
|
||||
if self.action_message.chat_info.group_info
|
||||
else None
|
||||
)
|
||||
self.group_name = (
|
||||
self.action_message.chat_info.group_info.group_name
|
||||
if self.action_message.chat_info.group_info
|
||||
else None
|
||||
)
|
||||
|
||||
self.user_id = str(self.action_message.user_info.user_id)
|
||||
self.user_nickname = self.action_message.user_info.user_nickname
|
||||
|
|
|
|||
Loading…
Reference in New Issue