mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-10-07 21:00:21 +08:00
✨ feat(auth): 添加群组和机器人唤醒命令支持,优化权限检查逻辑 (#2113)
* ✨ feat(auth): 添加群组和机器人唤醒命令支持,优化权限检查逻辑 ✨ feat(llm): 增加额外请求头配置,改进API适配器请求头处理 * 🚨 auto fix by pre-commit hooks * ``` fix(auth): 优化bot权限验证逻辑并改进错误提示 - 将bot存在性检查与状态检查分离,提供更精确的错误信息 - 修复当bot为None时的状态访问问题 - 移除不必要的注释,保持代码简洁 - 优化日志记录的位置和条件判断 ``` --------- Co-authored-by: ATTomatoo <1126160939@qq.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
co-authored by
ATTomatoo
pre-commit-ci[bot]
parent
65b125dd07
commit
6da4f27b12
@@ -1,3 +1,4 @@
|
||||
import re
|
||||
import time
|
||||
|
||||
from zhenxun.models.group_console import GroupConsole
|
||||
@@ -8,6 +9,25 @@ from zhenxun.services.log import logger
|
||||
from .config import LOGGER_COMMAND, WARNING_THRESHOLD, SwitchEnum
|
||||
from .exception import SkipPluginException
|
||||
|
||||
_GROUP_WAKE_PATTERN = re.compile(r"^醒来$", re.IGNORECASE)
|
||||
_GROUP_WAKE_CANONICAL_PATTERN = re.compile(r"^group-status\s+wake$", re.IGNORECASE)
|
||||
|
||||
|
||||
def _is_group_wake_command(plugin: PluginInfo, text: str) -> bool:
|
||||
if "plugin_switch" not in (plugin.module or ""):
|
||||
return False
|
||||
normalized = re.sub(r"\s+", " ", (text or "").strip())
|
||||
if not normalized:
|
||||
return False
|
||||
if (
|
||||
_GROUP_WAKE_PATTERN.match(normalized) is not None
|
||||
or _GROUP_WAKE_CANONICAL_PATTERN.match(normalized) is not None
|
||||
):
|
||||
return True
|
||||
# 兼容 to_me 前缀场景:如“真寻 醒来”
|
||||
tokens = normalized.split(" ")
|
||||
return len(tokens) == 2 and tokens[-1] == SwitchEnum.ENABLE
|
||||
|
||||
|
||||
async def auth_group(
|
||||
plugin: PluginInfo,
|
||||
@@ -34,7 +54,7 @@ async def auth_group(
|
||||
raise SkipPluginException("群组信息不存在...")
|
||||
if group.level < 0:
|
||||
raise SkipPluginException("群组黑名单, 目标群组群权限权限-1...")
|
||||
if text.strip() != SwitchEnum.ENABLE and not group.status:
|
||||
if not _is_group_wake_command(plugin, text) and not group.status:
|
||||
raise SkipPluginException("群组休眠状态...")
|
||||
if plugin.level > group.level:
|
||||
raise SkipPluginException(
|
||||
|
||||
Reference in New Issue
Block a user