fix: 修改message继承逻辑,修复回复消息无法识别
This commit is contained in:
@@ -50,6 +50,7 @@ class ChatBot:
|
|||||||
# sender_info = await bot.get_group_member_info(group_id=event.group_id, user_id=event.user_id, no_cache=True)
|
# sender_info = await bot.get_group_member_info(group_id=event.group_id, user_id=event.user_id, no_cache=True)
|
||||||
|
|
||||||
# 白名单设定由nontbot侧完成
|
# 白名单设定由nontbot侧完成
|
||||||
|
# 消息过滤,涉及到config有待更新
|
||||||
if event.group_id:
|
if event.group_id:
|
||||||
if event.group_id not in global_config.talk_allowed_groups:
|
if event.group_id not in global_config.talk_allowed_groups:
|
||||||
return
|
return
|
||||||
@@ -68,7 +69,6 @@ class ChatBot:
|
|||||||
group_name=None,
|
group_name=None,
|
||||||
platform='qq'
|
platform='qq'
|
||||||
)
|
)
|
||||||
|
|
||||||
message_cq=MessageRecvCQ(
|
message_cq=MessageRecvCQ(
|
||||||
message_id=event.message_id,
|
message_id=event.message_id,
|
||||||
user_info=user_info,
|
user_info=user_info,
|
||||||
@@ -86,7 +86,7 @@ class ChatBot:
|
|||||||
userinfo=message.message_info.user_info
|
userinfo=message.message_info.user_info
|
||||||
messageinfo=message.message_info
|
messageinfo=message.message_info
|
||||||
|
|
||||||
# 消息过滤,涉及到config有待更新
|
|
||||||
|
|
||||||
chat = await chat_manager.get_or_create_stream(platform=messageinfo.platform, user_info=userinfo, group_info=groupinfo)
|
chat = await chat_manager.get_or_create_stream(platform=messageinfo.platform, user_info=userinfo, group_info=groupinfo)
|
||||||
message.update_chat_stream(chat)
|
message.update_chat_stream(chat)
|
||||||
|
|||||||
@@ -231,7 +231,8 @@ class CQCode:
|
|||||||
group_info=group_info,
|
group_info=group_info,
|
||||||
)
|
)
|
||||||
content_seg = Seg(
|
content_seg = Seg(
|
||||||
type="seglist", data=message_obj.message_segment )
|
type="seglist", data=[message_obj.message_segment]
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
content_seg = Seg(type="text", data="[空消息]")
|
content_seg = Seg(type="text", data="[空消息]")
|
||||||
else:
|
else:
|
||||||
@@ -256,7 +257,7 @@ class CQCode:
|
|||||||
group_info=group_info,
|
group_info=group_info,
|
||||||
)
|
)
|
||||||
content_seg = Seg(
|
content_seg = Seg(
|
||||||
type="seglist", data=message_obj.message_segment
|
type="seglist", data=[message_obj.message_segment]
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
content_seg = Seg(type="text", data="[空消息]")
|
content_seg = Seg(type="text", data="[空消息]")
|
||||||
@@ -281,11 +282,12 @@ class CQCode:
|
|||||||
if self.reply_message.sender.user_id:
|
if self.reply_message.sender.user_id:
|
||||||
|
|
||||||
message_obj = MessageRecvCQ(
|
message_obj = MessageRecvCQ(
|
||||||
user_info=UserInfo(user_id=self.reply_message.sender.user_id,user_nickname=self.reply_message.sender.get("nickname",None)),
|
user_info=UserInfo(user_id=self.reply_message.sender.user_id,user_nickname=self.reply_message.sender.nickname),
|
||||||
message_id=self.reply_message.message_id,
|
message_id=self.reply_message.message_id,
|
||||||
raw_message=str(self.reply_message.message),
|
raw_message=str(self.reply_message.message),
|
||||||
group_info=GroupInfo(group_id=self.reply_message.group_id),
|
group_info=GroupInfo(group_id=self.reply_message.group_id),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
segments = []
|
segments = []
|
||||||
if message_obj.message_info.user_info.user_id == global_config.BOT_QQ:
|
if message_obj.message_info.user_info.user_id == global_config.BOT_QQ:
|
||||||
@@ -302,7 +304,7 @@ class CQCode:
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
segments.append(Seg(type="seglist", data=message_obj.message_segment))
|
segments.append(Seg(type="seglist", data=[message_obj.message_segment]))
|
||||||
segments.append(Seg(type="text", data="]"))
|
segments.append(Seg(type="text", data="]"))
|
||||||
return segments
|
return segments
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -14,9 +14,52 @@ urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
|
|||||||
#这个类是消息数据类,用于存储和管理消息数据。
|
#这个类是消息数据类,用于存储和管理消息数据。
|
||||||
#它定义了消息的属性,包括群组ID、用户ID、消息ID、原始消息内容、纯文本内容和时间戳。
|
#它定义了消息的属性,包括群组ID、用户ID、消息ID、原始消息内容、纯文本内容和时间戳。
|
||||||
#它还定义了两个辅助属性:keywords用于提取消息的关键词,is_plain_text用于判断消息是否为纯文本。
|
#它还定义了两个辅助属性:keywords用于提取消息的关键词,is_plain_text用于判断消息是否为纯文本。
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class MessageRecv(MessageBase):
|
class Message(MessageBase):
|
||||||
|
chat_stream: ChatStream=None
|
||||||
|
reply: Optional['Message'] = None
|
||||||
|
detailed_plain_text: str = ""
|
||||||
|
processed_plain_text: str = ""
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
message_id: str,
|
||||||
|
time: int,
|
||||||
|
chat_stream: ChatStream,
|
||||||
|
user_info: UserInfo,
|
||||||
|
message_segment: Optional[Seg] = None,
|
||||||
|
reply: Optional['MessageRecv'] = None,
|
||||||
|
detailed_plain_text: str = "",
|
||||||
|
processed_plain_text: str = "",
|
||||||
|
):
|
||||||
|
# 构造基础消息信息
|
||||||
|
message_info = BaseMessageInfo(
|
||||||
|
platform=chat_stream.platform,
|
||||||
|
message_id=message_id,
|
||||||
|
time=time,
|
||||||
|
group_info=chat_stream.group_info,
|
||||||
|
user_info=user_info
|
||||||
|
)
|
||||||
|
|
||||||
|
# 调用父类初始化
|
||||||
|
super().__init__(
|
||||||
|
message_info=message_info,
|
||||||
|
message_segment=message_segment,
|
||||||
|
raw_message=None
|
||||||
|
)
|
||||||
|
|
||||||
|
self.chat_stream = chat_stream
|
||||||
|
# 文本处理相关属性
|
||||||
|
self.processed_plain_text = detailed_plain_text
|
||||||
|
self.detailed_plain_text = processed_plain_text
|
||||||
|
|
||||||
|
# 回复消息
|
||||||
|
self.reply = reply
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class MessageRecv(Message):
|
||||||
"""接收消息类,用于处理从MessageCQ序列化的消息"""
|
"""接收消息类,用于处理从MessageCQ序列化的消息"""
|
||||||
|
|
||||||
def __init__(self, message_dict: Dict):
|
def __init__(self, message_dict: Dict):
|
||||||
@@ -25,20 +68,16 @@ class MessageRecv(MessageBase):
|
|||||||
Args:
|
Args:
|
||||||
message_dict: MessageCQ序列化后的字典
|
message_dict: MessageCQ序列化后的字典
|
||||||
"""
|
"""
|
||||||
message_info = BaseMessageInfo.from_dict(message_dict.get('message_info', {}))
|
self.message_info = BaseMessageInfo.from_dict(message_dict.get('message_info', {}))
|
||||||
message_segment = Seg.from_dict(message_dict.get('message_segment', {}))
|
self.message_segment = Seg.from_dict(message_dict.get('message_segment', {}))
|
||||||
raw_message = message_dict.get('raw_message')
|
self.raw_message = message_dict.get('raw_message')
|
||||||
|
|
||||||
super().__init__(
|
|
||||||
message_info=message_info,
|
|
||||||
message_segment=message_segment,
|
|
||||||
raw_message=raw_message
|
|
||||||
)
|
|
||||||
|
|
||||||
# 处理消息内容
|
# 处理消息内容
|
||||||
self.processed_plain_text = "" # 初始化为空字符串
|
self.processed_plain_text = "" # 初始化为空字符串
|
||||||
self.detailed_plain_text = "" # 初始化为空字符串
|
self.detailed_plain_text = "" # 初始化为空字符串
|
||||||
self.is_emoji=False
|
self.is_emoji=False
|
||||||
|
|
||||||
|
|
||||||
def update_chat_stream(self,chat_stream:ChatStream):
|
def update_chat_stream(self,chat_stream:ChatStream):
|
||||||
self.chat_stream=chat_stream
|
self.chat_stream=chat_stream
|
||||||
|
|
||||||
@@ -110,48 +149,6 @@ class MessageRecv(MessageBase):
|
|||||||
)
|
)
|
||||||
return f"[{time_str}] {name}: {self.processed_plain_text}\n"
|
return f"[{time_str}] {name}: {self.processed_plain_text}\n"
|
||||||
|
|
||||||
@dataclass
|
|
||||||
class Message(MessageBase):
|
|
||||||
chat_stream: ChatStream=None
|
|
||||||
reply: Optional['Message'] = None
|
|
||||||
detailed_plain_text: str = ""
|
|
||||||
processed_plain_text: str = ""
|
|
||||||
|
|
||||||
def __init__(
|
|
||||||
self,
|
|
||||||
message_id: str,
|
|
||||||
time: int,
|
|
||||||
chat_stream: ChatStream,
|
|
||||||
user_info: UserInfo,
|
|
||||||
message_segment: Optional[Seg] = None,
|
|
||||||
reply: Optional['MessageRecv'] = None,
|
|
||||||
detailed_plain_text: str = "",
|
|
||||||
processed_plain_text: str = "",
|
|
||||||
):
|
|
||||||
# 构造基础消息信息
|
|
||||||
message_info = BaseMessageInfo(
|
|
||||||
platform=chat_stream.platform,
|
|
||||||
message_id=message_id,
|
|
||||||
time=time,
|
|
||||||
group_info=chat_stream.group_info,
|
|
||||||
user_info=user_info
|
|
||||||
)
|
|
||||||
|
|
||||||
# 调用父类初始化
|
|
||||||
super().__init__(
|
|
||||||
message_info=message_info,
|
|
||||||
message_segment=message_segment,
|
|
||||||
raw_message=None
|
|
||||||
)
|
|
||||||
|
|
||||||
self.chat_stream = chat_stream
|
|
||||||
# 文本处理相关属性
|
|
||||||
self.processed_plain_text = detailed_plain_text
|
|
||||||
self.detailed_plain_text = processed_plain_text
|
|
||||||
|
|
||||||
# 回复消息
|
|
||||||
self.reply = reply
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class MessageProcessBase(Message):
|
class MessageProcessBase(Message):
|
||||||
|
|||||||
Reference in New Issue
Block a user