Preserve explicit recipients from original QQ mentions through reminder creation
This commit is contained in:
1 parent
d4a8177acf
commit
61ed965d38
5 files changed
+217
-10
No files matched your search
+57
-7
@@ -16,24 +16,48 @@ async def resolve_target(event, args, store, scope):
|
||||
bot_ids = {str(event.message_obj.self_id)}
|
||||
raw = event.message_obj.raw_message
|
||||
raw_data = field(raw, "raw_data", raw)
|
||||
mentions = field(raw, "mentions", None) or field(raw_data, "mentions", []) or []
|
||||
# botpy may expose a nonempty mentions list whose objects have lost id,
|
||||
# is_you or username. It must not hide the adapter's original QQ payload.
|
||||
payload_mentions = field(raw_data, "mentions", []) or []
|
||||
sdk_mentions = field(raw, "mentions", []) or []
|
||||
mentions = list(payload_mentions)
|
||||
if raw_data is not raw:
|
||||
mentions.extend(sdk_mentions)
|
||||
trusted = {}
|
||||
aliases = {}
|
||||
official_group = event.get_platform_name() in OFFICIAL and bool(
|
||||
field(raw, "group_openid") or field(raw_data, "group_openid")
|
||||
)
|
||||
# Learn alias mappings from complete raw records before processing SDK objects.
|
||||
for mention in mentions:
|
||||
generic_id = str(field(mention, "id", "") or "")
|
||||
member_id = str(field(mention, "member_openid", "") or "")
|
||||
canonical = (member_id or generic_id) if official_group else (generic_id or member_id)
|
||||
if canonical:
|
||||
for value in (generic_id, member_id):
|
||||
if value:
|
||||
aliases.setdefault(value, canonical)
|
||||
for mention in mentions:
|
||||
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
|
||||
user = aliases.get(user, user)
|
||||
if field(mention, "is_you", False) or field(mention, "bot", False):
|
||||
bot_ids.update({user, generic_id, member_id} - {""})
|
||||
elif user:
|
||||
trusted[user] = str(field(mention, "username", "") or "")
|
||||
elif user and user not in bot_ids:
|
||||
trusted[user] = str(field(mention, "username", "") or "") or trusted.get(user, "")
|
||||
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.
|
||||
if event.get_platform_name() in OFFICIAL:
|
||||
content = field(raw_data, "content", None) or field(raw, "content", "") or ""
|
||||
for match in MARKUP.finditer(str(content)):
|
||||
if not match.group(0).startswith("<"):
|
||||
continue
|
||||
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 and VALID_ID.fullmatch(user):
|
||||
trusted.setdefault(user, "")
|
||||
for component in event.get_messages():
|
||||
if field(component, "type") in {"At", "at"} or type(component).__name__ == "At":
|
||||
raw_user = str(field(component, "qq", ""))
|
||||
@@ -62,6 +86,32 @@ async def resolve_target(event, args, store, scope):
|
||||
)
|
||||
args = TEXT_AT.sub(" ", args).strip()
|
||||
candidates = list(dict.fromkeys(candidates))
|
||||
if not candidates:
|
||||
unknown = [
|
||||
mention
|
||||
for mention in payload_mentions
|
||||
if not (
|
||||
field(mention, "id")
|
||||
or field(mention, "member_openid")
|
||||
or field(mention, "is_you", False)
|
||||
or field(mention, "bot", False)
|
||||
)
|
||||
]
|
||||
sdk_unknown = [
|
||||
mention
|
||||
for mention in sdk_mentions
|
||||
if not (
|
||||
field(mention, "id")
|
||||
or field(mention, "member_openid")
|
||||
or field(mention, "is_you", False)
|
||||
or field(mention, "bot", False)
|
||||
)
|
||||
]
|
||||
if unknown or (not payload_mentions and sdk_unknown and len(sdk_mentions) > 1):
|
||||
raise ValueError(
|
||||
"收到 @ 成员信息,但无法识别提醒对象,未创建提醒。"
|
||||
"请重新真实 @ 对方,或让对方先 /tx identity 后使用 @本群用户标识。"
|
||||
)
|
||||
if len(candidates) > 1:
|
||||
raise ValueError("一次提醒只能指定一个成员。")
|
||||
target = candidates[0] if candidates else sender
|
||||
|
||||
Reference in new issue
Block a user