refactor(request_handler): 提取审批回复文本解析

Author: TogetsuDo

src/plugins/request_handler/__init__.py

@@ -29,6 +29,10 @@
 from src.features.cmd_perm.metadata_text import SCENE_GROUP, SCENE_PRIVATE, join_usage, usage_line
 from src.foundation.config import BotConfig, GroupConfig, UserConfig, get_bot_admins, user_is_bot_admin
 from src.foundation.paths import plugin_data_dir
+from src.plugins.request_handler.approval_reply_text import (
+    classify_approval_reply_text,
+    extract_approval_reply_text_from_body,
+)
 from src.plugins.request_handler.config import Config
 from src.plugins.request_handler.texts import (
     APPROVE_ALL_FRIENDS_COMMAND,
@@ -540,18 +544,6 @@ def clear_quick_approve_state(bot_key: str, kind: str, target_id: str) -> None:
 if _approval_notice_dirty:
     save_json(APPROVAL_NOTICE_FILE, approval_notice_map)
 
-# 引用审批通知时允许的正文（小写比较）；空字符串表示仅引用不打字（视为同意）
-_APPROVE_REPLY_TEXT = frozenset({"", "同意", "好", "yes", "y", "ok"})
-_REJECT_REPLY_TEXT = frozenset({"拒绝", "不要", "否", "no", "n"})
-
-
-def classify_approval_reply_text(text: str) -> str | None:
-    if text in _APPROVE_REPLY_TEXT:
-        return "approve"
-    if text in _REJECT_REPLY_TEXT:
-        return "reject"
-    return None
-
 
 def rows_from_doubt_friends_api(result: object) -> list[dict]:
     if isinstance(result, list):
@@ -898,7 +890,10 @@ async def handle_approval_reply(bot: Bot, event: PrivateMessageEvent):
     meta = approval_notice_map.get(bot_key, {}).get(mid)
     if not meta:
         return
-    text = event.get_plaintext().strip().lower()
+    quoted_body = None
+    if event.reply and event.reply.message is not None:
+        quoted_body = event.reply.message.extract_plain_text()
+    text = extract_approval_reply_text_from_body(event.get_plaintext() or "", quoted_body)
     action = classify_approval_reply_text(text)
     if action is None:
         await approval_reply_cmd.finish("引用审批消息后，正文须为：同意 / 好 / 留空，或 拒绝 / 不要 / 否。")

src/plugins/request_handler/approval_reply_text.py

@@ -0,0 +1,33 @@
+from __future__ import annotations
+
+_INVISIBLE_CHARS = ("\u200b", "\u200c", "\u200d", "\ufeff", "\u2060")
+
+_APPROVE_REPLY_TEXT = frozenset({"同意", "好", "yes", "y", "ok", "留空"})
+_REJECT_REPLY_TEXT = frozenset({"拒绝", "不要", "否", "no", "n"})
+
+
+def normalize_approval_reply_text(text: str) -> str:
+    for ch in _INVISIBLE_CHARS:
+        text = text.replace(ch, "")
+    return text.strip().lower()
+
+
+def extract_approval_reply_text_from_body(body: str, quoted_body: str | None) -> str:
+    normalized = normalize_approval_reply_text(body)
+    if quoted_body is None:
+        return normalized
+    quoted = normalize_approval_reply_text(quoted_body)
+    if normalized == quoted:
+        return ""
+    return normalized
+
+
+def classify_approval_reply_text(text: str) -> str | None:
+    normalized = normalize_approval_reply_text(text)
+    if not normalized:
+        return "approve"
+    if normalized in _APPROVE_REPLY_TEXT:
+        return "approve"
+    if normalized in _REJECT_REPLY_TEXT:
+        return "reject"
+    return None

tests/plugins/request_handler/test_approval_reply_text.py

@@ -0,0 +1,38 @@
+from src.plugins.request_handler.approval_reply_text import (
+    classify_approval_reply_text,
+    extract_approval_reply_text_from_body,
+)
+
+
+def test_empty_body_classifies_as_approve() -> None:
+    assert classify_approval_reply_text("") == "approve"
+    assert classify_approval_reply_text("   ") == "approve"
+    assert classify_approval_reply_text("\u200b") == "approve"
+
+
+def test_explicit_approve_and_reject_keywords() -> None:
+    assert classify_approval_reply_text("同意") == "approve"
+    assert classify_approval_reply_text("好") == "approve"
+    assert classify_approval_reply_text("OK") == "approve"
+    assert classify_approval_reply_text("留空") == "approve"
+    assert classify_approval_reply_text("拒绝") == "reject"
+    assert classify_approval_reply_text("NO") == "reject"
+
+
+def test_unknown_body_is_not_classified() -> None:
+    assert classify_approval_reply_text("随便") is None
+
+
+def test_quote_only_reply_body_matches_quoted_notice() -> None:
+    quoted = (
+        "[好友申请]\n申请人：测试（123456）\n"
+        "验证：-\n帮助：牛牛帮助 申请管理"
+    )
+    assert extract_approval_reply_text_from_body(quoted, quoted) == ""
+    assert classify_approval_reply_text(extract_approval_reply_text_from_body(quoted, quoted)) == "approve"
+
+
+def test_user_command_after_quote_is_preserved() -> None:
+    quoted = "[好友申请]\n申请人：测试（123456）"
+    assert extract_approval_reply_text_from_body("同意", quoted) == "同意"
+    assert classify_approval_reply_text(extract_approval_reply_text_from_body("同意", quoted)) == "approve"