feat:允许command设置展示名称,而非指令原文,添加处理器超时,NormalChat转换清理
This commit is contained in:
@@ -29,7 +29,6 @@ urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
|
||||
class Message(MessageBase):
|
||||
chat_stream: "ChatStream" = None
|
||||
reply: Optional["Message"] = None
|
||||
detailed_plain_text: str = ""
|
||||
processed_plain_text: str = ""
|
||||
memorized_times: int = 0
|
||||
|
||||
@@ -275,6 +274,7 @@ class MessageSending(MessageProcessBase):
|
||||
bot_user_info: UserInfo,
|
||||
sender_info: UserInfo | None, # 用来记录发送者信息,用于私聊回复
|
||||
message_segment: Seg,
|
||||
display_message: str = "",
|
||||
reply: Optional["MessageRecv"] = None,
|
||||
is_head: bool = False,
|
||||
is_emoji: bool = False,
|
||||
@@ -298,10 +298,11 @@ class MessageSending(MessageProcessBase):
|
||||
self.is_emoji = is_emoji
|
||||
self.apply_set_reply_logic = apply_set_reply_logic
|
||||
|
||||
# 用于显示发送内容与显示不一致的情况
|
||||
self.display_message = display_message
|
||||
|
||||
def set_reply(self, reply: Optional["MessageRecv"] = None):
|
||||
"""设置回复消息"""
|
||||
# print(f"set_reply: {reply}")
|
||||
# if self.message_info.format_info is not None and "reply" in self.message_info.format_info.accept_format:
|
||||
if True:
|
||||
if reply:
|
||||
self.reply = reply
|
||||
@@ -319,7 +320,6 @@ class MessageSending(MessageProcessBase):
|
||||
"""处理消息内容,生成纯文本和详细文本"""
|
||||
if self.message_segment:
|
||||
self.processed_plain_text = await self._process_message_segments(self.message_segment)
|
||||
self.detailed_plain_text = self._generate_detailed_text()
|
||||
|
||||
@classmethod
|
||||
def from_thinking(
|
||||
|
||||
@@ -24,11 +24,14 @@ class MessageStorage:
|
||||
else:
|
||||
filtered_processed_plain_text = ""
|
||||
|
||||
detailed_plain_text = message.detailed_plain_text
|
||||
if detailed_plain_text:
|
||||
filtered_detailed_plain_text = re.sub(pattern, "", detailed_plain_text, flags=re.DOTALL)
|
||||
if isinstance(message,MessageSending):
|
||||
display_message = message.display_message
|
||||
if display_message:
|
||||
filtered_display_message = re.sub(pattern, "", display_message, flags=re.DOTALL)
|
||||
else:
|
||||
filtered_display_message = ""
|
||||
else:
|
||||
filtered_detailed_plain_text = ""
|
||||
filtered_display_message = ""
|
||||
|
||||
chat_info_dict = chat_stream.to_dict()
|
||||
user_info_dict = message.message_info.user_info.to_dict()
|
||||
@@ -64,7 +67,7 @@ class MessageStorage:
|
||||
user_cardname=user_info_dict.get("user_cardname"),
|
||||
# Text content
|
||||
processed_plain_text=filtered_processed_plain_text,
|
||||
detailed_plain_text=filtered_detailed_plain_text,
|
||||
display_message=filtered_display_message,
|
||||
memorized_times=message.memorized_times,
|
||||
)
|
||||
except Exception:
|
||||
|
||||
Reference in New Issue
Block a user