fix: 一些from disct
This commit is contained in:
@@ -65,6 +65,8 @@ class GroupInfo:
|
|||||||
Returns:
|
Returns:
|
||||||
GroupInfo: 新的实例
|
GroupInfo: 新的实例
|
||||||
"""
|
"""
|
||||||
|
if data.get('group_id') is None:
|
||||||
|
return None
|
||||||
return cls(
|
return cls(
|
||||||
platform=data.get('platform'),
|
platform=data.get('platform'),
|
||||||
group_id=data.get('group_id'),
|
group_id=data.get('group_id'),
|
||||||
@@ -129,8 +131,8 @@ class BaseMessageInfo:
|
|||||||
Returns:
|
Returns:
|
||||||
BaseMessageInfo: 新的实例
|
BaseMessageInfo: 新的实例
|
||||||
"""
|
"""
|
||||||
group_info = GroupInfo(**data.get('group_info', {}))
|
group_info = GroupInfo.from_dict(data.get('group_info', {}))
|
||||||
user_info = UserInfo(**data.get('user_info', {}))
|
user_info = UserInfo.from_dict(data.get('user_info', {}))
|
||||||
return cls(
|
return cls(
|
||||||
platform=data.get('platform'),
|
platform=data.get('platform'),
|
||||||
message_id=data.get('message_id'),
|
message_id=data.get('message_id'),
|
||||||
@@ -173,7 +175,7 @@ class MessageBase:
|
|||||||
Returns:
|
Returns:
|
||||||
MessageBase: 新的实例
|
MessageBase: 新的实例
|
||||||
"""
|
"""
|
||||||
message_info = BaseMessageInfo(**data.get('message_info', {}))
|
message_info = BaseMessageInfo.from_dict(data.get('message_info', {}))
|
||||||
message_segment = Seg(**data.get('message_segment', {}))
|
message_segment = Seg(**data.get('message_segment', {}))
|
||||||
raw_message = data.get('raw_message',None)
|
raw_message = data.get('raw_message',None)
|
||||||
return cls(
|
return cls(
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ class MessageRecvCQ(MessageCQ):
|
|||||||
# 调用父类初始化
|
# 调用父类初始化
|
||||||
super().__init__(message_id, user_info, group_info, platform)
|
super().__init__(message_id, user_info, group_info, platform)
|
||||||
|
|
||||||
if group_info.group_name is None:
|
if group_info and group_info.group_name is None:
|
||||||
group_info.group_name = get_groupname(group_info.group_id)
|
group_info.group_name = get_groupname(group_info.group_id)
|
||||||
|
|
||||||
# 解析消息段
|
# 解析消息段
|
||||||
|
|||||||
Reference in New Issue
Block a user