nonebot-plugin-lingchu-bot 0.8.0.dev1__tar.gz → 0.9.0.dev1__tar.gz

{nonebot_plugin_lingchu_bot-0.8.0.dev1 → nonebot_plugin_lingchu_bot-0.9.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-lingchu-bot
-Version: 0.8.0.dev1
+Version: 0.9.0.dev1
 Summary: 由NoneBot2驱动，面向多平台的管理机器人
 Keywords: nonebot2,nonebot,bot,cross-platform,group-management
 Author: xinvxueyuan

{nonebot_plugin_lingchu_bot-0.8.0.dev1 → nonebot_plugin_lingchu_bot-0.9.0.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-lingchu-bot"
-version = "0.8.0.dev1"
+version = "0.9.0.dev1"
 description = "由NoneBot2驱动，面向多平台的管理机器人"
 keywords = [
     "nonebot2",
@@ -578,5 +578,5 @@ include-group = "lint"
 include-group = "git"
 
 [build-system]
-requires = ["uv_build>=0.11.8,<0.13"]
+requires = ["uv_build>=0.11.8,<0.14"]
 build-backend = "uv_build"

{nonebot_plugin_lingchu_bot-0.8.0.dev1 → nonebot_plugin_lingchu_bot-0.9.0.dev1}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-lingchu-bot"
-version = "0.8.0.dev1"
+version = "0.9.0.dev1"
 # dynamic = ["version"]
 description = "由NoneBot2驱动，面向多平台的管理机器人"
 keywords = ["nonebot2", "nonebot", "bot", "cross-platform", "group-management"]
@@ -591,7 +591,7 @@ exclude_lines = [
 
 # TODO: add build system configuration
 [build-system]
-requires = ["uv_build>=0.11.8,<0.13"]
+requires = ["uv_build>=0.11.8,<0.14"]
 build-backend = "uv_build"
 
 

{nonebot_plugin_lingchu_bot-0.8.0.dev1 → nonebot_plugin_lingchu_bot-0.9.0.dev1}/src/plugins/_lingchu_bot_contracts/runtime_settings.py

@@ -76,6 +76,7 @@ class DeploymentSettings:
             "global_block_member",
             "member_mute",
             "recall_message",
+            "remote_recall",
             "set_member_card",
             "set_member_title",
             "set_member_admin",

{nonebot_plugin_lingchu_bot-0.8.0.dev1 → nonebot_plugin_lingchu_bot-0.9.0.dev1}/src/plugins/nonebot_plugin_lingchu_bot/__init__.py

@@ -20,6 +20,8 @@ __plugin_meta__ = PluginMetadata(
         "常用命令：\n"
         "- 禁言 @用户 [时长] [原因] / mute @user [duration] [reason]\n"
         "- 撤回 [@用户] [数量] / recall [@user] [count]\n"
+        "- 远程撤回 <群号或群名称> [@用户] [数量] / "
+        "remote-recall <group> [@user] [count]\n"
         "- 远程禁言 <群号或群名称> @用户 [时长] / "
         "remote-mute <group> @user [duration]\n"
         "- 闭嘴 / 说话 (silence / speak)\n"
@@ -45,6 +47,20 @@ __plugin_meta__ = PluginMetadata(
             }
             for profile in iter_platform_profiles()
         ),
+        # ── 信息插件（命令「功能」）读的帮助元数据 ──
+        "menu_type": "管理",
+        "order": 5,
+        "commands": [
+            {"command": "菜单", "desc": "功能菜单"},
+            {"command": "禁言 / 解禁", "desc": "群内禁言与解除（含全员/一键解禁）"},
+            {"command": "撤回", "desc": "撤回消息（支持批量）"},
+            {"command": "远程撤回", "desc": "跨群撤回 <群号或群名> [@用户] [数量]"},
+            {"command": "踢出 / 拉黑 / 拉白", "desc": "成员管理（含全局/远程变体）"},
+            {"command": "设置群名称 / 发送群公告", "desc": "群资料与公告"},
+            {"command": "远程禁言", "desc": "跨群禁言 <群号或群名> @用户"},
+            {"command": "闭嘴 / 说话", "desc": "机器人全局静默 / 恢复"},
+            {"command": "开机 / 关机", "desc": "启用 / 停用机器人"},
+        ],
     },
 )
 

{nonebot_plugin_lingchu_bot-0.8.0.dev1 → nonebot_plugin_lingchu_bot-0.9.0.dev1}/src/plugins/nonebot_plugin_lingchu_bot/core/config.py

@@ -123,7 +123,7 @@ class Config(DeploymentSettings):
 
     """
 
-    core_version: str = "0.8.0.dev1"
+    core_version: str = "0.9.0.dev1"
     data_dir: Path = field(default_factory=get_plugin_data_dir)
     config_dir: Path = field(default_factory=get_plugin_config_dir)
     cache_dir: Path = field(default_factory=get_plugin_cache_dir)

{nonebot_plugin_lingchu_bot-0.8.0.dev1 → nonebot_plugin_lingchu_bot-0.9.0.dev1}/src/plugins/nonebot_plugin_lingchu_bot/core/handle_config_defaults/__init__.py

@@ -45,6 +45,7 @@ HANDLE_DEFAULTS_REGISTRY: dict[str, HandleDefaultsFactory] = {
         "block_duration": None,
         "default_reason": "违反群规",
     }),
+    "remote_recall": lambda: _config({"default_count": 10}),
     "remote_announcement": _config,
     "mass_announcement": _config,
     "restart_protocol_endpoint": lambda: _config({"default_platform": "当前平台"}),

{nonebot_plugin_lingchu_bot-0.8.0.dev1 → nonebot_plugin_lingchu_bot-0.9.0.dev1}/src/plugins/nonebot_plugin_lingchu_bot/core/handle_default_values.py

@@ -93,6 +93,7 @@ HANDLE_DEFAULT_DEFINITIONS: Final[tuple[HandleDefaultDefinition, ...]] = (
     HandleDefaultDefinition("block_member", "default_reason", _parse_text),
     HandleDefaultDefinition("remote_block", "block_duration", _parse_optional_duration),
     HandleDefaultDefinition("remote_block", "default_reason", _parse_text),
+    HandleDefaultDefinition("remote_recall", "default_count", _parse_positive_count),
     HandleDefaultDefinition("recall_message", "default_count", _parse_positive_count),
     HandleDefaultDefinition("protect_member", "whitelist_scope", _parse_scope),
     HandleDefaultDefinition("protect_member", "default_reason", _parse_text),

{nonebot_plugin_lingchu_bot-0.8.0.dev1 → nonebot_plugin_lingchu_bot-0.9.0.dev1}/src/plugins/nonebot_plugin_lingchu_bot/handle/menu.py

@@ -526,6 +526,18 @@ _BASE_MENU_FEATURES: Final[tuple[MenuFeature, ...]] = (
         PlatformCapability.ANNOUNCEMENT,
         (*_ONEBOT_ANNOUNCEMENT,),
     ),
+    MenuFeature(
+        "remote-recall",
+        "remote_recall",
+        "remote-management",
+        LocalizedText("远程撤回", "Remote recall"),
+        LocalizedText(
+            "<群号|群名称> [@用户] [数量]",
+            "<group_id|group_name> [@user] [count]",
+        ),
+        PlatformCapability.MEMBER_MODERATION,
+        (MenuAvailability(QQ_PLATFORM_ID, ONEBOT_V11_ADAPTER_ID),),
+    ),
     MenuFeature(
         "bot-silence",
         "bot_silence",

{nonebot_plugin_lingchu_bot-0.8.0.dev1 → nonebot_plugin_lingchu_bot-0.9.0.dev1}/src/plugins/nonebot_plugin_lingchu_bot/handle/qq/adapters/onebot11/default/mute.py

@@ -456,8 +456,12 @@ async def _is_recall_protected_target(
     bot: OneBot11Bot,
     event: OneBot11GroupMessageEvent,
     target_user_id: int,
+    *,
+    group_id: int | None = None,
 ) -> bool:
-    if "recall_message" not in plugin_config.protected_subject_feature_keys:
+    effective_group_id = event.group_id if group_id is None else group_id
+    feature_keys = set(plugin_config.protected_subject_feature_keys)
+    if not ({"recall_message", "remote_recall"} & feature_keys):
         return False
     protected = await find_active_subject_policy(
         session,
@@ -465,7 +469,7 @@ async def _is_recall_protected_target(
         platform_id="qq",
         adapter_id="~onebot.v11",
         bot_id=bot_id(bot),
-        group_id=event.group_id,
+        group_id=effective_group_id,
         user_id=target_user_id,
     )
     return protected is not None
@@ -478,12 +482,14 @@ async def _can_recall_sender(
     sender_id: int,
     *,
     sender_decisions: dict[int, bool] | None = None,
+    group_id: int | None = None,
 ) -> bool:
     """Return True when messages from sender_id may be recalled.
 
     Fail closed: when the sender's role cannot be verified (API failure),
     skip the recall instead of potentially recalling an admin/owner message.
     """
+    effective_group_id = event.group_id if group_id is None else group_id
     if sender_id == event.user_id:
         return False
     bot_self = bot_self_id_safe(bot)
@@ -491,7 +497,9 @@ async def _can_recall_sender(
         return False
     if sender_decisions is not None and sender_id in sender_decisions:
         return sender_decisions[sender_id]
-    decision = await _evaluate_recall_sender(session, bot, event, sender_id)
+    decision = await _evaluate_recall_sender(
+        session, bot, event, sender_id, group_id=effective_group_id
+    )
     if sender_decisions is not None:
         sender_decisions[sender_id] = decision
     return decision
@@ -502,24 +510,29 @@ async def _evaluate_recall_sender(
     bot: OneBot11Bot,
     event: OneBot11GroupMessageEvent,
     sender_id: int,
+    *,
+    group_id: int | None = None,
 ) -> bool:
-    if await _is_recall_protected_target(session, bot, event, sender_id):
+    effective_group_id = event.group_id if group_id is None else group_id
+    if await _is_recall_protected_target(
+        session, bot, event, sender_id, group_id=effective_group_id
+    ):
         return False
     try:
         member_info = await bot.get_group_member_info(
-            group_id=event.group_id,
+            group_id=effective_group_id,
             user_id=sender_id,
             no_cache=True,
         )
     except OneBot11ActionFailed:
         logger.warning(
-            f"无法确认发送者角色，跳过撤回: group_id={event.group_id}, "
+            f"无法确认发送者角色，跳过撤回: group_id={effective_group_id}, "
             f"sender_id={sender_id}"
         )
         return False
     except OneBot11NetworkError as e:
         logger.warning(
-            f"查询发送者角色网络异常，跳过撤回: group_id={event.group_id}, "
+            f"查询发送者角色网络异常，跳过撤回: group_id={effective_group_id}, "
             f"sender_id={sender_id}, error={e!r}"
         )
         return False
@@ -585,7 +598,9 @@ async def _list_recall_candidate_records(
     *,
     target_user_id: int | None,
     recall_count: int,
+    group_id: int | None = None,
 ) -> list[Any]:
+    effective_group_id = event.group_id if group_id is None else group_id
     fetch_limit = _candidate_fetch_limit(recall_count)
     common_filters: dict[str, Any] = {
         "platform_id": "qq",
@@ -601,13 +616,13 @@ async def _list_recall_candidate_records(
     group_records = await message_repository.list_recent_messages(
         session,
         **common_filters,
-        conversation_id=str(event.group_id),
+        conversation_id=str(effective_group_id),
         limit=fetch_limit,
     )
     return await _merge_recall_candidates(
         broad_records,
         group_records,
-        group_id=event.group_id,
+        group_id=effective_group_id,
     )
 
 
@@ -616,10 +631,13 @@ async def _resolve_recall_args(
     count: int | None,
     bot: OneBot11Bot,
     event: OneBot11GroupMessageEvent,
+    *,
+    default_count: int | None = None,
 ) -> tuple[int | None, str | None, int]:
-    # 读取配置中的默认撤回数量
-    config = await get_handle_config_manager().get_config("recall_message")
-    default_count = config.defaults.get("default_count", 10)
+    # 未显式指定时，读取配置中的默认撤回数量
+    if default_count is None:
+        config = await get_handle_config_manager().get_config("recall_message")
+        default_count = int(config.defaults.get("default_count", 10))
 
     if isinstance(target, At):
         target_user_id, target_name = await resolve_user_onebot11(target, bot, event)
@@ -652,14 +670,16 @@ async def _recall_record_message(
     trigger_message_id: str,
     target_user_id: int | None,
     sender_decisions: dict[int, bool],
+    group_id: int | None = None,
 ) -> str:
+    effective_group_id = event.group_id if group_id is None else group_id
     message_id = _message_id_int(getattr(record, "message_id", None))
     if message_id is None or str(message_id) == trigger_message_id:
         return "skipped"
     message = await _verified_recall_message(
         bot,
         message_id=message_id,
-        group_id=event.group_id,
+        group_id=effective_group_id,
         target_user_id=target_user_id,
     )
     if message is None:
@@ -668,7 +688,12 @@ async def _recall_record_message(
     if sender_id is None:
         sender_id = _message_id_int(getattr(record, "user_id", None))
     if sender_id is None or not await _can_recall_sender(
-        session, bot, event, sender_id, sender_decisions=sender_decisions
+        session,
+        bot,
+        event,
+        sender_id,
+        sender_decisions=sender_decisions,
+        group_id=effective_group_id,
     ):
         return "skipped"
     try:
@@ -690,7 +715,9 @@ async def _recall_records(
     *,
     target_user_id: int | None,
     recall_count: int,
+    group_id: int | None = None,
 ) -> RecallResult:
+    effective_group_id = event.group_id if group_id is None else group_id
     result = RecallResult()
     trigger_message_id = str(getattr(event, "message_id", ""))
     sender_decisions: dict[int, bool] = {}
@@ -705,6 +732,7 @@ async def _recall_records(
             trigger_message_id=trigger_message_id,
             target_user_id=target_user_id,
             sender_decisions=sender_decisions,
+            group_id=effective_group_id,
         )
         if status == "recalled":
             result.recalled += 1

{nonebot_plugin_lingchu_bot-0.8.0.dev1 → nonebot_plugin_lingchu_bot-0.9.0.dev1}/src/plugins/nonebot_plugin_lingchu_bot/handle/qq/adapters/onebot11/default/remote.py

@@ -30,6 +30,7 @@ from ....commands.remote import (
     remote_block_cmd,
     remote_kick_cmd,
     remote_mute_cmd,
+    remote_recall_cmd,
     remote_unblock_cmd,
     remote_unmute_cmd,
     remote_whole_mute_cmd,
@@ -54,6 +55,12 @@ from .common import (
     resolve_user_onebot11,
     store_block_record,
 )
+from .mute import (
+    RECALL_COUNT_MAX,
+    _list_recall_candidate_records,
+    _recall_records,
+    _resolve_recall_args,
+)
 
 _MASS_TARGET_SEPARATOR = re.compile(r"[,，、;；]")
 _MASS_ALL_TARGETS = frozenset({"全部群", "所有群", "all", "*"})
@@ -547,6 +554,109 @@ async def onebot11_remote_whole_unmute(
     )
 
 
+@selected_adapter_handle(remote_recall_cmd, "~onebot.v11", "remote_recall")
+async def onebot11_remote_recall(
+    group_id: int | str,
+    bot: OneBot11Bot,
+    event: OneBot11GroupMessageEvent,
+    session: async_scoped_session,
+    target: At | int | None = None,
+    count: int | None = None,
+) -> Any:
+    """远程撤回处理器：在 <群> 撤回最近消息（可选 @用户 / 数量）。"""
+    config = await get_handle_config_manager().get_config("remote_recall")
+    if not config.enabled:
+        return await remote_recall_cmd.finish(await _("该功能已禁用"))
+    default_count = int(config.defaults.get("default_count", 10))
+
+    resolved_group_id = await _resolve_group_id(bot, group_id, remote_recall_cmd)
+    if resolved_group_id is None:
+        return None
+    group_id_int = resolved_group_id
+
+    if not await _validate_remote_context(bot, group_id_int, remote_recall_cmd):
+        return None
+
+    try:
+        target_user_id, target_name, recall_count = await _resolve_recall_args(
+            target, count, bot, event, default_count=default_count
+        )
+    except ValueError as e:
+        # 目标不在当前群时 @ 解析会失败 —— 但「远程」场景下目标本来就可能不在本群：
+        # 退化为「只用 QQ 号」继续（撤回的是 ta 在目标群里的消息）。
+        if isinstance(target, At):
+            raw_target = str(target.target)
+            if not raw_target.isdigit():
+                return await remote_recall_cmd.finish(
+                    (await _("不支持的目标: {target}")).format(target=raw_target)
+                )
+            target_user_id, target_name = int(raw_target), None
+            recall_count = count if count is not None else default_count
+        else:
+            logger.warning(f"解析用户失败: {e}")
+            return await remote_recall_cmd.finish(str(e))
+
+    if recall_count < 1:
+        return await remote_recall_cmd.finish(await _("撤回数量不能小于 1 条"))
+    if recall_count > RECALL_COUNT_MAX:
+        return await remote_recall_cmd.finish(
+            (await _("撤回数量不能超过 {max} 条")).format(max=RECALL_COUNT_MAX)
+        )
+
+    records = await _list_recall_candidate_records(
+        session,
+        bot,
+        event,
+        target_user_id=target_user_id,
+        recall_count=recall_count,
+        group_id=group_id_int,
+    )
+    result = await _recall_records(
+        session,
+        bot,
+        event,
+        records,
+        target_user_id=target_user_id,
+        recall_count=recall_count,
+        group_id=group_id_int,
+    )
+
+    record_audit_fire_and_forget(
+        bot,
+        event,
+        CommandAudit(
+            action="remote_recall",
+            target_user_id=target_user_id,
+            reason=(
+                f"group={group_id_int}, count={recall_count}, "
+                f"recalled={result.recalled}, skipped={result.skipped}, "
+                f"failed={result.failed}"
+            ),
+            group_id=group_id_int,
+        ),
+    )
+
+    target_text = ""
+    if target_user_id is not None:
+        target_text = "\n" + (await _("目标: {target}")).format(
+            target=format_user_display_name(target_user_id, target_name)
+        )
+    message = await _(
+        "已远程撤回: \n"
+        "目标群: {group_id}\n"
+        "已撤回 {recalled} 条消息，跳过 {skipped} 条，失败 {failed} 条{target_text}"
+    )
+    return await remote_recall_cmd.finish(
+        message.format(
+            group_id=group_id_int,
+            recalled=result.recalled,
+            skipped=result.skipped,
+            failed=result.failed,
+            target_text=target_text,
+        )
+    )
+
+
 @selected_adapter_handle(remote_kick_cmd, "~onebot.v11", "remote_kick")
 async def onebot11_remote_kick(
     group_id: int | str,

{nonebot_plugin_lingchu_bot-0.8.0.dev1 → nonebot_plugin_lingchu_bot-0.9.0.dev1}/src/plugins/nonebot_plugin_lingchu_bot/handle/qq/commands/remote.py

@@ -18,6 +18,7 @@ _REMOTE_WHOLE_MUTE = COMMAND_TRIGGERS["remote_whole_mute"]
 _REMOTE_WHOLE_UNMUTE = COMMAND_TRIGGERS["remote_whole_unmute"]
 _REMOTE_KICK = COMMAND_TRIGGERS["remote_kick"]
 _REMOTE_BLOCK = COMMAND_TRIGGERS["remote_block"]
+_REMOTE_RECALL = COMMAND_TRIGGERS["remote_recall"]
 _REMOTE_UNBLOCK = COMMAND_TRIGGERS["remote_unblock"]
 _REMOTE_ANNOUNCEMENT = COMMAND_TRIGGERS["remote_announcement"]
 _MASS_ANNOUNCEMENT = COMMAND_TRIGGERS["mass_announcement"]
@@ -89,6 +90,19 @@ remote_kick_cmd: type[AlconnaMatcher] = on_alconna(
     use_cmd_start=True,
 )
 
+# 远程撤回命令
+remote_recall_cmd: type[AlconnaMatcher] = on_alconna(
+    command=Alconna(
+        _REMOTE_RECALL.primary,
+        Args["group_id", (int, str)]["target?", At | int, None]["count?", int, None],
+    ),
+    aliases=_REMOTE_RECALL.aliases,
+    priority=805,
+    block=True,
+    use_cmd_sep=False,
+    use_cmd_start=True,
+)
+
 # 远程拉黑命令
 remote_block_cmd: type[AlconnaMatcher] = on_alconna(
     command=Alconna(

{nonebot_plugin_lingchu_bot-0.8.0.dev1 → nonebot_plugin_lingchu_bot-0.9.0.dev1}/src/plugins/nonebot_plugin_lingchu_bot/handle/qq/commands/triggers.py

@@ -457,6 +457,12 @@ _DEFAULT_COMMAND_TRIGGERS = {
         chinese_aliases=frozenset({"跨群拉黑", "远程拉黑用户"}),
         english_aliases=frozenset({"remote-block-member", "cross-group-block"}),
     ),
+    "remote_recall": CommandTrigger(
+        chinese="远程撤回",
+        english="remote-recall",
+        chinese_aliases=frozenset({"跨群撤回", "远程撤回消息"}),
+        english_aliases=frozenset({"cross-group-recall", "remote-delete-message"}),
+    ),
     "remote_unblock": CommandTrigger(
         chinese="远程删黑",
         english="remote-unblock",