Skip to content

Commit 02cd16f

Browse files
⬆️ auto update by pre-commit hooks (#36)
* ⬆️ auto update by pre-commit hooks updates: - [github.com/psf/black: 23.12.1 → 24.1.1](psf/black@23.12.1...24.1.1) * 🚨 auto fix by pre-commit hooks --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent bb3c762 commit 02cd16f

File tree

8 files changed

+40
-34
lines changed

8 files changed

+40
-34
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ repos:
1919
stages: [commit]
2020

2121
- repo: https://github.com/psf/black
22-
rev: 23.12.1
22+
rev: 24.1.1
2323
hooks:
2424
- id: black
2525
stages: [commit]

nonebot_plugin_all4one/middlewares/base.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,7 @@ async def get_self_info(
131131
"""获取机器人自身信息"""
132132
raise NotImplementedError
133133

134-
async def get_user_info(
135-
self, *, user_id: str, **kwargs: Any
136-
) -> Dict[
134+
async def get_user_info(self, *, user_id: str, **kwargs: Any) -> Dict[
137135
Union[Literal["user_id", "user_name", "user_displayname", "user_remark"], str],
138136
str,
139137
]:

nonebot_plugin_all4one/middlewares/qqguild.py

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,9 @@ async def send_message(
267267
# NoneBot 的默认 API_TIMEOUT 为 30s,这里设置为 25s
268268
result = await e.get_audit_result(timeout=25)
269269
if result.message_id is None:
270-
raise ob_exception.PlatformError("failed", 34001, "消息审核未通过", None)
270+
raise ob_exception.PlatformError(
271+
"failed", 34001, "消息审核未通过", None
272+
)
271273
time = result.audit_time.timestamp() # type: ignore
272274
message_id = {
273275
"message_id": result.message_id,
@@ -351,9 +353,9 @@ async def get_guild_member_info(
351353
"user_displayname": member.nick or "",
352354
"qqguild.user": member.user.dict() if member.user else None,
353355
"qqguild.roles": member.roles,
354-
"qqguild.joined_at": member.joined_at.timestamp()
355-
if member.joined_at
356-
else None,
356+
"qqguild.joined_at": (
357+
member.joined_at.timestamp() if member.joined_at else None
358+
),
357359
}
358360

359361
async def _get_all_members(self, guild_id: str) -> List[Member]:
@@ -388,9 +390,9 @@ async def get_guild_member_list(
388390
"user_displayname": member.nick or "",
389391
"qqguild.user": member.user.dict() if member.user else None,
390392
"qqguild.roles": member.roles,
391-
"qqguild.joined_at": member.joined_at.timestamp()
392-
if member.joined_at
393-
else None,
393+
"qqguild.joined_at": (
394+
member.joined_at.timestamp() if member.joined_at else None
395+
),
394396
}
395397
)
396398
return members_list
@@ -425,15 +427,15 @@ async def get_channel_list(
425427
{
426428
"channel_id": str(channel.id) if channel.id else "",
427429
"channel_name": channel.name or "",
428-
"qqguild.guild_id": str(channel.guild_id)
429-
if channel.guild_id
430-
else "",
430+
"qqguild.guild_id": (
431+
str(channel.guild_id) if channel.guild_id else ""
432+
),
431433
"qqguild.channel_type": channel.type,
432434
"qqguild.position": channel.position,
433435
"qqguild.parent_id": channel.parent_id,
434-
"qqguild.owner_id": str(channel.owner_id)
435-
if channel.owner_id
436-
else "",
436+
"qqguild.owner_id": (
437+
str(channel.owner_id) if channel.owner_id else ""
438+
),
437439
"qqguild.sub_type": channel.sub_type,
438440
"qqguild.private_type": channel.private_type,
439441
}
@@ -449,7 +451,10 @@ async def set_channel_name(
449451
@supported_action
450452
async def get_channel_member_info(
451453
self, *, guild_id: str, channel_id: str, user_id: str, **kwargs: Any
452-
) -> Dict[Union[Literal["user_id", "user_name", "user_displayname"], str], Any,]:
454+
) -> Dict[
455+
Union[Literal["user_id", "user_name", "user_displayname"], str],
456+
Any,
457+
]:
453458
member = await self.bot.get_member(guild_id=int(guild_id), user_id=int(user_id))
454459
if member.user is None:
455460
raise ob_exception.PlatformError("failed", 34001, "用户不存在", None)
@@ -460,9 +465,9 @@ async def get_channel_member_info(
460465
"user_displayname": member.nick or "",
461466
"qqguild.user": member.user.dict() if member.user else {},
462467
"qqguild.roles": member.roles,
463-
"qqguild.joined_at": member.joined_at.timestamp()
464-
if member.joined_at
465-
else None,
468+
"qqguild.joined_at": (
469+
member.joined_at.timestamp() if member.joined_at else None
470+
),
466471
}
467472

468473
@supported_action
@@ -517,9 +522,9 @@ def can_view(member: Member) -> bool:
517522
"user_displayname": member.nick or "",
518523
"qqguild.user": member.user.dict() if member.user else {},
519524
"qqguild.roles": member.roles,
520-
"qqguild.joined_at": member.joined_at.timestamp()
521-
if member.joined_at
522-
else None,
525+
"qqguild.joined_at": (
526+
member.joined_at.timestamp() if member.joined_at else None
527+
),
523528
}
524529
)
525530
return members_list

nonebot_plugin_all4one/middlewares/telegram.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,11 @@ async def to_onebot_event(self, event: Event) -> List[OneBotEvent]:
6464
0,
6565
OneBotMessageSegment.reply(
6666
f"{event.reply_to_message.chat.id}/{event.reply_to_message.message_id}",
67-
user_id=event.reply_to_message.get_user_id()
68-
if not isinstance(event.reply_to_message, ChannelPostEvent)
69-
else "",
67+
user_id=(
68+
event.reply_to_message.get_user_id()
69+
if not isinstance(event.reply_to_message, ChannelPostEvent)
70+
else ""
71+
),
7072
),
7173
)
7274
elif isinstance(event, NoticeEvent):
@@ -219,9 +221,7 @@ async def get_self_info(
219221
}
220222

221223
@supported_action
222-
async def get_user_info(
223-
self, *, user_id: str, **kwargs: Any
224-
) -> Dict[
224+
async def get_user_info(self, *, user_id: str, **kwargs: Any) -> Dict[
225225
Union[Literal["user_id", "user_name", "user_displayname", "user_remark"], str],
226226
str,
227227
]:

nonebot_plugin_all4one/migrations/6e6321bc6c48_init_db.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
Create Date: 2023-02-20 21:50:33.023674
66
77
"""
8+
89
import sqlalchemy as sa
910
from alembic import op
1011

nonebot_plugin_all4one/migrations/d0a1d19f3408_.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
Create Date: 2023-02-26 14:09:17.473872
66
77
"""
8+
89
import sqlalchemy as sa
910
from alembic import op
1011

nonebot_plugin_all4one/onebotimpl/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,9 +383,9 @@ async def _handle_ws(self, conn: WebsocketConfig, websocket: WebSocket) -> None:
383383

384384
async def _http_webhook(self, conn: HTTPWebhookConfig):
385385
headers = {
386-
"Content-Type": "application/msgpack"
387-
if conn.use_msgpack
388-
else "application/json",
386+
"Content-Type": (
387+
"application/msgpack" if conn.use_msgpack else "application/json"
388+
),
389389
"User-Agent": "OneBot/12 NoneBot Plugin All4One/0.1.0",
390390
"X-OneBot-Version": "12",
391391
"X-Impl": "nonebot-plugin-all4one",

tests/middlewares/villa/test_villa.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@ async def test_to_onebot_event(app: App):
3232
assert channel_create.message_id == "C9G5-O2GK-FJB9-EVB0"
3333
assert channel_create.channel_id == "39761"
3434
assert (
35-
channel_create.alt_message == "<mention_robot:bot_nUcp9kz0I2AhxZGVQDUQ>/帮助"
35+
channel_create.alt_message
36+
== "<mention_robot:bot_nUcp9kz0I2AhxZGVQDUQ>/帮助"
3637
)

0 commit comments

Comments
 (0)