Add registered nickname recipients for QQ events without mentions
This commit is contained in:
1 parent
9c5b87772f
commit
800f267b66
9 files changed
+396
-42
No files matched your search
@@ -4,9 +4,9 @@ import hashlib
|
||||
import json
|
||||
|
||||
from .delivery import field
|
||||
from .targets import MARKUP, mention_data, resolve_target
|
||||
from .targets import MARKUP, mention_data, named_recipient, resolve_target
|
||||
|
||||
VERSION = "v1.3.1"
|
||||
VERSION = "v1.4.0"
|
||||
|
||||
|
||||
def identity(value):
|
||||
@@ -72,7 +72,13 @@ async def diagnose(event, args, store, scope):
|
||||
"原始author": member(field(data, "author", {})),
|
||||
}
|
||||
try:
|
||||
_, target, name = await resolve_target(event, args, store, scope)
|
||||
parts = args.split(maxsplit=1)
|
||||
first = parts[0] if parts else ""
|
||||
tail = parts[1] if len(parts) == 2 else ""
|
||||
explicit_name = None
|
||||
if first in {"to", "给", "提醒他人"}:
|
||||
explicit_name, args = named_recipient(tail)
|
||||
_, target, name = await resolve_target(event, args, store, scope, explicit_name)
|
||||
report["解析结果"] = {
|
||||
"对象": identity(target),
|
||||
"名字": name,
|
||||
|
||||
+41
-4
@@ -69,6 +69,10 @@ class ReminderStore:
|
||||
PRIMARY KEY(scope, user_id, name)
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS member_names_lookup ON member_names(scope, name);
|
||||
CREATE TABLE IF NOT EXISTS member_aliases (
|
||||
scope TEXT NOT NULL, user_id TEXT NOT NULL, name TEXT NOT NULL,
|
||||
PRIMARY KEY(scope, user_id), UNIQUE(scope, name)
|
||||
);
|
||||
INSERT OR IGNORE INTO member_names
|
||||
SELECT scope,user_id,nickname FROM members WHERE nickname!='';
|
||||
CREATE TABLE IF NOT EXISTS reply_contexts (
|
||||
@@ -217,7 +221,9 @@ class ReminderStore:
|
||||
lambda db: [
|
||||
r[0]
|
||||
for r in db.execute(
|
||||
"SELECT DISTINCT name FROM member_names WHERE scope=?", (scope,)
|
||||
"SELECT name FROM member_names WHERE scope=? UNION "
|
||||
"SELECT name FROM member_aliases WHERE scope=?",
|
||||
(scope, scope),
|
||||
)
|
||||
]
|
||||
)
|
||||
@@ -227,18 +233,49 @@ class ReminderStore:
|
||||
rows = db.execute(
|
||||
"SELECT DISTINCT m.* FROM members m LEFT JOIN member_names n "
|
||||
"ON m.scope=n.scope AND m.user_id=n.user_id "
|
||||
"WHERE m.scope=? AND (m.user_id=? OR n.name=?)",
|
||||
(scope, value, value),
|
||||
"LEFT JOIN member_aliases a ON m.scope=a.scope AND m.user_id=a.user_id "
|
||||
"WHERE m.scope=? AND (m.user_id=? OR n.name=? OR a.name=?)",
|
||||
(scope, value, value, value),
|
||||
).fetchall()
|
||||
exact = [r for r in rows if r["user_id"] == value]
|
||||
if exact:
|
||||
return dict(exact[0])
|
||||
if len(rows) > 1:
|
||||
raise ValueError("本群有重名用户,请在 QQ 的 @ 群成员列表中选中对方后发送。")
|
||||
raise ValueError(
|
||||
"本群有重名用户,请让成员 /tx name 登记不同提醒昵称,或使用平台能识别的真实 @。"
|
||||
)
|
||||
return dict(rows[0]) if rows else None
|
||||
|
||||
return await self._run(read)
|
||||
|
||||
async def register_name(self, scope, user_id, name):
|
||||
def write(db):
|
||||
db.execute("BEGIN IMMEDIATE")
|
||||
occupied = db.execute(
|
||||
"SELECT user_id FROM member_names WHERE scope=? AND name=? UNION "
|
||||
"SELECT user_id FROM member_aliases WHERE scope=? AND name=? UNION "
|
||||
"SELECT user_id FROM members WHERE scope=? AND user_id=?",
|
||||
(scope, name, scope, name, scope, name),
|
||||
).fetchall()
|
||||
if any(row[0] != user_id for row in occupied):
|
||||
raise ValueError("该名字已经对应本群其他成员,请选择一个唯一的提醒昵称。")
|
||||
db.execute(
|
||||
"INSERT INTO member_aliases VALUES (?,?,?) "
|
||||
"ON CONFLICT(scope,user_id) DO UPDATE SET name=excluded.name",
|
||||
(scope, user_id, name),
|
||||
)
|
||||
|
||||
await self._run(write)
|
||||
|
||||
async def registered_name(self, scope, user_id):
|
||||
def read(db):
|
||||
row = db.execute(
|
||||
"SELECT name FROM member_aliases WHERE scope=? AND user_id=?", (scope, user_id)
|
||||
).fetchone()
|
||||
return row["name"] if row else ""
|
||||
|
||||
return await self._run(read)
|
||||
|
||||
async def add(self, record, limit):
|
||||
def insert(db):
|
||||
db.execute("BEGIN IMMEDIATE")
|
||||
|
||||
+62
-11
@@ -8,6 +8,47 @@ MARKUP = re.compile(
|
||||
r"<qqbot-at-user\s+id=[\"\']([^\"\']+)[\"\']\s*/>|<@!?([^>]+)>|\[CQ:at,qq=([^,\]]+)[^\]]*\]"
|
||||
)
|
||||
VALID_ID = re.compile(r"[A-Za-z0-9_-]{1,128}\Z")
|
||||
COMMAND = re.compile(r"(?:^|\s)/?(?:tx|提醒|remind)(?=\s|$)", re.I)
|
||||
|
||||
|
||||
def message_text(event):
|
||||
"""Prefer the original command when AstrBot has removed a textual mention."""
|
||||
if event.get_platform_name() in OFFICIAL:
|
||||
raw = event.message_obj.raw_message
|
||||
data = field(raw, "raw_data", raw)
|
||||
content = field(data, "content") or field(raw, "content", "") or ""
|
||||
if isinstance(content, str) and COMMAND.search(content):
|
||||
return content
|
||||
return event.message_str
|
||||
|
||||
|
||||
def command_args(event):
|
||||
text = message_text(event)
|
||||
_, _, _, bot_ids, *_ = mention_data(event)
|
||||
text = MARKUP.sub(
|
||||
lambda m: " " if next(g for g in m.groups() if g is not None) in bot_ids else m.group(0),
|
||||
text,
|
||||
)
|
||||
command = COMMAND.search(text)
|
||||
return text[command.end() :].strip() if command else ""
|
||||
|
||||
|
||||
def named_recipient(text):
|
||||
match = re.fullmatch(r'(?:"([^"\n]+)"|“([^”\n]+)”|(\S+))\s+(.+)', text, re.S)
|
||||
if not match:
|
||||
raise ValueError('用法:/tx to xh 1分钟 测试;名字带空格用 /tx to "小 明" 1分钟 测试。')
|
||||
return next(g for g in match.groups()[:3] if g is not None), match.group(4).strip()
|
||||
|
||||
|
||||
def registration_name(text):
|
||||
name = text.strip()
|
||||
if len(name) >= 2 and (name[0], name[-1]) in {('"', '"'), ("“", "”")}:
|
||||
name = name[1:-1].strip()
|
||||
if not name or len(name) > 64 or any(ord(c) < 32 or c in "@@<>[]" for c in name):
|
||||
raise ValueError("提醒昵称需要 1–64 个字符,不要加 @ 或填入 @ 标签。")
|
||||
if name in {"all", "everyone", "全体成员"}:
|
||||
raise ValueError("不能使用全体成员作为提醒昵称。")
|
||||
return name
|
||||
|
||||
|
||||
def member_names(member):
|
||||
@@ -114,7 +155,7 @@ def text_mentions(names):
|
||||
return pattern
|
||||
|
||||
|
||||
async def resolve_target(event, args, store, scope):
|
||||
async def resolve_target(event, args, store, scope, explicit_name=None):
|
||||
sender = str(event.get_sender_id())
|
||||
trusted, names, aliases, bot_ids, bot_names, payload_mentions, sdk_mentions = mention_data(
|
||||
event
|
||||
@@ -133,13 +174,19 @@ async def resolve_target(event, args, store, scope):
|
||||
textual = list(pattern.finditer(args))
|
||||
# A QQ mention can precede the command. Without native mention metadata,
|
||||
# tx()'s argument slicing previously discarded this explicit recipient.
|
||||
command = re.search(r"(?:^|\s)/?(?:tx|提醒|remind)(?=\s|$)", event.message_str, re.I)
|
||||
text = message_text(event)
|
||||
command = COMMAND.search(text)
|
||||
if command:
|
||||
prefix = MARKUP.sub(" ", event.message_str[: command.start()])
|
||||
prefix = MARKUP.sub(" ", text[: command.start()])
|
||||
textual.extend(pattern.finditer(prefix))
|
||||
for match in textual:
|
||||
value = next(g for g in match.groups() if g is not None)
|
||||
values = [next(g for g in match.groups() if g is not None) for match in textual]
|
||||
if explicit_name is not None:
|
||||
values.append(explicit_name)
|
||||
selected_name = ""
|
||||
for value in values:
|
||||
if value in bot_names or aliases.get(value, value) in bot_ids:
|
||||
if value == explicit_name:
|
||||
raise ValueError("提醒对象不能是机器人,请填写本群成员的提醒昵称。")
|
||||
continue
|
||||
# @all must not be allowed as a recipient.
|
||||
if value in {"all", "everyone", "全体成员"}:
|
||||
@@ -155,13 +202,17 @@ async def resolve_target(event, args, store, scope):
|
||||
and aliases.get(value, value) not in trusted
|
||||
and event.get_platform_name() in OFFICIAL
|
||||
):
|
||||
quoted = f'"{value}"' if any(c.isspace() for c in value) else value
|
||||
raise ValueError(
|
||||
f"还未识别本群成员“{value}”,未创建提醒。请输入 @ 后从 QQ 群成员列表中选中对方;"
|
||||
"也可以让对方先在本群 @机器人发一条消息,再用 @昵称。无需填写 OpenID。"
|
||||
f"还未识别本群成员“{value}”,未创建提醒。"
|
||||
f"QQ 没有提供这个名字对应的成员 ID。请让对方在本群发送 @机器人 /tx name {quoted} "
|
||||
f"登记自己,然后使用 /tx to {quoted} 1分钟 测试。无需复制 ID。"
|
||||
)
|
||||
candidates.append(
|
||||
matching[0] if matching else member["user_id"] if member else aliases.get(value, value)
|
||||
)
|
||||
if member and value != member["user_id"]:
|
||||
selected_name = value
|
||||
args = pattern.sub(" ", args).strip()
|
||||
candidates = list(dict.fromkeys(candidates))
|
||||
if not candidates:
|
||||
@@ -188,7 +239,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(
|
||||
"收到 @ 成员信息,但无法识别提醒对象,未创建提醒。"
|
||||
"请输入 @ 后从 QQ 群成员列表中选中对方,或让对方先 @机器人发一条消息再用 @昵称。"
|
||||
"QQ 没有提供完整成员标识。可让对方 /tx name 昵称 登记自己,再 /tx to 昵称 时间 内容。"
|
||||
)
|
||||
if len(candidates) > 1:
|
||||
raise ValueError("一次提醒只能指定一个成员。")
|
||||
@@ -202,8 +253,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(
|
||||
"无法识别本群提醒对象,未创建提醒。请输入 @ 后从 QQ 群成员列表中选中对方,"
|
||||
"或让对方先 @机器人发一条消息再用 @昵称。无需填写 OpenID。"
|
||||
"无法识别本群提醒对象,未创建提醒。请让对方 /tx name 昵称 登记自己,"
|
||||
"再使用 /tx to 昵称 时间 内容。无需复制 ID。"
|
||||
)
|
||||
elif event.get_platform_name() == "aiocqhttp":
|
||||
try:
|
||||
@@ -212,7 +263,7 @@ async def resolve_target(event, args, store, scope):
|
||||
)
|
||||
except Exception as exc:
|
||||
raise ValueError("无法在本群找到该成员,请重新 @ 群成员。") from exc
|
||||
name = trusted.get(target) or (member["nickname"] if member else "")
|
||||
name = selected_name or trusted.get(target) or (member["nickname"] if member else "")
|
||||
if target == sender:
|
||||
name = event.get_sender_name() or ""
|
||||
return args, target, name
|
||||
Reference in new issue
Block a user