Skip to content

Commit cc8f16c

Browse files
🚨 auto fix by pre-commit hooks
1 parent 11a84ae commit cc8f16c

12 files changed

Lines changed: 53 additions & 22 deletions

File tree

magic/config/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from .config import MagicConfig
21
from .utils import load_config
2+
from .config import MagicConfig
33
from .path import BOT_DIR as BOT_DIR
44
from .path import LOG_DIR as LOG_DIR
55
from .path import RES_DIR as RES_DIR

magic/config/config.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,7 @@ class Config:
178178

179179
if TYPE_CHECKING:
180180

181-
def __getattr__(self, name: str) -> Any:
182-
...
181+
def __getattr__(self, name: str) -> Any: ...
183182

184183

185184
class MagicConfig(BaseConfig):

magic/plugins/admin/__init__.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@ async def add(
131131
if admin_target.available:
132132
if await user.filter(bind__uid=str(admin_target.result)).exists():
133133
await user.filter(uid=admin_target.result).update(permission="ADMIN")
134-
await Text(f"已成功增加 Bot管理员:{admin_target.result}").send(at_sender=True)
134+
await Text(f"已成功增加 Bot管理员:{admin_target.result}").send(
135+
at_sender=True
136+
)
135137

136138
elif admin_target.result == 0:
137139
...
@@ -142,7 +144,9 @@ async def add(
142144
if helper_target.available:
143145
if await user.filter(bind__uid=str(admin_target.result)).exists():
144146
await user.filter(uid=helper_target.result).update(permission="HELPER")
145-
await Text(f"已成功增加 Bot协助者:{helper_target.result}").send(at_sender=True)
147+
await Text(f"已成功增加 Bot协助者:{helper_target.result}").send(
148+
at_sender=True
149+
)
146150

147151
elif helper_target.result == 0:
148152
...
@@ -166,7 +170,9 @@ async def remove(
166170
if admin_target.available:
167171
if await user.filter(bind__uid=str(admin_target.result)).exists():
168172
await user.filter(uid=admin_target.result).update(permission="NORMAL")
169-
await Text(f"已取消 {admin_target.result} 的 Bot管理员 身份").send(at_sender=True)
173+
await Text(f"已取消 {admin_target.result} 的 Bot管理员 身份").send(
174+
at_sender=True
175+
)
170176

171177
elif admin_target.result == 0:
172178
...
@@ -177,7 +183,9 @@ async def remove(
177183
if helper_target.available:
178184
if await user.filter(bind__uid=str(admin_target.result)).exists():
179185
await user.filter(uid=helper_target.result).update(permission="NORMAL")
180-
await Text(f"已取消 {helper_target.result} 的 Bot协助者 身份").send(at_sender=True)
186+
await Text(f"已取消 {helper_target.result} 的 Bot协助者 身份").send(
187+
at_sender=True
188+
)
181189

182190
elif helper_target.result == 0:
183191
...

magic/plugins/ban/__init__.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ async def add(
7171
else:
7272
minutes_result = 0
7373
hours_result = hours.result
74-
logger.info(f"封禁目标:{uid}({user_name}),时长:{hours_result}小时{minutes_result}分钟")
74+
logger.info(
75+
f"封禁目标:{uid}({user_name}),时长:{hours_result}小时{minutes_result}分钟"
76+
)
7577
await Ban.ban(uid, duration=convert_to_seconds(hours_result, minutes_result))
7678
await Text(
7779
f"已成功封禁用户:{uid}({user_name}),时长:{hours_result}小时{minutes_result}分钟"
@@ -107,7 +109,9 @@ async def unban(
107109
else:
108110
minutes_result = 0
109111
hours_result = hours.result
110-
logger.info(f"封禁目标:{uid}({user_name}),时长:{hours_result}小时{minutes_result}分钟")
112+
logger.info(
113+
f"封禁目标:{uid}({user_name}),时长:{hours_result}小时{minutes_result}分钟"
114+
)
111115
await Ban.unban(uid)
112116
await Text(
113117
f"已成功封禁用户:{uid}({user_name}),时长:{hours_result}小时{minutes_result}分钟"

magic/plugins/control/__init__.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ async def _():
9999
latest_version, update_time = await CheckUpdate.show_latest_version()
100100
if latest_version and update_time:
101101
if latest_version != __version__:
102-
await Text(f"新版本已发布, 请更新\n最新版本: {latest_version} 更新时间: {update_time}").send(
103-
at_sender=True
104-
)
102+
await Text(
103+
f"新版本已发布, 请更新\n最新版本: {latest_version} 更新时间: {update_time}"
104+
).send(at_sender=True)
105105
else:
106106
await Text("当前已是最新版本").send(at_sender=True)
107107
await check_update_cmd.finish()
@@ -128,7 +128,9 @@ async def _(matcher: AlconnaMatcher, cmd: Match[tuple[str, ...]]):
128128

129129
@run_cmd.got_path(
130130
"cmd",
131-
prompt=UniMessage.template("{:At(user, $event.get_user_id())} 请输入你要运行的命令"),
131+
prompt=UniMessage.template(
132+
"{:At(user, $event.get_user_id())} 请输入你要运行的命令"
133+
),
132134
parameterless=[HandleCancellation("已取消")],
133135
)
134136
async def _(cmd: str):

magic/plugins/control/data_source.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@ async def remind():
2323
"python3 bot.py"
2424
)
2525
os.system("chmod +x ./restart.sh")
26-
logger.info("配置", "已自动生成 restart.sh 重启脚本,请检查脚本是否与本地指令符合..")
26+
logger.info(
27+
"配置", "已自动生成 restart.sh 重启脚本,请检查脚本是否与本地指令符合.."
28+
)

magic/plugins/help/__init__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ async def statis_cmd_most(arp: Arparma):
110110
sort = sorted(table.items(), key=lambda x: x[1], reverse=True)
111111
sort = sort[: arp.query[int]("count")]
112112
await statis_cmd.finish(
113-
"以下按照命令使用频率排序\n" + "\n".join(f"[{k}] {v[0]}" for k, v in enumerate(sort))
113+
"以下按照命令使用频率排序\n"
114+
+ "\n".join(f"[{k}] {v[0]}" for k, v in enumerate(sort))
114115
)
115116

116117

@@ -128,5 +129,6 @@ async def statis_cmd_least(arp: Arparma):
128129
sort = sorted(table.items(), key=lambda x: x[1], reverse=False)
129130
sort = sort[: arp.query[int]("count")]
130131
await statis_cmd.finish(
131-
"以下按照命令使用频率排序\n" + "\n".join(f"[{k}] {v[0]}" for k, v in enumerate(sort))
132+
"以下按照命令使用频率排序\n"
133+
+ "\n".join(f"[{k}] {v[0]}" for k, v in enumerate(sort))
132134
)

magic/plugins/hooks/user_exist.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
用来在处理事件前先判断用户是否存在
44
如果不存在则自动为其注册账号
55
"""
6+
67
import inspect
78

89
from nonebot import require

magic/plugins/sign/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ async def _(user: UserInfo):
6161
if last_sign is not None and abs((date.today() - last_sign.date()).days) == 1:
6262
continuous_days += 1
6363
extra_coin = int(continuous_days * 1.5)
64-
msg = f"你当前连续签到 {str(continuous_days)} 天,额外奖励 {extra_coin} 枚硬币。"
64+
msg = (
65+
f"你当前连续签到 {str(continuous_days)} 天,额外奖励 {extra_coin} 枚硬币。"
66+
)
6567
await User.reward(uid, reward={"coin": extra_coin})
6668
await Sign.filter(uid=uid).update(continuous_days=F("continuous_days") + 1)
6769
else:

magic/plugins/user/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,10 @@
5050
Args["input_token?", str],
5151
Option("-t|--token", Args["token?", str], help_text="生成token"),
5252
Option(
53-
"-l|--list", Args["target?", At], alias={"列表", "信息"}, help_text="查询绑定信息"
53+
"-l|--list",
54+
Args["target?", At],
55+
alias={"列表", "信息"},
56+
help_text="查询绑定信息",
5457
),
5558
Option("-r|--rebind", alias={"取消"}, help_text="取消绑定"),
5659
meta=CommandMeta(

0 commit comments

Comments
 (0)