CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-22 18:57:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused try except blocks in modlog.create_case() usage (#4095)

Browse Source
This commit is contained in:
jack1142
2020-08-05 20:40:52 +02:00
committed by GitHub
parent 0cc04706f6
commit 6cef336417
4 changed files with 199 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
redbot/cogs/mod/kickban.py
View File

@@ -116,23 +116,17 @@ class KickBanMixin(MixinMeta):
return _("An unexpected error occurred.")
if create_modlog_case:
try:
await modlog.create_case(
self.bot,
guild,
ctx.message.created_at,
"ban",
user,
author,
reason,
until=None,
channel=None,
)
except RuntimeError as e:
return _(
"The user was banned but an error occurred when trying to "
"create the modlog entry: {reason}"
).format(reason=e)
await modlog.create_case(
self.bot,
guild,
ctx.message.created_at,
"ban",
user,
author,
reason,
until=None,
channel=None,
)
return True
@@ -230,20 +224,17 @@ class KickBanMixin(MixinMeta):
)
)
else:
try:
await modlog.create_case(
self.bot,
guild,
ctx.message.created_at,
"kick",
user,
author,
reason,
until=None,
channel=None,
)
except RuntimeError as e:
await ctx.send(e)
await modlog.create_case(
self.bot,
guild,
ctx.message.created_at,
"kick",
user,
author,
reason,
until=None,
channel=None,
)
await ctx.send(_("Done. That felt good."))
@commands.command()
@@ -415,20 +406,17 @@ class KickBanMixin(MixinMeta):
else:
banned.append(user_id)
try:
await modlog.create_case(
self.bot,
guild,
ctx.message.created_at,
"hackban",
user_id,
author,
reason,
until=None,
channel=None,
)
except RuntimeError as e:
errors["0"] = _("Failed to create modlog case: {reason}").format(reason=e)
await modlog.create_case(
self.bot,
guild,
ctx.message.created_at,
"hackban",
user_id,
author,
reason,
until=None,
channel=None,
)
await show_results()
@commands.command()
@@ -499,19 +487,16 @@ class KickBanMixin(MixinMeta):
except discord.HTTPException:
await ctx.send(_("Something went wrong while banning."))
else:
try:
await modlog.create_case(
self.bot,
guild,
ctx.message.created_at,
"tempban",
user,
author,
reason,
unban_time,
)
except RuntimeError as e:
await ctx.send(e)
await modlog.create_case(
self.bot,
guild,
ctx.message.created_at,
"tempban",
user,
author,
reason,
unban_time,
)
await ctx.send(_("Done. Enough chaos for now."))
@commands.command()
@@ -585,20 +570,17 @@ class KickBanMixin(MixinMeta):
"{}({}) softbanned {}({}), deleting 1 day worth "
"of messages.".format(author.name, author.id, user.name, user.id)
)
try:
await modlog.create_case(
self.bot,
guild,
ctx.message.created_at,
"softban",
user,
author,
reason,
until=None,
channel=None,
)
except RuntimeError as e:
await ctx.send(e)
await modlog.create_case(
self.bot,
guild,
ctx.message.created_at,
"softban",
user,
author,
reason,
until=None,
channel=None,
)
await ctx.send(_("Done. Enough chaos."))
@commands.command()
@@ -635,20 +617,17 @@ class KickBanMixin(MixinMeta):
await ctx.send(_("Something went wrong while attempting to kick that member."))
return
else:
try:
await modlog.create_case(
self.bot,
guild,
ctx.message.created_at,
"vkick",
member,
author,
reason,
until=None,
channel=case_channel,
)
except RuntimeError as e:
await ctx.send(e)
await modlog.create_case(
self.bot,
guild,
ctx.message.created_at,
"vkick",
member,
author,
reason,
until=None,
channel=case_channel,
)
@commands.command()
@commands.guild_only()
@@ -677,20 +656,17 @@ class KickBanMixin(MixinMeta):
await ctx.send(_("Something went wrong while attempting to unban that user."))
return
else:
try:
await modlog.create_case(
self.bot,
guild,
ctx.message.created_at,
"unban",
user,
author,
reason,
until=None,
channel=None,
)
except RuntimeError as e:
await ctx.send(e)
await modlog.create_case(
self.bot,
guild,
ctx.message.created_at,
"unban",
user,
author,
reason,
until=None,
channel=None,
)
await ctx.send(_("Unbanned that user from this server."))
if await self.config.guild(guild).reinvite_on_unban():