mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-09-29 00:32:06 +08:00
* 添加测试插件 * ✨ feat(auth): 添加缓存机制以优化用户和插件数据查询性能 * 🗑️ chore(help): 删除笨蛋检测插件代码 * ✨ feat(bot): 添加对扩展插件的加载支持 * ✨ feat(auth): 优化权限检查和缓存机制,增加用户和插件数据的并行查询 * ✨ feat(cache): 引入运行时缓存机制,优化用户和插件的ban记录管理 * ✨ feat(auth): 更新is_ban函数文档,添加参数和返回值说明 * ``` feat(auth): 使用内存缓存优化权限验证性能 - 移除数据库查询超时控制,改用 LevelUserMemoryCache、BotMemoryCache 和 PluginLimitMemoryCache 进行缓存查询 - 优化 auth_admin、auth_bot、auth_limit 权限验证逻辑,提升响应速度 - 添加 background 参数支持异步发送权限不足提示消息 - 移除 asyncio 依赖,简化代码结构 fix(auth): 修复限制通知频率控制问题 - 实现限制通知冷却机制,避免重复发送相同限制消息 - 添加 AUTH_LIMIT_NOTICE_CD 配置项,默认值为 2 秒 - 使用 FreqLimiter 控制限制通知发送频率 refactor(models): 增强模型数据变更时的缓存同步 - 在 BotConsole、GroupConsole、LevelUser、PluginLimit 模型的 create、update_or_create、save、delete 方法中自动更新对应缓存 - 确保数据库和内存缓存数据一致性 docs(ban_console): 修正文档注释并优化日志信息 - 修正 BanConsole 类中方法的文档字符串,使用标准参数和返回值格式 - 优化调试日志信息,使描述更加清晰准确 ``` * ✨ feat(auth): 更新Limit类以支持PluginLimitSnapshot,优化限制信息处理 * ✨ feat(bot_manage): 优化Bot控制台初始化逻辑,处理IntegrityError异常 * ✨ feat(mmm1): 新增消息推送功能,支持私聊和群聊事件处理 * ✨ feat(group_member_update): 优化群组成员更新逻辑,增加活动跟踪和消息记录功能 * ✨ feat(mmm1): 删除冗余的消息推送功能代码 * ✨ feat(auth): 优化权限检查逻辑,增加模块阻止功能和缓存处理 * ✨ feat(auth): 优化权限检查逻辑,增加快速ban检测和前置检查功能 * ✨ feat(chat_history): 增强消息处理规则,添加时间间隔限制以防止重复消息 ✨ feat(data_source): 引入异步获取群成员信息的功能,优化用户信息更新逻辑 * ✨ feat(send_queue): 添加异步发送队列以优化API调用和速率限制 * ✨ feat(auth): 添加缓存就绪检查以优化权限处理逻辑 * ✨ feat(plugins): 移除不必要的插件加载以简化插件管理 * ✨ feat(group_console): 优化群组获取逻辑,添加缓存检查以提升性能 ✨ 只接收缓存完成之后时间的消息 * ✨ feat(auth): 添加异步任务管理和超载检测,优化权限处理逻辑 ✨ feat(chat_history): 修改规则函数为异步,提升消息处理效率 ✨ feat(group_handle): 增加安全获取群组信息的异步方法,添加超时处理 ✨ feat(record_request): 引入安全获取群组信息的异步方法,优化群邀请处理 ✨ feat(ban_memory_cache): 增强禁言内存缓存,添加负缓存机制 ✨ feat(message_load): 新增消息负载检测功能,优化任务调度 ✨ feat(scheduler): 在调度器中集成消息压力检测,优化任务执行 ✨ feat(send_queue): 引入异步任务管理,优化发送队列处理 * ✨ feat(auth): 添加对 LevelUserSnapshot 和 BotSnapshot 的支持,优化权限检查逻辑 ✨ 格式化 * ✨ feat(db_context): 增强 get_or_create 方法,处理并发创建冲突并回退查询已存在记录 * ✨ feat(bot_manage): 增强 init_bot_console 方法,处理并发创建冲突并回退查询已存在的 bot 数据 * 🚨 auto fix by pre-commit hooks * ✨ feat(runtime_cache): 优化消息处理逻辑,支持 bytes 和 bytearray 类型的联合判断 * ✨ style(runtime_cache): 格式化代码,优化多行表达式的可读性 * 🚨 auto fix by pre-commit hooks * ✨ refactor: 优化类型注解,改进群组成员更新逻辑和平台处理 ✨ 格式化 * 🚨 auto fix by pre-commit hooks * ✨ refactor: 优化代码格式,增强可读性并修复类型注解 * 🚨 auto fix by pre-commit hooks * ✨ refactor: 更新文档注释,增强is_ban函数的可读性 * ✨ refactor: 优化代码结构,移除冗余函数,增强可读性并改进任务调度逻辑 * ✨ refactor: 调整定时任务时间,优化渲染服务的初始化逻辑,增强代码可读性 --------- Co-authored-by: ATTomatoo <1126160939@qq.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
216 lines
6.4 KiB
Python
216 lines
6.4 KiB
Python
import time
|
||
from typing import ClassVar
|
||
from typing_extensions import Self
|
||
|
||
from tortoise import fields
|
||
|
||
from zhenxun.services.cache.runtime_cache import BanMemoryCache
|
||
from zhenxun.services.data_access import DataAccess
|
||
from zhenxun.services.db_context import Model
|
||
from zhenxun.services.log import logger
|
||
from zhenxun.utils.enum import CacheType, DbLockType
|
||
from zhenxun.utils.exception import UserAndGroupIsNone
|
||
|
||
|
||
class BanConsole(Model):
|
||
id = fields.IntField(pk=True, generated=True, auto_increment=True)
|
||
"""自增id"""
|
||
user_id = fields.CharField(255, null=True)
|
||
"""用户id"""
|
||
group_id = fields.CharField(255, null=True)
|
||
"""群组id"""
|
||
ban_level = fields.IntField()
|
||
"""使用ban命令的用户等级"""
|
||
ban_time = fields.BigIntField()
|
||
"""ban开始的时间"""
|
||
ban_reason = fields.TextField(null=True, default=None)
|
||
"""ban的理由"""
|
||
duration = fields.BigIntField()
|
||
"""ban时长"""
|
||
operator = fields.CharField(255)
|
||
"""使用Ban命令的用户"""
|
||
|
||
class Meta: # pyright: ignore [reportIncompatibleVariableOverride]
|
||
table = "ban_console"
|
||
table_description = "封禁人员/群组数据表"
|
||
unique_together = ("user_id", "group_id")
|
||
indexes = [("user_id",), ("group_id",)] # noqa: RUF012
|
||
|
||
cache_type = CacheType.BAN
|
||
"""缓存类型"""
|
||
cache_key_field = ("user_id", "group_id")
|
||
"""缓存键字段"""
|
||
enable_lock: ClassVar[list[DbLockType]] = [DbLockType.CREATE, DbLockType.UPSERT]
|
||
"""开启锁"""
|
||
|
||
@classmethod
|
||
async def create(cls, *args, **kwargs) -> Self:
|
||
result = await super().create(*args, **kwargs)
|
||
await BanMemoryCache.upsert_from_model(result)
|
||
return result
|
||
|
||
async def delete(self, *args, **kwargs):
|
||
user_id = self.user_id
|
||
group_id = self.group_id
|
||
await super().delete(*args, **kwargs)
|
||
await BanMemoryCache.remove(user_id, group_id)
|
||
|
||
@classmethod
|
||
async def _get_data(cls, user_id: str | None, group_id: str | None) -> Self | None:
|
||
"""获取数据
|
||
|
||
参数:
|
||
user_id: 用户id
|
||
group_id: 群组id
|
||
|
||
异常:
|
||
UserAndGroupIsNone: 用户id和群组id都为空
|
||
|
||
返回:
|
||
Self | None: Self
|
||
"""
|
||
if not user_id and not group_id:
|
||
raise UserAndGroupIsNone()
|
||
dao = DataAccess(cls)
|
||
if user_id:
|
||
return (
|
||
await dao.safe_get_or_none(user_id=user_id, group_id=group_id)
|
||
if group_id
|
||
else await dao.safe_get_or_none(user_id=user_id, group_id__isnull=True)
|
||
)
|
||
else:
|
||
return await dao.safe_get_or_none(user_id="", group_id=group_id)
|
||
|
||
@classmethod
|
||
async def check_ban_level(
|
||
cls, user_id: str | None, group_id: str | None, level: int
|
||
) -> bool:
|
||
"""检测ban掉目标的用户与unban用户的权限等级大小
|
||
|
||
参数:
|
||
user_id: 用户id
|
||
group_id: 群组id
|
||
level: 权限等级
|
||
|
||
返回:
|
||
bool: 权限判断,能否unban
|
||
"""
|
||
logger.debug("检测用户被ban等级", target=f"{group_id}:{user_id}")
|
||
if not BanMemoryCache.is_loaded():
|
||
return False
|
||
return BanMemoryCache.check_ban_level(user_id, group_id, level)
|
||
|
||
@classmethod
|
||
async def check_ban_time(
|
||
cls, user_id: str | None, group_id: str | None = None
|
||
) -> int:
|
||
"""检测用户被ban时长
|
||
|
||
参数:
|
||
user_id: 用户id
|
||
|
||
返回:
|
||
int: ban剩余时长,-1时为永久ban,0表示未被ban
|
||
"""
|
||
logger.debug("获取用户ban时长", target=f"{group_id}:{user_id}")
|
||
if not BanMemoryCache.is_loaded():
|
||
return 0
|
||
return BanMemoryCache.remaining_time(user_id, group_id)
|
||
|
||
@classmethod
|
||
async def is_ban(cls, user_id: str | None, group_id: str | None = None) -> bool:
|
||
"""判断用户是否被ban
|
||
|
||
参数:
|
||
user_id: 用户id
|
||
|
||
返回:
|
||
bool: 是否被ban
|
||
"""
|
||
logger.debug("检测是否被ban", target=f"{group_id}:{user_id}")
|
||
return (await cls.check_ban_time(user_id, group_id)) != 0
|
||
|
||
@classmethod
|
||
async def ban(
|
||
cls,
|
||
user_id: str | None,
|
||
group_id: str | None,
|
||
ban_level: int,
|
||
reason: str | None,
|
||
duration: int,
|
||
operator: str | None = None,
|
||
):
|
||
"""ban掉目标用户
|
||
|
||
参数:
|
||
user_id: 用户id
|
||
group_id: 群组id
|
||
ban_level: 使用命令者的权限等级
|
||
duration: 时长,分钟,-1时为永久
|
||
operator: 操作者id
|
||
"""
|
||
logger.debug(
|
||
f"封禁用户/群组,等级:{ban_level},时长: {duration}",
|
||
target=f"{group_id}:{user_id}",
|
||
)
|
||
target = await cls._get_data(user_id, group_id)
|
||
if target:
|
||
await cls.unban(user_id, group_id)
|
||
await cls.create(
|
||
user_id=user_id,
|
||
group_id=group_id,
|
||
ban_level=ban_level,
|
||
ban_time=int(time.time()),
|
||
ban_reason=reason,
|
||
duration=duration,
|
||
operator=operator or 0,
|
||
)
|
||
|
||
@classmethod
|
||
async def unban(cls, user_id: str | None, group_id: str | None = None) -> bool:
|
||
"""unban用户
|
||
|
||
参数:
|
||
user_id: 用户id
|
||
group_id: 群组id
|
||
|
||
返回:
|
||
bool: 是否被ban
|
||
"""
|
||
user = await cls._get_data(user_id, group_id)
|
||
if user:
|
||
logger.debug("解除封禁", target=f"{group_id}:{user_id}")
|
||
await user.delete()
|
||
return True
|
||
return False
|
||
|
||
@classmethod
|
||
async def get_ban(
|
||
cls,
|
||
*,
|
||
id: int | None = None,
|
||
user_id: str | None = None,
|
||
group_id: str | None = None,
|
||
) -> Self | None:
|
||
"""安全地获取ban记录
|
||
|
||
参数:
|
||
id: 记录id
|
||
user_id: 用户id
|
||
group_id: 群组id
|
||
|
||
返回:
|
||
Self | None: ban记录
|
||
"""
|
||
if id is not None:
|
||
return await cls.safe_get_or_none(id=id)
|
||
return await cls._get_data(user_id, group_id)
|
||
|
||
@classmethod
|
||
async def _run_script(cls):
|
||
return [
|
||
"CREATE INDEX idx_ban_console_user_id ON ban_console(user_id);",
|
||
"CREATE INDEX idx_ban_console_group_id ON ban_console(group_id);",
|
||
"ALTER TABLE ban_console ADD COLUMN ban_reason TEXT DEFAULT NULL;",
|
||
]
|