From be85a0378850d6ae9803734f9eb018dd84ab6ffe Mon Sep 17 00:00:00 2001 From: HibiKier <775757368@qq.com> Date: Sun, 11 May 2025 23:11:08 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=A3=B0=E6=98=8E=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=B0=81=E7=A6=81=E7=94=A8=E6=88=B7=E5=A4=84=E7=90=86=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zhenxun/builtin_plugins/hooks/auth/auth_ban.py | 6 +++--- zhenxun/builtin_plugins/init/__init_cache.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zhenxun/builtin_plugins/hooks/auth/auth_ban.py b/zhenxun/builtin_plugins/hooks/auth/auth_ban.py index f1259c9c..dcca0731 100644 --- a/zhenxun/builtin_plugins/hooks/auth/auth_ban.py +++ b/zhenxun/builtin_plugins/hooks/auth/auth_ban.py @@ -29,15 +29,15 @@ Config.add_plugin_config( async def is_ban(user_id: str | None, group_id: str | None) -> int: if not user_id and not group_id: return 0 - cache = Cache[list[BanConsole]](CacheType.BAN) + cache = Cache[BanConsole](CacheType.BAN) group_user, user = await asyncio.gather( cache.get(user_id, group_id), cache.get(user_id) ) results = [] if group_user: - results.extend(group_user) + results.append(group_user) if user: - results.extend(user) + results.append(user) if not results: return 0 for result in results: diff --git a/zhenxun/builtin_plugins/init/__init_cache.py b/zhenxun/builtin_plugins/init/__init_cache.py index e0e7a282..53bfe7e7 100644 --- a/zhenxun/builtin_plugins/init/__init_cache.py +++ b/zhenxun/builtin_plugins/init/__init_cache.py @@ -154,7 +154,7 @@ async def _(): return {f"{d.group_id or ''}:{d.user_id or ''}": d for d in data_list} -@CacheRoot.getter(CacheType.BAN, result_model=list[BanConsole]) +@CacheRoot.getter(CacheType.BAN, result_model=BanConsole) async def _(cache_data: CacheData, user_id: str | None, group_id: str | None = None): """获取封禁缓存""" if not user_id and not group_id: