From b74b5933b85b96813aa9c2bfb7d285348ae18d34 Mon Sep 17 00:00:00 2001 From: left666 <2868322078@qq.com> Date: Thu, 27 Mar 2025 10:30:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(core):=20=E5=9C=A8=20MessageChain=20?= =?UTF-8?q?=E7=B1=BB=E4=B8=AD=E6=B7=BB=E5=8A=A0=20at=20=E5=92=8C=20at=5Fal?= =?UTF-8?q?l=20=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 at 方法,用于添加 At 消息到消息链中 - 新增 at_all 方法,用于添加 AtAll 消息到消息链中 --- astrbot/core/message/message_event_result.py | 28 ++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/astrbot/core/message/message_event_result.py b/astrbot/core/message/message_event_result.py index 4cc7fb842..9ecb09b56 100644 --- a/astrbot/core/message/message_event_result.py +++ b/astrbot/core/message/message_event_result.py @@ -1,8 +1,8 @@ import enum -from typing import List, Optional +from typing import List, Optional, Union from dataclasses import dataclass, field -from astrbot.core.message.components import BaseMessageComponent, Plain, Image +from astrbot.core.message.components import BaseMessageComponent, Plain, Image, At, AtAll from typing_extensions import deprecated @@ -31,6 +31,30 @@ class MessageChain: self.chain.append(Plain(message)) return self + def at(self, name: str, qq: Union[str, int]): + """添加一条 At 消息到消息链 `chain` 中。 + + Example: + + CommandResult().at("张三", "12345678910") + # 输出 @张三 + + """ + self.chain.append(At(name=name, qq=qq)) + return self + + def at_all(self): + """添加一条 AtAll 消息到消息链 `chain` 中。 + + Example: + + CommandResult().at_all() + # 输出 @所有人 + + """ + self.chain.append(AtAll()) + return self + @deprecated("请使用 message 方法代替。") def error(self, message: str): """添加一条错误消息到消息链 `chain` 中 From 33f86f3bde3e8022a19dd8556c5be3c7bf2207b8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 27 Mar 2025 02:56:55 +0000 Subject: [PATCH 2/2] :balloon: auto fixes by pre-commit hooks --- astrbot/core/message/message_event_result.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/astrbot/core/message/message_event_result.py b/astrbot/core/message/message_event_result.py index 9ecb09b56..dcbd73d0f 100644 --- a/astrbot/core/message/message_event_result.py +++ b/astrbot/core/message/message_event_result.py @@ -2,7 +2,13 @@ import enum from typing import List, Optional, Union from dataclasses import dataclass, field -from astrbot.core.message.components import BaseMessageComponent, Plain, Image, At, AtAll +from astrbot.core.message.components import ( + BaseMessageComponent, + Plain, + Image, + At, + AtAll, +) from typing_extensions import deprecated