Skip to content

Commit 8f2b1bb

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent b5b77ee commit 8f2b1bb

File tree

11 files changed

+132
-128
lines changed

11 files changed

+132
-128
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ jobs:
2020
run: python main.py
2121
- name: Run tests
2222
run: pytest tests/
23-

cogs/docs/pagination.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,10 @@ def fill_items(self) -> None:
130130
self.add_item(self.numbered_page)
131131
self.add_item(self.stop_pages)
132132

133-
async def _get_kwargs_from_page(
134-
self, page: int
135-
) -> Dict[str, Any,]:
133+
async def _get_kwargs_from_page(self, page: int) -> Dict[
134+
str,
135+
Any,
136+
]:
136137
value = await disnake.utils.maybe_coroutine(self.source.format_page, self, page)
137138
if isinstance(value, dict):
138139
return value

cogs/feedback.py

Lines changed: 61 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -38,53 +38,67 @@ async def viewfeedback(
3838
str,
3939
] = None,
4040
):
41-
await send_embed(
42-
ctx,
43-
"",
44-
"**Error: **distance must be an integer (an index placevalue) if no `author_from` is given!",
45-
) if hasattr(distance, "upper") and author_from is None else await send_embed(
46-
ctx,
47-
"",
48-
f'*`{distance}`*: "{data["feedback"]["message"][distance]}", submitted by **{data["feedback"]["author"][distance]}**'
49-
if distance != 0
50-
else f"**You can index off of the index on the left side. Type `{ctx.prefix}viewfeedback <index>`\n**\n"
51-
+ "\n".join(
52-
[
53-
f"`{num}:` {data['feedback']['message'][k]}**, said by {data['feedback']['author'][k]}**"
54-
for num, k in enumerate(range(len(data["feedback"]["message"])))
55-
if num <= 9
56-
]
57-
),
58-
a="Feedback",
59-
i_u=ctx.author.display_avatar.url,
60-
) if author_from is None else await send_embed(
61-
ctx,
62-
"",
63-
"\n".join(
64-
[
65-
f"`{num}`: {data['feedback']['message'][num]}"
66-
for num, k in enumerate(data["feedback"]["author"])
67-
if k == author_from
68-
]
69-
),
70-
a=f"Feedback from {author_from}",
71-
i_u=ctx.author.display_avatar.url,
72-
f=f"All these messges are from {author_from}",
73-
) if hasattr(
74-
author_from, "upper"
75-
) else await send_embed(
76-
ctx,
77-
"",
78-
"\n".join(
79-
[
80-
f"`{num}`: {data['feedback']['message'][num]}"
81-
for num, k in enumerate(data["feedback"]["id"])
82-
if k == author_from
83-
]
84-
),
85-
a=f"Feedback from {await self.bot.fetch_user(author_from)}",
86-
i_u=ctx.author.display_avatar.url,
87-
f=f"All these messages are from {await self.bot.fetch_user(author_from)}",
41+
(
42+
await send_embed(
43+
ctx,
44+
"",
45+
"**Error: **distance must be an integer (an index placevalue) if no `author_from` is given!",
46+
)
47+
if hasattr(distance, "upper") and author_from is None
48+
else (
49+
await send_embed(
50+
ctx,
51+
"",
52+
(
53+
f'*`{distance}`*: "{data["feedback"]["message"][distance]}", submitted by **{data["feedback"]["author"][distance]}**'
54+
if distance != 0
55+
else f"**You can index off of the index on the left side. Type `{ctx.prefix}viewfeedback <index>`\n**\n"
56+
+ "\n".join(
57+
[
58+
f"`{num}:` {data['feedback']['message'][k]}**, said by {data['feedback']['author'][k]}**"
59+
for num, k in enumerate(
60+
range(len(data["feedback"]["message"]))
61+
)
62+
if num <= 9
63+
]
64+
)
65+
),
66+
a="Feedback",
67+
i_u=ctx.author.display_avatar.url,
68+
)
69+
if author_from is None
70+
else (
71+
await send_embed(
72+
ctx,
73+
"",
74+
"\n".join(
75+
[
76+
f"`{num}`: {data['feedback']['message'][num]}"
77+
for num, k in enumerate(data["feedback"]["author"])
78+
if k == author_from
79+
]
80+
),
81+
a=f"Feedback from {author_from}",
82+
i_u=ctx.author.display_avatar.url,
83+
f=f"All these messges are from {author_from}",
84+
)
85+
if hasattr(author_from, "upper")
86+
else await send_embed(
87+
ctx,
88+
"",
89+
"\n".join(
90+
[
91+
f"`{num}`: {data['feedback']['message'][num]}"
92+
for num, k in enumerate(data["feedback"]["id"])
93+
if k == author_from
94+
]
95+
),
96+
a=f"Feedback from {await self.bot.fetch_user(author_from)}",
97+
i_u=ctx.author.display_avatar.url,
98+
f=f"All these messages are from {await self.bot.fetch_user(author_from)}",
99+
)
100+
)
101+
)
88102
)
89103

90104
@commands.command(aliases=["dial", "call", "assistance"])

cogs/games/views/blackjack.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,13 @@ def visual_hand(self, cards: List[Card] = None, hide_card: bool = False) -> str:
8989
player=player,
9090
bar="".join("-" for _ in range(len(player))),
9191
cards=visual_cards,
92-
value=self.generate_card_values(
93-
self.user_cards if not cards else self.bot_cards
94-
)
95-
if not hide_card
96-
else f"{cards[0].value} + ?",
92+
value=(
93+
self.generate_card_values(
94+
self.user_cards if not cards else self.bot_cards
95+
)
96+
if not hide_card
97+
else f"{cards[0].value} + ?"
98+
),
9799
)
98100

99101
def generate_card_values(self, cards: List[Card]) -> int:

cogs/games/views/snake.py

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -182,32 +182,25 @@ async def move_snake(self) -> None:
182182
await self.edit_embed(self.board)
183183

184184
@_p1
185-
async def _pl_1(self, _, __):
186-
...
185+
async def _pl_1(self, _, __): ...
187186

188187
@_p1
189-
async def _pl_2(self, _, __):
190-
...
188+
async def _pl_2(self, _, __): ...
191189

192190
@_p1
193-
async def _pl_3(self, _, __):
194-
...
191+
async def _pl_3(self, _, __): ...
195192

196193
@_p1
197-
async def _pl_4(self, _, __):
198-
...
194+
async def _pl_4(self, _, __): ...
199195

200196
@_p1
201-
async def _pl_5(self, _, __):
202-
...
197+
async def _pl_5(self, _, __): ...
203198

204199
@_p2
205-
async def _pl_6(self, _, __):
206-
...
200+
async def _pl_6(self, _, __): ...
207201

208202
@_p2
209-
async def _pl_7(self, _, __):
210-
...
203+
async def _pl_7(self, _, __): ...
211204

212205
@button(style=ButtonStyle.green, emoji=UP_ARROW, disabled=True)
213206
async def up(self, button: Button, interaction: MessageInteraction) -> None:
@@ -219,16 +212,13 @@ async def up(self, button: Button, interaction: MessageInteraction) -> None:
219212
await interaction.response.defer()
220213

221214
@_p2
222-
async def _pl_8(self, _, __):
223-
...
215+
async def _pl_8(self, _, __): ...
224216

225217
@_p2
226-
async def _pl_9(self, _, __):
227-
...
218+
async def _pl_9(self, _, __): ...
228219

229220
@_p3
230-
async def _pl_10(self, _, __):
231-
...
221+
async def _pl_10(self, _, __): ...
232222

233223
@button(style=ButtonStyle.green, emoji=LEFT_ARROW, disabled=True, row=2)
234224
async def left(self, button: Button, interaction: MessageInteraction) -> None:
@@ -258,28 +248,22 @@ async def right(self, button: Button, interaction: MessageInteraction) -> None:
258248
await interaction.response.defer()
259249

260250
@_p3
261-
async def _pl_11(self, _, __):
262-
...
251+
async def _pl_11(self, _, __): ...
263252

264253
@_p4
265-
async def _pl_12(self, _, __):
266-
...
254+
async def _pl_12(self, _, __): ...
267255

268256
@_p4
269-
async def _pl_13(self, _, __):
270-
...
257+
async def _pl_13(self, _, __): ...
271258

272259
@_p4
273-
async def _pl_14(self, _, __):
274-
...
260+
async def _pl_14(self, _, __): ...
275261

276262
@_p4
277-
async def _pl_15(self, _, __):
278-
...
263+
async def _pl_15(self, _, __): ...
279264

280265
@_p4
281-
async def _pl_16(self, _, __):
282-
...
266+
async def _pl_16(self, _, __): ...
283267

284268
@button(label="Play", style=ButtonStyle.green, emoji=PLAY_BUTTON, row=4)
285269
async def play(self, button: Button, interaction: MessageInteraction) -> None:

cogs/help/cog.py

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -89,23 +89,29 @@ async def specific_command(
8989
)
9090
.add_field(
9191
name=" ❯❯ Alias",
92-
value=f"{', '.join(f'`{k}`' for k in command.aliases if command.aliases)} "
93-
if command.aliases
94-
else "`none`",
92+
value=(
93+
f"{', '.join(f'`{k}`' for k in command.aliases if command.aliases)} "
94+
if command.aliases
95+
else "`none`"
96+
),
9597
inline=False,
9698
)
9799
.add_field(
98100
name=" ❯❯ Usage",
99-
value=f"`j.{command.name} {command.signature}`"
100-
if command.signature
101-
else f"`j.{command.name}`",
101+
value=(
102+
f"`j.{command.name} {command.signature}`"
103+
if command.signature
104+
else f"`j.{command.name}`"
105+
),
102106
inline=False,
103107
)
104108
.add_field(
105109
name=" ❯❯ Description",
106-
value=f"{get_help(command.name)}"
107-
if get_help(command.name)
108-
else "Currently no help!",
110+
value=(
111+
f"{get_help(command.name)}"
112+
if get_help(command.name)
113+
else "Currently no help!"
114+
),
109115
inline=False,
110116
)
111117
.set_author(name="Help", icon_url=ctx.author.display_avatar.url)
@@ -152,15 +158,19 @@ async def no_command(self, ctx: Context) -> disnake.Embed:
152158
)
153159
.add_field(
154160
name="\u200b",
155-
value="\n".join(commands[i] for i in range(0, len(commands), 2))
156-
if commands
157-
else "-",
161+
value=(
162+
"\n".join(commands[i] for i in range(0, len(commands), 2))
163+
if commands
164+
else "-"
165+
),
158166
)
159167
.add_field(
160168
name="\u200b",
161-
value="\n".join(commands[i] for i in range(1, len(commands), 2))
162-
if commands
163-
else "-",
169+
value=(
170+
"\n".join(commands[i] for i in range(1, len(commands), 2))
171+
if commands
172+
else "-"
173+
),
164174
)
165175
)
166176

cogs/moderation.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ async def ban(
111111
try:
112112
await member.send("You have been banned: " + reason)
113113
except HTTPException:
114-
await ctx.send("Could message user")
114+
await ctx.send("Could message user")
115115
await member.ban(reason=reason)
116116
embed = disnake.Embed(
117117
title="Banned",
@@ -137,7 +137,7 @@ async def unban(self, ctx: Context, user_id: int, *, reason="No reason provided"
137137
try:
138138
await user.send(f"You have been unbanned from {ctx.guild.name}")
139139
except HTTPException:
140-
await ctx.send("Could message user")
140+
await ctx.send("Could message user")
141141

142142
@has_permissions(manage_roles=True)
143143
@commands.command(aliases=["add", "+role", "add_role"])
@@ -301,9 +301,11 @@ async def permmute(self, ctx: Context, member: disnake.Member, *, reason=None):
301301
await ctx.reply(embed=embed)
302302
await member.add_roles(mutedRole, reason=reason)
303303
try:
304-
await member.send(f" you have been muted from: {guild.name} Reason: {reason}")
304+
await member.send(
305+
f" you have been muted from: {guild.name} Reason: {reason}"
306+
)
305307
except HTTPException:
306-
await ctx.send("Could message user")
308+
await ctx.send("Could message user")
307309

308310
@commands.command(
309311
aliases=["unrmute", "runmute"], description="Unreactmutes `<member>`"
@@ -336,7 +338,7 @@ async def unreactmute(self, ctx: Context, member: disnake.Member, *, reason=None
336338
f"You have been reaction muted from: {guild.name} Reason: {reason}"
337339
)
338340
except HTTPException:
339-
await ctx.send("Could message user")
341+
await ctx.send("Could message user")
340342

341343
@commands.command(aliases=["unmut"], description="Unmutes `<member>`")
342344
@has_permissions(manage_messages=True)
@@ -366,7 +368,7 @@ async def unmute(self, ctx: Context, member: disnake.Member, *, reason=None):
366368
f"You have been reaction muted from: {guild.name} Reason: {reason}"
367369
)
368370
except HTTPException:
369-
await ctx.send("Could message user")
371+
await ctx.send("Could message user")
370372

371373
@commands.command(
372374
aliases=["tempmute"],

cogs/music/dcutils.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -248,19 +248,11 @@ def __init__(self, ctx, music, **kwargs):
248248
if self.ctx.guild.id not in self.music.queue.keys():
249249
self.music.queue[self.ctx.guild.id] = []
250250
self.after_func = check_queue
251-
self.on_play_func = (
252-
self.on_queue_func
253-
) = (
254-
self.on_skip_func
255-
) = (
251+
self.on_play_func = self.on_queue_func = self.on_skip_func = (
256252
self.on_stop_func
257-
) = (
258-
self.on_pause_func
259-
) = (
260-
self.on_resume_func
261-
) = (
262-
self.on_loop_toggle_func
263-
) = self.on_volume_change_func = self.on_remove_from_queue_func = None
253+
) = self.on_pause_func = self.on_resume_func = self.on_loop_toggle_func = (
254+
self.on_volume_change_func
255+
) = self.on_remove_from_queue_func = None
264256
ffmpeg_error = kwargs.get(
265257
"ffmpeg_error_betterfix", kwargs.get("ffmpeg_error_fix")
266258
)

cogs/utils/cog.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,10 @@ async def charinfo(self, ctx: Context, *, characters: str):
139139

140140
def get_info(
141141
char: str,
142-
) -> Tuple[str, str,]:
142+
) -> Tuple[
143+
str,
144+
str,
145+
]:
143146
digit = f"{ord(char):x}"
144147
if len(digit) <= 4:
145148
u_code = f"\\u{digit:>04}"

0 commit comments

Comments
 (0)