feat: resolve reminder recipients by QQ names and native mentions

This commit is contained in:
itxiaohui committed 2026-10-06 17:12:31 +08:00
1 parent 61ed965d38
commit f89aadb5da
6 files changed
+313 -37

No files matched your search

+87 -15
View File
@@ -7,12 +7,20 @@ from .delivery import OFFICIAL, field
MARKUP = re.compile(
r"<qqbot-at-user\s+id=[\"\']([^\"\']+)[\"\']\s*/>|<@!?([^>]+)>|\[CQ:at,qq=([^,\]]+)[^\]]*\]"
)
TEXT_AT = re.compile(r"(?<![\w@])@([^\s@]+)")
VALID_ID = re.compile(r"[A-Za-z0-9_-]{1,128}\Z")
async def resolve_target(event, args, store, scope):
sender = str(event.get_sender_id())
def member_names(member):
return list(
dict.fromkeys(
str(field(member, key, "") or "").strip()
for key in ("card", "nick", "nickname", "username", "name")
if field(member, key)
)
)
def mention_data(event):
bot_ids = {str(event.message_obj.self_id)}
raw = event.message_obj.raw_message
raw_data = field(raw, "raw_data", raw)
@@ -24,6 +32,8 @@ async def resolve_target(event, args, store, scope):
if raw_data is not raw:
mentions.extend(sdk_mentions)
trusted = {}
names = {}
bot_names = set()
aliases = {}
official_group = event.get_platform_name() in OFFICIAL and bool(
field(raw, "group_openid") or field(raw_data, "group_openid")
@@ -44,8 +54,11 @@ async def resolve_target(event, args, store, scope):
user = aliases.get(user, user)
if field(mention, "is_you", False) or field(mention, "bot", False):
bot_ids.update({user, generic_id, member_id} - {""})
bot_names.update(member_names(mention))
elif user and user not in bot_ids:
trusted[user] = str(field(mention, "username", "") or "") or trusted.get(user, "")
values = member_names(mention)
names.setdefault(user, []).extend(values)
trusted[user] = trusted.get(user) or next(iter(values), "")
trusted = {user: name for user, name in trusted.items() if user not in bot_ids}
# Read only this message's original content, never a quoted message. Some
# adapters normalize away mention tokens from message_str / message components.
@@ -64,6 +77,48 @@ async def resolve_target(event, args, store, scope):
user = aliases.get(raw_user, raw_user)
if user and user not in bot_ids:
trusted[user] = trusted.get(user) or str(field(component, "name", "") or "")
names.setdefault(user, []).extend(member_names(component))
elif user in bot_ids:
bot_names.update(member_names(component))
return trusted, names, aliases, bot_ids, bot_names, payload_mentions, sdk_mentions
async def observe_members(event, store, scope):
"""Learn names only from the sender and native mentions supplied by QQ."""
trusted, names, *_ = mention_data(event)
raw = event.message_obj.raw_message
raw_data = field(raw, "raw_data", raw)
sender = str(event.get_sender_id())
sender_names = []
for source in (raw_data, raw):
sender_names.extend(member_names(field(source, "member", {})))
sender_names.extend(member_names(field(source, "sender", {})))
sender_names.extend(member_names(field(source, "author", {})))
display = str(event.get_sender_name() or "")
if display and display != sender:
sender_names.append(display)
rows = [(user, name, names.get(user, [])) for user, name in trusted.items() if user != sender]
rows.append((sender, next(iter(sender_names), ""), sender_names))
await store.observe_members(scope, rows)
def text_mentions(names):
# Longest known name first supports spaces in nicknames without consuming
# reminder text after a shorter name. Quoted names work before registration.
known = "|".join(re.escape(n) for n in sorted(set(names), key=len, reverse=True) if n)
pattern = re.compile(
r'(?<![\w@])@(?:"([^"\n]+)"|“([^”\n]+)”|'
+ (rf"({known})(?=\s|$)|" if known else "")
+ r"([^\s@]+))"
)
return pattern
async def resolve_target(event, args, store, scope):
sender = str(event.get_sender_id())
trusted, names, aliases, bot_ids, bot_names, payload_mentions, sdk_mentions = mention_data(
event
)
candidates = list(trusted)
for match in MARKUP.finditer(args):
raw_user = next(g for g in match.groups() if g is not None)
@@ -71,20 +126,37 @@ async def resolve_target(event, args, store, scope):
if user not in bot_ids:
candidates.append(user)
args = MARKUP.sub(" ", args)
textual = list(TEXT_AT.finditer(args))
known_names = await store.member_names(scope)
pattern = text_mentions(
known_names + [n for values in names.values() for n in values] + list(bot_names)
)
textual = list(pattern.finditer(args))
for match in textual:
value = match.group(1)
value = next(g for g in match.groups() if g is not None)
if value in bot_names or aliases.get(value, value) in bot_ids:
continue
# @all must not be allowed as a recipient.
if value in {"all", "everyone", "全体成员"}:
raise ValueError("一次提醒只能指定一个成员,不能 @ 全体成员。")
names = [user for user, name in trusted.items() if name and name == value]
if len(names) > 1:
raise ValueError("被 @ 成员重名,请使用用户标识。")
member = await store.member(scope, value)
matching = [user for user in trusted if value in names.get(user, [])]
if len(matching) > 1:
raise ValueError("被 @ 成员重名,请在 QQ 的 @ 群成员列表中只选中一个人。")
# A real QQ selection identifies the member even when cached names collide.
member = None if matching else await store.member(scope, value)
if (
not matching
and not member
and aliases.get(value, value) not in trusted
and event.get_platform_name() in OFFICIAL
):
raise ValueError(
f"还未识别本群成员“{value}”,未创建提醒。请输入 @ 后从 QQ 群成员列表中选中对方;"
"也可以让对方先在本群 @机器人发一条消息,再用 @昵称。无需填写 OpenID。"
)
candidates.append(
names[0] if names else member["user_id"] if member else aliases.get(value, value)
matching[0] if matching else member["user_id"] if member else aliases.get(value, value)
)
args = TEXT_AT.sub(" ", args).strip()
args = pattern.sub(" ", args).strip()
candidates = list(dict.fromkeys(candidates))
if not candidates:
unknown = [
@@ -110,7 +182,7 @@ async def resolve_target(event, args, store, scope):
if unknown or (not payload_mentions and sdk_unknown and len(sdk_mentions) > 1):
raise ValueError(
"收到 @ 成员信息,但无法识别提醒对象,未创建提醒。"
"请重新真实 @ 对方,或让对方先 /tx identity 后使用 @本群用户标识。"
"请输入 @ 后从 QQ 群成员列表中选中对方,或让对方先 @机器人发一条消息再用 @昵称。"
)
if len(candidates) > 1:
raise ValueError("一次提醒只能指定一个成员。")
@@ -124,8 +196,8 @@ async def resolve_target(event, args, store, scope):
if event.get_platform_name() in OFFICIAL:
if target not in trusted and not member:
raise ValueError(
"无法确认该用户的本群 OpenID。请真实 @ 对方;若官方未提供成员标识,"
"让对方先在本群 @ 机器人发送 /tx identity,再用 @用户标识。普通 QQ 号不能转换成 OpenID。"
"无法识别本群提醒对象,未创建提醒。请输入 @ 后从 QQ 群成员列表中选中对方,"
"或让对方先 @机器人发一条消息再用 @昵称。无需填写 OpenID。"
)
elif event.get_platform_name() == "aiocqhttp":
try: