feat(command): 添加监听范围过滤和回复 @控制

- 新增 COMMAND_SCOPE 配置,支持 all/group/private 过滤消息来源
- 新增 COMMAND_ALLOWED_GROUPS 群号白名单,逗号分隔,留空不限制
- 新增 COMMAND_ALLOWED_USERS QQ 号白名单,逗号分隔,留空不限制
- 新增 COMMAND_AT_SENDER 配置,控制回复时是否 @发送者(默认 true)
- 回调响应中 at_sender 字段可覆盖全局配置
- 更新 .env.example 和 README.md 文档
This commit is contained in:
2026-05-03 00:01:10 +08:00
parent 84f671741b
commit ed6e27f162
5 changed files with 98 additions and 17 deletions

View File

@@ -7,7 +7,20 @@ import os
from aiohttp import web
from ncatbot.plugin import NcatBotPlugin
from .config import COMMAND_CALLBACK_URL, COMMAND_LENGTH_MAX, COMMAND_LENGTH_MIN, COMMAND_PREFIX, HOST, PORT, UPLOAD_DIR, WEBHOOK_API_KEY
from .config import (
COMMAND_ALLOWED_GROUPS,
COMMAND_ALLOWED_USERS,
COMMAND_AT_SENDER,
COMMAND_CALLBACK_URL,
COMMAND_LENGTH_MAX,
COMMAND_LENGTH_MIN,
COMMAND_PREFIX,
COMMAND_SCOPE,
HOST,
PORT,
UPLOAD_DIR,
WEBHOOK_API_KEY,
)
from .handlers.command import parse_command, send_command_callback
from .handlers.health import health_handler
from .handlers.message import webhook_handler
@@ -31,9 +44,18 @@ class WebHookPlugin(NcatBotPlugin):
async def on_load(self):
self.logger.info("Webhook 插件已加载")
self.logger.info("WEBHOOK_API_KEY: %s", "已配置" if os.environ.get("WEBHOOK_API_KEY") else "自动生成")
self.logger.info("命令监听: 前缀=%s 长度=%d~%d 回调=%s", COMMAND_PREFIX, COMMAND_LENGTH_MIN, COMMAND_LENGTH_MAX,
COMMAND_CALLBACK_URL or "未配置")
self.logger.info(
"WEBHOOK_API_KEY: %s",
"已配置" if os.environ.get("WEBHOOK_API_KEY") else "自动生成",
)
self.logger.info(
"命令监听: 前缀=%s 长度=%d~%d 范围=%s 回调=%s",
COMMAND_PREFIX,
COMMAND_LENGTH_MIN,
COMMAND_LENGTH_MAX,
COMMAND_SCOPE,
COMMAND_CALLBACK_URL or "未配置",
)
asyncio.create_task(self._start_webhook())
self._cleanup_task = asyncio.create_task(self._cleanup_loop())
self._listener_task = asyncio.create_task(self._message_listener())
@@ -77,6 +99,23 @@ class WebHookPlugin(NcatBotPlugin):
parsed = parse_command(raw_message)
if not parsed:
continue
# 范围过滤group / private / all
is_group = hasattr(event.data, "group_id")
if COMMAND_SCOPE == "group" and not is_group:
continue
if COMMAND_SCOPE == "private" and is_group:
continue
# 群白名单过滤
if COMMAND_ALLOWED_GROUPS and is_group:
if event.data.group_id not in COMMAND_ALLOWED_GROUPS:
continue
# 用户白名单过滤
if COMMAND_ALLOWED_USERS and event.data.user_id not in COMMAND_ALLOWED_USERS:
continue
# 构建回调数据
data = {
"command": parsed["command"],
@@ -89,7 +128,9 @@ class WebHookPlugin(NcatBotPlugin):
data["group_id"] = event.data.group_id
self.logger.info(
"命令监听匹配: command=%s user=%s group=%s",
parsed["command"], data["user_id"], data.get("group_id", "-"),
parsed["command"],
data["user_id"],
data.get("group_id", "-"),
)
asyncio.create_task(
send_command_callback(data, event, self.api, self.logger)