Render official group reminder mentions through Markdown messages

This commit is contained in:
itxiaohui committed 2026-10-05 22:25:55 +08:00
1 parent 88cadbac0b
commit d4a8177acf
8 files changed
+316 -17

No files matched your search

+65 -6
View File
@@ -1,5 +1,6 @@
"""Deliver through the current adapter using a validated incoming reply context."""
import re
import time
from datetime import datetime
from html import escape
@@ -7,6 +8,27 @@ from html import escape
OFFICIAL = {"qq_official", "qq_official_webhook"}
class MentionDeliveryError(RuntimeError):
"""The app cannot send the Markdown format required by this delivery path."""
def markdown_unavailable(exc):
text = str(exc).lower()
return ("markdown" in text or "模板" in text) and any(
token in text
for token in (
"不允许",
"权限",
"无效",
"不合法",
"不存在",
"not allowed",
"permission",
"invalid",
)
)
def proactive_denied(exc):
text = str(exc).lower()
return any(
@@ -100,12 +122,30 @@ def available(platform):
def reminder_text(rem):
creator = rem["creator_name"] or rem["creator_id"]
# AstrBot may use an OpenID as the display-name fallback. Keep IDs out of prose.
creator = rem["creator_name"]
if not creator or creator == rem["creator_id"]:
creator = "群成员" if rem["scene"] in {"group", "channel"} else "用户"
prefix = f"来自 {creator} 的提醒:\n" if rem["target_id"] != rem["creator_id"] else ""
return f"{prefix}⏰ {rem['content']}\n(提醒 #{rem['id']})"
async def deliver(platform, rem, reply=None):
def official_mention(user_id):
"""QQ native mention token; do not replace it with visible @OpenID text."""
return f'<qqbot-at-user id="{escape(str(user_id), quote=True)}" />'
def reminder_markdown(rem):
# Keep the mention outside user-provided text/code blocks. Preserve reminder
# text literally instead of interpreting its punctuation as Markdown syntax.
text = escape(reminder_text(rem), quote=False)
text = re.sub(r"([\\`*_{}\[\]()#+.!|~\-])", r"\\\1", text)
return official_mention(rem["target_id"]) + "\n\n" + text.replace("\n", "\n\n")
async def deliver(
platform, rem, reply=None, *, markdown_template_id="", markdown_parameter="content"
):
"""Official SDK return value must contain a message ID to count as sent."""
client = platform.get_client()
text = reminder_text(rem)
@@ -116,17 +156,36 @@ async def deliver(platform, rem, reply=None):
if scene not in {"group", "c2c"}:
kwargs.pop("msg_seq", None)
if scene == "group":
mention = f'<qqbot-at-user id="{escape(rem["target_id"], quote=True)}" />'
result = await api.post_group_message(
group_openid=rem["destination"], msg_type=0, content=f"{mention}\n{text}", **kwargs
body = reminder_markdown(rem)
markdown = (
{
"custom_template_id": markdown_template_id,
"params": [{"key": markdown_parameter, "values": [body]}],
}
if markdown_template_id
else {"content": body}
)
try:
result = await api.post_group_message(
group_openid=rem["destination"], msg_type=2, markdown=markdown, **kwargs
)
except Exception as exc:
if markdown_unavailable(exc):
raise MentionDeliveryError(
"QQ 拒绝 Markdown @ 消息,请开通原生 Markdown,或配置已获批的 "
"official_markdown_template_id / official_markdown_parameter;"
f"原始错误:{exc}"
) from exc
raise
elif scene == "c2c":
result = await api.post_c2c_message(
openid=rem["destination"], msg_type=0, content=text, **kwargs
)
elif scene == "channel":
result = await api.post_message(
channel_id=rem["destination"], content=f"<@{rem['target_id']}>\n{text}", **kwargs
channel_id=rem["destination"],
content=f"{official_mention(rem['target_id'])}\n{text}",
**kwargs,
)
elif scene == "guild_dm":
result = await api.post_dms(guild_id=rem["destination"], content=text, **kwargs)
+20 -6
View File
@@ -18,20 +18,32 @@ async def resolve_target(event, args, store, scope):
raw_data = field(raw, "raw_data", raw)
mentions = field(raw, "mentions", None) or field(raw_data, "mentions", []) or []
trusted = {}
aliases = {}
official_group = event.get_platform_name() in OFFICIAL and bool(
field(raw, "group_openid") or field(raw_data, "group_openid")
)
for mention in mentions:
user = str(field(mention, "id", None) or field(mention, "member_openid", ""))
generic_id = str(field(mention, "id", "") or "")
member_id = str(field(mention, "member_openid", "") or "")
user = (member_id or generic_id) if official_group else (generic_id or member_id)
if user:
for value in (generic_id, member_id):
if value:
aliases[value] = user
if field(mention, "is_you", False) or field(mention, "bot", False):
bot_ids.add(user)
bot_ids.update({user, generic_id, member_id} - {""})
elif user:
trusted[user] = str(field(mention, "username", "") or "")
for component in event.get_messages():
if field(component, "type") in {"At", "at"} or type(component).__name__ == "At":
user = str(field(component, "qq", ""))
raw_user = str(field(component, "qq", ""))
user = aliases.get(raw_user, raw_user)
if user and user not in bot_ids:
trusted[user] = str(field(component, "name", "") or "")
trusted[user] = trusted.get(user) or str(field(component, "name", "") or "")
candidates = list(trusted)
for match in MARKUP.finditer(args):
user = next(g for g in match.groups() if g is not None)
raw_user = next(g for g in match.groups() if g is not None)
user = aliases.get(raw_user, raw_user)
if user not in bot_ids:
candidates.append(user)
args = MARKUP.sub(" ", args)
@@ -45,7 +57,9 @@ async def resolve_target(event, args, store, scope):
if len(names) > 1:
raise ValueError("被 @ 成员重名,请使用用户标识。")
member = await store.member(scope, value)
candidates.append(names[0] if names else member["user_id"] if member else value)
candidates.append(
names[0] if names else member["user_id"] if member else aliases.get(value, value)
)
args = TEXT_AT.sub(" ", args).strip()
candidates = list(dict.fromkeys(candidates))
if len(candidates) > 1: