Skip to content

Commit e44ca3d

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

5 files changed

Lines changed: 12 additions & 20 deletions

File tree

autoroom/autoroom.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ async def on_member_join(self, member: discord.Member) -> None:
381381
perms.update(member, asc["perms"]["deny"])
382382
if perms.modified:
383383
await autoroom_channel.edit(
384-
overwrites=perms.overwrites if perms.overwrites else {},
384+
overwrites=perms.overwrites or {},
385385
reason="AutoRoom: Rejoining user, prevent deny evasion",
386386
)
387387

@@ -441,9 +441,7 @@ async def _process_autoroom_create(
441441
# Generate overwrites
442442
perms = Perms()
443443
dest_perms = dest_category.permissions_for(dest_category.guild.me)
444-
source_overwrites = (
445-
autoroom_source.overwrites if autoroom_source.overwrites else {}
446-
)
444+
source_overwrites = autoroom_source.overwrites or {}
447445
member_roles = self.get_member_roles(autoroom_source)
448446
for target, permissions in source_overwrites.items():
449447
# We can't put manage_roles in overwrites, so just get rid of it
@@ -551,7 +549,7 @@ async def _process_autoroom_create(
551549
category=dest_category,
552550
topic=text_channel_topic,
553551
reason="AutoRoom: New legacy text channel needed.",
554-
overwrites=perms.overwrites if perms.overwrites else {},
552+
overwrites=perms.overwrites or {},
555553
)
556554

557555
await self.config.channel(new_voice_channel).associated_text_channel.set(
@@ -615,7 +613,7 @@ async def _process_autoroom_legacy_text_perms(
615613
# Edit channel if overwrites were modified
616614
if perms.modified:
617615
await legacy_text_channel.edit(
618-
overwrites=perms.overwrites if perms.overwrites else {},
616+
overwrites=perms.overwrites or {},
619617
reason="AutoRoom: Legacy text channel permission update",
620618
)
621619

@@ -820,9 +818,7 @@ def _check_perms_source_dest_optional(
820818
) -> tuple[bool, SettingDisplay | None]:
821819
result = True
822820
checked_perms = {}
823-
source_overwrites = (
824-
autoroom_source.overwrites if autoroom_source.overwrites else {}
825-
)
821+
source_overwrites = autoroom_source.overwrites or {}
826822
for permissions in source_overwrites.values():
827823
# We can't put manage_roles in overwrites, so just get rid of it
828824
# Also get rid of view_channel, connect, and send_messages, as we will be controlling those

autoroom/c_autoroom.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ async def claim(self, ctx: commands.Context) -> None:
250250
perms.update(new_owner, asc["perms"]["owner"])
251251
if perms.modified:
252252
await autoroom_channel.edit(
253-
overwrites=perms.overwrites if perms.overwrites else {},
253+
overwrites=perms.overwrites or {},
254254
reason="AutoRoom: Ownership claimed",
255255
)
256256
await self.config.channel(autoroom_channel).owner.set(new_owner.id)
@@ -268,11 +268,7 @@ async def claim(self, ctx: commands.Context) -> None:
268268
legacy_text_perms.update(new_owner, self.perms_autoroom_owner_legacy_text)
269269
if legacy_text_perms.modified:
270270
await legacy_text_channel.edit(
271-
overwrites=(
272-
legacy_text_perms.overwrites
273-
if legacy_text_perms.overwrites
274-
else {}
275-
),
271+
overwrites=(legacy_text_perms.overwrites or {}),
276272
reason="AutoRoom: Ownership claimed (legacy text channel)",
277273
)
278274

@@ -449,7 +445,7 @@ async def _process_allow_deny(
449445
denied_users.remove(target.id)
450446
if perms.modified:
451447
await autoroom_channel.edit(
452-
overwrites=perms.overwrites if perms.overwrites else {},
448+
overwrites=perms.overwrites or {},
453449
reason="AutoRoom: Permission change",
454450
)
455451
await ctx.tick()

autoroom/c_autoroomset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ async def modify_name_username(
553553
554554
Custom format example:
555555
`{{username}}'s Room{% if dupenum > 1 %} ({{dupenum}}){% endif %}`
556-
""" # noqa: D401
556+
"""
557557
await self._save_room_name(ctx, autoroom_source, "username")
558558

559559
@modify_name.command(name="game")

bancheck/bancheck.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ async def _user_lookup(
744744
elif response.result == "error":
745745
is_error = True
746746
description += warning(
747-
f"**{response.service}:** Error - {response.reason if response.reason else 'No reason given'}\n"
747+
f"**{response.service}:** Error - {response.reason or 'No reason given'}\n"
748748
)
749749

750750
else:

reactchannel/reactchannel.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -784,8 +784,8 @@ async def emoji(self, ctx: commands.Context) -> None:
784784
if not ctx.invoked_subcommand:
785785
upvote = await self._get_emoji(ctx.guild, "upvote")
786786
downvote = await self._get_emoji(ctx.guild, "downvote")
787-
message = f"Upvote emoji: {upvote if upvote else 'None'}\n"
788-
message += f"Downvote emoji: {downvote if downvote else 'None'}"
787+
message = f"Upvote emoji: {upvote or 'None'}\n"
788+
message += f"Downvote emoji: {downvote or 'None'}"
789789
await ctx.send(message)
790790

791791
@emoji.command(name="upvote")

0 commit comments

Comments
 (0)