blizzthewolf/SeaCogs
1
0
Fork 1
forked from cswimr/SeaCogs
Code Pull requests Activity

fix(moderation): galacticbot import loop should no longer be blocking

Browse source
This commit is contained in:
Seaswimmer 2023-12-16 13:35:12 -05:00
parent 59f0375ad5
commit c700782e17
Signed by untrusted user: cswimr
GPG key ID: 1EBC234EEDA901AE
1 changed files with 54 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
moderation/moderation.py
View file

@ -5,6 +5,7 @@
# ____) | __/ (_| \__ \\ V V /| | | | | | | | | | | | __/ | # ____) | __/ (_| \__ \\ V V /| | | | | | | | | | | | __/ |
# |_____/ \___|\__,_|___/ \_/\_/ |_|_| |_| |_|_| |_| |_|\___|_| # |_____/ \___|\__,_|___/ \_/\_/ |_|_| |_| |_|_| |_| |_|\___|_|
import asyncio
import logging import logging
import json import json
import time import time
@ -1734,8 +1735,11 @@ class Moderation(commands.Cog):
'BAN', 'BAN',
'UNBAN' 'UNBAN'
] ]
file = await self.ctx.message.attachments[0].read() file = await self.ctx.message.attachments[0].read()
data = sorted(json.loads(file), key=lambda x: x['case']) data = sorted(json.loads(file), key=lambda x: x['case'])
async def process_case(case, accepted_types):
for case in data: for case in data:
if case['type'] not in accepted_types: if case['type'] not in accepted_types:
continue continue
@ -1744,7 +1748,7 @@ class Moderation(commands.Cog):
if case['duration']: if case['duration']:
try: try:
duration = timedelta(seconds=round(float(case['duration']) / 1000)) duration = timedelta(seconds=round(case['duration']) / 1000)
except OverflowError: except OverflowError:
continue continue
@ -1790,6 +1794,8 @@ class Moderation(commands.Cog):
await interaction.edit_original_response(content="Import complete.") await interaction.edit_original_response(content="Import complete.")
await asyncio.gather(*[process_case(case, accepted_types) for case in data])
@discord.ui.button(label="No", style=discord.ButtonStyle.danger) @discord.ui.button(label="No", style=discord.ButtonStyle.danger)
async def import_button_n(self, interaction: discord.Interaction, button: discord.ui.Button): # pylint: disable=unused-argument async def import_button_n(self, interaction: discord.Interaction, button: discord.ui.Button): # pylint: disable=unused-argument
await self.message.edit("Import cancelled.", view=None) await self.message.edit("Import cancelled.", view=None)