Skip to content

Commit ea40871

Browse files
committed
Add return statements, make 500 character reason message consistent
1 parent 19cb032 commit ea40871

1 file changed

Lines changed: 14 additions & 6 deletions

File tree

techsupport_bot/commands/moderator.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ async def handle_ban_user(
9696
message="Ban reason must be under 500 characters"
9797
)
9898
await interaction.response.send_message(embed=embed)
99+
return
99100

100101
is_banned = await moderation.check_if_user_banned(target, interaction.guild)
101102
if is_banned:
@@ -168,6 +169,7 @@ async def handle_unban_user(
168169
message="Unban reason must be under 500 characters"
169170
)
170171
await interaction.response.send_message(embed=embed)
172+
return
171173

172174
is_banned = await moderation.check_if_user_banned(target, interaction.guild)
173175

@@ -232,9 +234,10 @@ async def handle_kick_user(
232234

233235
if len(reason) > 500:
234236
embed = auxiliary.prepare_deny_embed(
235-
message="Reason length is capped at 500 characters"
237+
message="Kick reason must be under 500 characters"
236238
)
237239
await interaction.response.send_message(embed=embed)
240+
return
238241

239242
result = await moderation.kick_user(
240243
guild=interaction.guild,
@@ -288,9 +291,10 @@ async def handle_mute_user(
288291

289292
if len(reason) > 500:
290293
embed = auxiliary.prepare_deny_embed(
291-
message="Mute reason must be below 500 characters"
294+
message="Mute reason must be under 500 characters"
292295
)
293296
await interaction.response.send_message(embed=embed)
297+
return
294298

295299
# The API prevents administrators from being timed out. Check it here
296300
if target.guild_permissions.administrator:
@@ -399,9 +403,10 @@ async def handle_unmute_user(
399403

400404
if len(reason) > 500:
401405
embed = auxiliary.prepare_deny_embed(
402-
message="Unmute reason must be below 500 characters"
406+
message="Unmute reason must be under 500 characters"
403407
)
404408
await interaction.response.send_message(embed=embed)
409+
return
405410

406411
if not target.timed_out_until:
407412
embed = auxiliary.prepare_deny_embed(
@@ -459,9 +464,10 @@ async def handle_warn_user(
459464

460465
if len(reason) > 500:
461466
embed = auxiliary.prepare_deny_embed(
462-
message="Warn reason must be below 500 characters"
467+
message="Warn reason must be under 500 characters"
463468
)
464469
await interaction.response.send_message(embed=embed)
470+
return
465471

466472
if target not in interaction.channel.members:
467473
embed = auxiliary.prepare_deny_embed(
@@ -594,9 +600,10 @@ async def handle_unwarn_user(
594600

595601
if len(reason) > 500:
596602
embed = auxiliary.prepare_deny_embed(
597-
message="Unwarn reason must be below 500 characters"
603+
message="Unwarn reason must be under 500 characters"
598604
)
599605
await interaction.response.send_message(embed=embed)
606+
return
600607

601608
database_warning = await self.get_warning(user=target, warning=warning)
602609

@@ -657,9 +664,10 @@ async def handle_warning_clear(
657664

658665
if len(reason) > 500:
659666
embed = auxiliary.prepare_deny_embed(
660-
message="Reason must be below 500 characters"
667+
message="Reason must be under 500 characters"
661668
)
662669
await interaction.response.send_message(embed=embed)
670+
return
663671

664672
warnings = await moderation.get_all_warnings(
665673
self.bot, target, interaction.guild

0 commit comments

Comments
 (0)