Skip to content

Commit 893acc9

Browse files
committed
Lint
1 parent 6041d37 commit 893acc9

File tree

3 files changed

+24
-22
lines changed

3 files changed

+24
-22
lines changed

bot.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def _resolve_snippet(self, name: str) -> typing.Optional[str]:
100100
return name
101101

102102
try:
103-
command, = parse_alias(self.aliases[name])
103+
(command,) = parse_alias(self.aliases[name])
104104
except (KeyError, ValueError):
105105
# There is either no alias by this name present or the
106106
# alias has multiple steps.
@@ -987,7 +987,7 @@ def _get_snippet_command(self) -> commands.Command:
987987
if self.config["anonymous_snippets"]:
988988
modifiers += "a"
989989

990-
return self.get_command(f'{modifiers}reply')
990+
return self.get_command(f"{modifiers}reply")
991991

992992
async def get_contexts(self, message, *, cls=commands.Context):
993993
"""
@@ -1035,7 +1035,7 @@ async def get_contexts(self, message, *, cls=commands.Context):
10351035
command_invocation_text = alias
10361036
else:
10371037
command = self._get_snippet_command()
1038-
command_invocation_text = f'{invoked_prefix}{command} {snippet_text}'
1038+
command_invocation_text = f"{invoked_prefix}{command} {snippet_text}"
10391039
view = StringView(invoked_prefix + command_invocation_text)
10401040
ctx_ = cls(prefix=self.prefix, view=view, bot=self, message=message)
10411041
ctx_.thread = thread
@@ -1050,7 +1050,7 @@ async def get_contexts(self, message, *, cls=commands.Context):
10501050
if snippet_text is not None:
10511051
# Process snippets
10521052
ctx.command = self._get_snippet_command()
1053-
reply_view = StringView(f'{invoked_prefix}{ctx.command} {snippet_text}')
1053+
reply_view = StringView(f"{invoked_prefix}{ctx.command} {snippet_text}")
10541054
discord.utils.find(reply_view.skip_string, prefixes)
10551055
ctx.invoked_with = reply_view.get_word().lower()
10561056
ctx.view = reply_view

cogs/modmail.py

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -306,37 +306,41 @@ async def snippet_remove(self, ctx, *, name: str.lower):
306306
if name in self.bot.snippets:
307307
deleted_aliases, edited_aliases = self._fix_aliases(name)
308308

309-
deleted_aliases_string = ','.join(f'`{alias}`' for alias in deleted_aliases)
309+
deleted_aliases_string = ",".join(f"`{alias}`" for alias in deleted_aliases)
310310
if len(deleted_aliases) == 1:
311-
deleted_aliases_output = f'The `{deleted_aliases_string}` direct alias has been removed.'
311+
deleted_aliases_output = f"The `{deleted_aliases_string}` direct alias has been removed."
312312
elif deleted_aliases:
313-
deleted_aliases_output = f'The following direct aliases have been removed: {deleted_aliases_string}.'
313+
deleted_aliases_output = (
314+
f"The following direct aliases have been removed: {deleted_aliases_string}."
315+
)
314316
else:
315317
deleted_aliases_output = None
316318

317319
if len(edited_aliases) == 1:
318320
alias, val = edited_aliases.popitem()
319321
edited_aliases_output = (
320-
f'Steps pointing to this snippet have been removed from the `{alias}` alias'
321-
f' (previous value: `{val}`).`'
322+
f"Steps pointing to this snippet have been removed from the `{alias}` alias"
323+
f" (previous value: `{val}`).`"
322324
)
323325
elif edited_aliases:
324-
alias_list = '\n'.join([
325-
f'- `{alias_name}` (previous value: `{val}`)'
326-
for alias_name, val in edited_aliases.items()
327-
])
326+
alias_list = "\n".join(
327+
[
328+
f"- `{alias_name}` (previous value: `{val}`)"
329+
for alias_name, val in edited_aliases.items()
330+
]
331+
)
328332
edited_aliases_output = (
329-
f'Steps pointing to this snippet have been removed from the following aliases:'
330-
f'\n\n{alias_list}'
333+
f"Steps pointing to this snippet have been removed from the following aliases:"
334+
f"\n\n{alias_list}"
331335
)
332336
else:
333337
edited_aliases_output = None
334338

335339
description = f"Snippet `{name}` is now deleted."
336340
if deleted_aliases_output:
337-
description += f'\n\n{deleted_aliases_output}'
341+
description += f"\n\n{deleted_aliases_output}"
338342
if edited_aliases_output:
339-
description += f'\n\n{edited_aliases_output}'
343+
description += f"\n\n{edited_aliases_output}"
340344

341345
embed = discord.Embed(
342346
title="Removed snippet",

cogs/utility.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,13 +189,11 @@ async def send_error_message(self, error):
189189
snippet_aliases = []
190190
for alias in self.context.bot.aliases:
191191
if self.context.bot._resolve_snippet(alias) == command:
192-
snippet_aliases.append(f'`{alias}`')
192+
snippet_aliases.append(f"`{alias}`")
193193

194194
if snippet_aliases:
195195
embed.add_field(
196-
name=f'Aliases to this snippet:',
197-
value=','.join(snippet_aliases),
198-
inline=False
196+
name=f"Aliases to this snippet:", value=",".join(snippet_aliases), inline=False
199197
)
200198

201199
return await self.get_destination().send(embed=embed)
@@ -1083,7 +1081,7 @@ async def make_alias(self, name, value, action):
10831081
linked_command = view.get_word().lower()
10841082
message = view.read_rest()
10851083

1086-
is_snippet = val in self.bot.snippets
1084+
is_snippet = val in self.bot.snippets
10871085

10881086
if not self.bot.get_command(linked_command) and not is_snippet:
10891087
alias_command = self.bot.aliases.get(linked_command)

0 commit comments

Comments
 (0)