From c83e15bdaa72d731e6de49a8aed1126c007ab77d Mon Sep 17 00:00:00 2001 From: molanp <104612722+molanp@users.noreply.github.com> Date: Tue, 5 Aug 2025 18:10:04 +0800 Subject: [PATCH] =?UTF-8?q?refactor(ban):=20=E4=BC=98=E5=8C=96=20unban=20?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E8=BF=94=E5=9B=9E=E5=80=BC=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 使用或运算简化返回值判断逻辑 - 移除不必要的字符串转换 --- zhenxun/builtin_plugins/admin/ban/_data_source.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zhenxun/builtin_plugins/admin/ban/_data_source.py b/zhenxun/builtin_plugins/admin/ban/_data_source.py index da70a1d4..4e4581d3 100644 --- a/zhenxun/builtin_plugins/admin/ban/_data_source.py +++ b/zhenxun/builtin_plugins/admin/ban/_data_source.py @@ -103,7 +103,7 @@ class BanManage: session: EventSession, idx: int | None = None, is_superuser: bool = False, - ) -> tuple[bool, str]: + ) -> tuple[bool, str | None]: """unban目标用户 参数: @@ -114,7 +114,7 @@ class BanManage: is_superuser: 是否为超级用户操作 返回: - tuple[bool, str]: 是否unban成功, 群组/用户id或提示 + tuple[bool, str | Non]: 是否unban成功, 群组/用户id或提示 """ user_level = 9999 if not is_superuser and user_id and session.id1: @@ -126,10 +126,10 @@ class BanManage: if ban_data.ban_level > user_level: return False, "unBan权限等级不足捏..." await ban_data.delete() - return (True, ban_data.user_id if ban_data.user_id else ban_data.group_id) + return True, ban_data.user_id or ban_data.group_id elif await BanConsole.check_ban_level(user_id, group_id, user_level): await BanConsole.unban(user_id, group_id) - return True, str(group_id) + return True, group_id return False, "该用户/群组不在黑名单中不足捏..." @classmethod