From 5b0957e049445614e6d670db476e5def7d64c599 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:52:05 +0000 Subject: [PATCH 1/2] :arrow_up: auto update by pre-commit hooks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.1.9 → v0.6.3](https://github.com/astral-sh/ruff-pre-commit/compare/v0.1.9...v0.6.3) - [github.com/psf/black: 23.12.1 → 24.8.0](https://github.com/psf/black/compare/23.12.1...24.8.0) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c3b170f..ab1c58c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,7 +7,7 @@ ci: autoupdate_commit_msg: ":arrow_up: auto update by pre-commit hooks" repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.1.9 + rev: v0.6.3 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] @@ -20,7 +20,7 @@ repos: stages: [commit] - repo: https://github.com/psf/black - rev: 23.12.1 + rev: 24.8.0 hooks: - id: black stages: [commit] From b0f50c869de4882f2b4614c0dd32a0fb95562a33 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:52:13 +0000 Subject: [PATCH 2/2] :rotating_light: auto fix by pre-commit hooks --- magic/config/__init__.py | 2 +- magic/config/config.py | 3 +-- magic/plugins/admin/__init__.py | 16 ++++++++++++---- magic/plugins/ban/__init__.py | 8 ++++++-- magic/plugins/control/__init__.py | 10 ++++++---- magic/plugins/control/data_source.py | 4 +++- magic/plugins/help/__init__.py | 6 ++++-- magic/plugins/hooks/user_exist.py | 1 + magic/plugins/sign/__init__.py | 4 +++- magic/plugins/user/__init__.py | 5 ++++- magic/utils/requests.py | 8 ++++++-- magic/utils/update.py | 8 ++++++-- 12 files changed, 53 insertions(+), 22 deletions(-) diff --git a/magic/config/__init__.py b/magic/config/__init__.py index 49ee43e..f773f0f 100644 --- a/magic/config/__init__.py +++ b/magic/config/__init__.py @@ -1,5 +1,5 @@ -from .config import MagicConfig from .utils import load_config +from .config import MagicConfig from .path import BOT_DIR as BOT_DIR from .path import LOG_DIR as LOG_DIR from .path import RES_DIR as RES_DIR diff --git a/magic/config/config.py b/magic/config/config.py index 480dff7..6573b22 100644 --- a/magic/config/config.py +++ b/magic/config/config.py @@ -178,8 +178,7 @@ class Config: if TYPE_CHECKING: - def __getattr__(self, name: str) -> Any: - ... + def __getattr__(self, name: str) -> Any: ... class MagicConfig(BaseConfig): diff --git a/magic/plugins/admin/__init__.py b/magic/plugins/admin/__init__.py index c5cd6f6..cfab380 100644 --- a/magic/plugins/admin/__init__.py +++ b/magic/plugins/admin/__init__.py @@ -131,7 +131,9 @@ async def add( if admin_target.available: if await user.filter(bind__uid=str(admin_target.result)).exists(): await user.filter(uid=admin_target.result).update(permission="ADMIN") - await Text(f"已成功增加 Bot管理员:{admin_target.result}").send(at_sender=True) + await Text(f"已成功增加 Bot管理员:{admin_target.result}").send( + at_sender=True + ) elif admin_target.result == 0: ... @@ -142,7 +144,9 @@ async def add( if helper_target.available: if await user.filter(bind__uid=str(admin_target.result)).exists(): await user.filter(uid=helper_target.result).update(permission="HELPER") - await Text(f"已成功增加 Bot协助者:{helper_target.result}").send(at_sender=True) + await Text(f"已成功增加 Bot协助者:{helper_target.result}").send( + at_sender=True + ) elif helper_target.result == 0: ... @@ -166,7 +170,9 @@ async def remove( if admin_target.available: if await user.filter(bind__uid=str(admin_target.result)).exists(): await user.filter(uid=admin_target.result).update(permission="NORMAL") - await Text(f"已取消 {admin_target.result} 的 Bot管理员 身份").send(at_sender=True) + await Text(f"已取消 {admin_target.result} 的 Bot管理员 身份").send( + at_sender=True + ) elif admin_target.result == 0: ... @@ -177,7 +183,9 @@ async def remove( if helper_target.available: if await user.filter(bind__uid=str(admin_target.result)).exists(): await user.filter(uid=helper_target.result).update(permission="NORMAL") - await Text(f"已取消 {helper_target.result} 的 Bot协助者 身份").send(at_sender=True) + await Text(f"已取消 {helper_target.result} 的 Bot协助者 身份").send( + at_sender=True + ) elif helper_target.result == 0: ... diff --git a/magic/plugins/ban/__init__.py b/magic/plugins/ban/__init__.py index 32644bf..1045d27 100644 --- a/magic/plugins/ban/__init__.py +++ b/magic/plugins/ban/__init__.py @@ -71,7 +71,9 @@ async def add( else: minutes_result = 0 hours_result = hours.result - logger.info(f"封禁目标:{uid}({user_name}),时长:{hours_result}小时{minutes_result}分钟") + logger.info( + f"封禁目标:{uid}({user_name}),时长:{hours_result}小时{minutes_result}分钟" + ) await Ban.ban(uid, duration=convert_to_seconds(hours_result, minutes_result)) await Text( f"已成功封禁用户:{uid}({user_name}),时长:{hours_result}小时{minutes_result}分钟" @@ -107,7 +109,9 @@ async def unban( else: minutes_result = 0 hours_result = hours.result - logger.info(f"封禁目标:{uid}({user_name}),时长:{hours_result}小时{minutes_result}分钟") + logger.info( + f"封禁目标:{uid}({user_name}),时长:{hours_result}小时{minutes_result}分钟" + ) await Ban.unban(uid) await Text( f"已成功封禁用户:{uid}({user_name}),时长:{hours_result}小时{minutes_result}分钟" diff --git a/magic/plugins/control/__init__.py b/magic/plugins/control/__init__.py index 2dee51c..e8537f8 100644 --- a/magic/plugins/control/__init__.py +++ b/magic/plugins/control/__init__.py @@ -99,9 +99,9 @@ async def _(): latest_version, update_time = await CheckUpdate.show_latest_version() if latest_version and update_time: if latest_version != __version__: - await Text(f"新版本已发布, 请更新\n最新版本: {latest_version} 更新时间: {update_time}").send( - at_sender=True - ) + await Text( + f"新版本已发布, 请更新\n最新版本: {latest_version} 更新时间: {update_time}" + ).send(at_sender=True) else: await Text("当前已是最新版本").send(at_sender=True) await check_update_cmd.finish() @@ -128,7 +128,9 @@ async def _(matcher: AlconnaMatcher, cmd: Match[tuple[str, ...]]): @run_cmd.got_path( "cmd", - prompt=UniMessage.template("{:At(user, $event.get_user_id())} 请输入你要运行的命令"), + prompt=UniMessage.template( + "{:At(user, $event.get_user_id())} 请输入你要运行的命令" + ), parameterless=[HandleCancellation("已取消")], ) async def _(cmd: str): diff --git a/magic/plugins/control/data_source.py b/magic/plugins/control/data_source.py index 1fc6963..7ffec6c 100644 --- a/magic/plugins/control/data_source.py +++ b/magic/plugins/control/data_source.py @@ -23,4 +23,6 @@ async def remind(): "python3 bot.py" ) os.system("chmod +x ./restart.sh") - logger.info("配置", "已自动生成 restart.sh 重启脚本,请检查脚本是否与本地指令符合..") + logger.info( + "配置", "已自动生成 restart.sh 重启脚本,请检查脚本是否与本地指令符合.." + ) diff --git a/magic/plugins/help/__init__.py b/magic/plugins/help/__init__.py index e24317a..cd66af5 100644 --- a/magic/plugins/help/__init__.py +++ b/magic/plugins/help/__init__.py @@ -110,7 +110,8 @@ async def statis_cmd_most(arp: Arparma): sort = sorted(table.items(), key=lambda x: x[1], reverse=True) sort = sort[: arp.query[int]("count")] await statis_cmd.finish( - "以下按照命令使用频率排序\n" + "\n".join(f"[{k}] {v[0]}" for k, v in enumerate(sort)) + "以下按照命令使用频率排序\n" + + "\n".join(f"[{k}] {v[0]}" for k, v in enumerate(sort)) ) @@ -128,5 +129,6 @@ async def statis_cmd_least(arp: Arparma): sort = sorted(table.items(), key=lambda x: x[1], reverse=False) sort = sort[: arp.query[int]("count")] await statis_cmd.finish( - "以下按照命令使用频率排序\n" + "\n".join(f"[{k}] {v[0]}" for k, v in enumerate(sort)) + "以下按照命令使用频率排序\n" + + "\n".join(f"[{k}] {v[0]}" for k, v in enumerate(sort)) ) diff --git a/magic/plugins/hooks/user_exist.py b/magic/plugins/hooks/user_exist.py index f8624a7..d5acbcc 100644 --- a/magic/plugins/hooks/user_exist.py +++ b/magic/plugins/hooks/user_exist.py @@ -3,6 +3,7 @@ 用来在处理事件前先判断用户是否存在 如果不存在则自动为其注册账号 """ + import inspect from nonebot import require diff --git a/magic/plugins/sign/__init__.py b/magic/plugins/sign/__init__.py index ed5e04a..67d79bf 100644 --- a/magic/plugins/sign/__init__.py +++ b/magic/plugins/sign/__init__.py @@ -61,7 +61,9 @@ async def _(user: UserInfo): if last_sign is not None and abs((date.today() - last_sign.date()).days) == 1: continuous_days += 1 extra_coin = int(continuous_days * 1.5) - msg = f"你当前连续签到 {str(continuous_days)} 天,额外奖励 {extra_coin} 枚硬币。" + msg = ( + f"你当前连续签到 {str(continuous_days)} 天,额外奖励 {extra_coin} 枚硬币。" + ) await User.reward(uid, reward={"coin": extra_coin}) await Sign.filter(uid=uid).update(continuous_days=F("continuous_days") + 1) else: diff --git a/magic/plugins/user/__init__.py b/magic/plugins/user/__init__.py index e7d4a0f..3bde0ff 100644 --- a/magic/plugins/user/__init__.py +++ b/magic/plugins/user/__init__.py @@ -50,7 +50,10 @@ Args["input_token?", str], Option("-t|--token", Args["token?", str], help_text="生成token"), Option( - "-l|--list", Args["target?", At], alias={"列表", "信息"}, help_text="查询绑定信息" + "-l|--list", + Args["target?", At], + alias={"列表", "信息"}, + help_text="查询绑定信息", ), Option("-r|--rebind", alias={"取消"}, help_text="取消绑定"), meta=CommandMeta( diff --git a/magic/utils/requests.py b/magic/utils/requests.py index 4ae0faf..e037933 100644 --- a/magic/utils/requests.py +++ b/magic/utils/requests.py @@ -169,7 +169,9 @@ async def download_file( ).content async with aiofiles.open(path, "wb") as wf: await wf.write(content) - logger.success("请求", f"下载 {url} 成功!Path:{path.absolute()}") + logger.success( + "请求", f"下载 {url} 成功!Path:{path.absolute()}" + ) return True except (TimeoutError, ConnectTimeout): pass @@ -221,7 +223,9 @@ async def download_file( else: logger.error("请求", f"下载 {url} 下载超时!Path:{path.absolute()}") except Exception as e: - logger.error("请求", f"下载 {url} 未知错误 {type(e)}:{e} | Path:{path.absolute()}") + logger.error( + "请求", f"下载 {url} 未知错误 {type(e)}:{e} | Path:{path.absolute()}" + ) return False @classmethod diff --git a/magic/utils/update.py b/magic/utils/update.py index 12a7041..9289d55 100644 --- a/magic/utils/update.py +++ b/magic/utils/update.py @@ -38,7 +38,9 @@ def update(): pyproject_new_content = pyproject_raw_content.replace( raw_plugins_load.group(), "plugins = []" ) - logger.info("更新", f"检测到已安装插件:{raw_plugins_load.group()},暂时重置") + logger.info( + "更新", f"检测到已安装插件:{raw_plugins_load.group()},暂时重置" + ) else: pyproject_new_content = pyproject_raw_content pyproject_file.write_text(pyproject_new_content, encoding="utf-8") @@ -64,7 +66,9 @@ def update(): "plugins = []", raw_plugins_load.group() ) pyproject_file.write_text(pyproject_new_content, encoding="utf-8") - logger.info("更新", f"更新结束,还原插件:{raw_plugins_load.group()}") + logger.info( + "更新", f"更新结束,还原插件:{raw_plugins_load.group()}" + ) return msg else: msg = f"更新失败,错误信息:{e.stderr},请尝试手动进行更新"