diff --git a/aurora/importers/aurora.py b/aurora/importers/aurora.py index 67e9ad3..9c85056 100644 --- a/aurora/importers/aurora.py +++ b/aurora/importers/aurora.py @@ -19,6 +19,7 @@ class ImportAuroraView(ui.View): async def import_button_y( self, interaction: Interaction, button: ui.Button ): # pylint: disable=unused-argument + # pylint: disable=duplicate-code await self.message.delete() await interaction.response.send_message( "Deleting original table...", ephemeral=True @@ -68,10 +69,8 @@ class ImportAuroraView(ui.View): metadata = {} else: metadata: Dict[str, any] = json.loads(case["metadata"]) - if not metadata.get('imported_from'): - metadata.update({ - 'imported_from': 'Aurora' - }) + if not metadata.get("imported_from"): + metadata.update({"imported_from": "Aurora"}) if case["duration"] != "NULL": hours, minutes, seconds = map(int, case["duration"].split(":")) @@ -101,7 +100,9 @@ class ImportAuroraView(ui.View): await interaction.edit_original_response(content="Import complete.") if failed_cases: await interaction.edit_original_response( - content="Import complete.\n" + warning("Failed to import the following cases:\n") + box(failed_cases) + content="Import complete.\n" + + warning("Failed to import the following cases:\n") + + box(failed_cases) ) @ui.button(label="No", style=ButtonStyle.danger) diff --git a/aurora/importers/galacticbot.py b/aurora/importers/galacticbot.py index 5d254c1..e76e423 100644 --- a/aurora/importers/galacticbot.py +++ b/aurora/importers/galacticbot.py @@ -15,9 +15,14 @@ class ImportGalacticBotView(ui.View): self.message: Message = message @ui.button(label="Yes", style=ButtonStyle.success) - async def import_button_y(self, interaction: Interaction, button: ui.Button): # pylint: disable=unused-argument + async def import_button_y( + self, interaction: Interaction, button: ui.Button + ): # pylint: disable=unused-argument + # pylint: disable=duplicate-code await self.message.delete() - await interaction.response.send_message("Deleting original table...", ephemeral=True) + await interaction.response.send_message( + "Deleting original table...", ephemeral=True + ) database = connect() cursor = database.cursor() @@ -35,94 +40,94 @@ class ImportGalacticBotView(ui.View): await interaction.edit_original_response(content="Importing moderations...") accepted_types = [ - 'NOTE', - 'WARN', - 'MUTE', - 'UNMUTE', - 'KICK', - 'SOFTBAN', - 'BAN', - 'UNBAN', - 'SLOWMODE', - 'LOCKDOWN' + "NOTE", + "WARN", + "MUTE", + "UNMUTE", + "KICK", + "SOFTBAN", + "BAN", + "UNBAN", + "SLOWMODE", + "LOCKDOWN", ] 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"]) failed_cases = [] for case in data: - if case['type'] not in accepted_types: + if case["type"] not in accepted_types: continue - timestamp = round(case['timestamp'] / 1000) + timestamp = round(case["timestamp"] / 1000) try: - if case['duration'] is not None and float(case['duration']) != 0: - duration = timedelta(seconds=round(float(case['duration']) / 1000)) + if case["duration"] is not None and float(case["duration"]) != 0: + duration = timedelta(seconds=round(float(case["duration"]) / 1000)) else: - duration = 'NULL' + duration = "NULL" except OverflowError: - failed_cases.append(case['case']) + failed_cases.append(case["case"]) continue - metadata = { - 'imported_from': 'GalacticBot' - } + metadata = {"imported_from": "GalacticBot"} - if case['type'] == 'SLOWMODE': - metadata['seconds'] = case['data']['seconds'] + if case["type"] == "SLOWMODE": + metadata["seconds"] = case["data"]["seconds"] - if case['resolved']: + if case["resolved"]: resolved = 1 resolved_by = None resolved_reason = None resolved_timestamp = None - if case['changes']: - for change in case['changes']: - if change['type'] == 'RESOLVE': - resolved_by = change['staff'] - resolved_reason = change['reason'] - resolved_timestamp = round(change['timestamp'] / 1000) + if case["changes"]: + for change in case["changes"]: + if change["type"] == "RESOLVE": + resolved_by = change["staff"] + resolved_reason = change["reason"] + resolved_timestamp = round(change["timestamp"] / 1000) break if resolved_by is None: - resolved_by = '?' + resolved_by = "?" if resolved_reason is None: - resolved_reason = 'Could not get resolve reason during moderation import.' + resolved_reason = ( + "Could not get resolve reason during moderation import." + ) if resolved_timestamp is None: resolved_timestamp = timestamp changes = [ { - 'type': "ORIGINAL", - 'reason': case['reason'], - 'user_id': case['executor'], - 'timestamp': timestamp + "type": "ORIGINAL", + "reason": case["reason"], + "user_id": case["executor"], + "timestamp": timestamp, }, { - 'type': "RESOLVE", - 'reason': resolved_reason, - 'user_id': resolved_by, - 'timestamp': resolved_timestamp - } + "type": "RESOLVE", + "reason": resolved_reason, + "user_id": resolved_by, + "timestamp": resolved_timestamp, + }, ] else: resolved = 0 - resolved_by = 'NULL' - resolved_reason = 'NULL' + resolved_by = "NULL" + resolved_reason = "NULL" changes = [] - if case['reason'] and case['reason'] != "N/A": - reason = case['reason'] + if case["reason"] and case["reason"] != "N/A": + reason = case["reason"] else: reason = "NULL" await mysql_log( self.ctx.guild.id, - case['executor'], - case['type'], - case['targetType'], - case['target'], + case["executor"], + case["type"], + case["targetType"], + case["target"], 0, duration, reason, @@ -132,15 +137,21 @@ class ImportGalacticBotView(ui.View): resolved_reason=resolved_reason, changes=changes, metadata=metadata, - database=database + database=database, ) await interaction.edit_original_response(content="Import complete.") if failed_cases: - await interaction.edit_original_response(content="Import complete.\n" + warning("Failed to import the following cases:\n") + box(failed_cases)) + await interaction.edit_original_response( + content="Import complete.\n" + + warning("Failed to import the following cases:\n") + + box(failed_cases) + ) @ui.button(label="No", style=ButtonStyle.danger) - async def import_button_n(self, interaction: Interaction, button: ui.Button): # pylint: disable=unused-argument + async def import_button_n( + self, interaction: Interaction, button: ui.Button + ): # pylint: disable=unused-argument await self.message.edit(content="Import cancelled.", view=None) await self.message.delete(10) await self.ctx.message.delete(10)