fix(aurora): bandaid fixes so pylint passes
these are not good changes in the slightest and are only here because pylint is failing otherwise, you should really be using aurora v3 instead of v2 even though it's in development
This commit is contained in:
parent
cc1745a9d2
commit
336e01456c
2 changed files with 244 additions and 323 deletions
|
@ -75,7 +75,9 @@ async def message_factory(
|
|||
|
||||
if await config.guild(guild).show_moderator() and moderator is not None:
|
||||
embed.add_field(
|
||||
name="Moderator", value=f"`{moderator.name} ({moderator.id})`", inline=False
|
||||
name="Moderator",
|
||||
value=f"`{moderator.name} ({moderator.id})`",
|
||||
inline=False,
|
||||
)
|
||||
|
||||
embed.add_field(name="Reason", value=f"`{reason}`", inline=False)
|
||||
|
@ -94,7 +96,9 @@ async def message_factory(
|
|||
|
||||
|
||||
async def log_factory(
|
||||
interaction: Interaction, case_dict: dict, resolved: bool = False
|
||||
interaction: Interaction,
|
||||
case_dict: dict,
|
||||
resolved: bool = False,
|
||||
) -> Embed:
|
||||
"""This function creates a log embed from set parameters, meant for moderation logging.
|
||||
|
||||
|
@ -103,14 +107,11 @@ async def log_factory(
|
|||
case_dict (dict): The case dictionary.
|
||||
resolved (bool, optional): Whether the case is resolved or not. Defaults to False.
|
||||
"""
|
||||
target_name = ""
|
||||
if resolved:
|
||||
if case_dict["target_type"] == "USER":
|
||||
target_user = await fetch_user_dict(interaction.client, case_dict["target_id"])
|
||||
target_name = (
|
||||
f"`{target_user['name']}`"
|
||||
if target_user["discriminator"] == "0"
|
||||
else f"`{target_user['name']}#{target_user['discriminator']}`"
|
||||
)
|
||||
target_name = f"`{target_user['name']}`" if target_user["discriminator"] == "0" else f"`{target_user['name']}#{target_user['discriminator']}`"
|
||||
elif case_dict["target_type"] == "CHANNEL":
|
||||
target_user = await fetch_channel_dict(interaction.guild, case_dict["target_id"])
|
||||
if target_user["mention"]:
|
||||
|
@ -119,11 +120,7 @@ async def log_factory(
|
|||
target_name = f"`{target_user['name']}`"
|
||||
|
||||
moderator_user = await fetch_user_dict(interaction.client, case_dict["moderator_id"])
|
||||
moderator_name = (
|
||||
f"`{moderator_user['name']}`"
|
||||
if moderator_user["discriminator"] == "0"
|
||||
else f"`{moderator_user['name']}#{moderator_user['discriminator']}`"
|
||||
)
|
||||
moderator_name = f"`{moderator_user['name']}`" if moderator_user["discriminator"] == "0" else f"`{moderator_user['name']}#{moderator_user['discriminator']}`"
|
||||
|
||||
embed = Embed(
|
||||
title=f"📕 Case #{case_dict['moderation_id']:,} Resolved",
|
||||
|
@ -140,40 +137,24 @@ async def log_factory(
|
|||
["hours", "minutes", "seconds"],
|
||||
case_dict["duration"].split(":"),
|
||||
)
|
||||
}
|
||||
)
|
||||
duration_embed = (
|
||||
f"{humanize_timedelta(timedelta=td)} | <t:{case_dict['end_timestamp']}:R>"
|
||||
if case_dict["expired"] == "0"
|
||||
else str(humanize_timedelta(timedelta=td))
|
||||
)
|
||||
embed.description = (
|
||||
embed.description
|
||||
+ f"\n**Duration:** {duration_embed}\n**Expired:** {bool(case_dict['expired'])}"
|
||||
},
|
||||
)
|
||||
duration_embed = f"{humanize_timedelta(timedelta=td)} | <t:{case_dict['end_timestamp']}:R>" if case_dict["expired"] == "0" else str(humanize_timedelta(timedelta=td))
|
||||
embed.description = embed.description + f"\n**Duration:** {duration_embed}\n**Expired:** {bool(case_dict['expired'])}"
|
||||
|
||||
embed.add_field(name="Reason", value=box(case_dict["reason"]), inline=False)
|
||||
|
||||
resolved_user = await fetch_user_dict(interaction.client, case_dict["resolved_by"])
|
||||
resolved_name = (
|
||||
resolved_user["name"]
|
||||
if resolved_user["discriminator"] == "0"
|
||||
else f"{resolved_user['name']}#{resolved_user['discriminator']}"
|
||||
)
|
||||
resolved_name = resolved_user["name"] if resolved_user["discriminator"] == "0" else f"{resolved_user['name']}#{resolved_user['discriminator']}"
|
||||
embed.add_field(
|
||||
name="Resolve Reason",
|
||||
value=f"Resolved by `{resolved_name}` ({resolved_user['id']}) for:\n"
|
||||
+ box(case_dict["resolve_reason"]),
|
||||
value=f"Resolved by `{resolved_name}` ({resolved_user['id']}) for:\n" + box(case_dict["resolve_reason"]),
|
||||
inline=False,
|
||||
)
|
||||
else:
|
||||
if case_dict["target_type"] == "USER":
|
||||
target_user = await fetch_user_dict(interaction.client, case_dict["target_id"])
|
||||
target_name = (
|
||||
f"`{target_user['name']}`"
|
||||
if target_user["discriminator"] == "0"
|
||||
else f"`{target_user['name']}#{target_user['discriminator']}`"
|
||||
)
|
||||
target_name = f"`{target_user['name']}`" if target_user["discriminator"] == "0" else f"`{target_user['name']}#{target_user['discriminator']}`"
|
||||
elif case_dict["target_type"] == "CHANNEL":
|
||||
target_user = await fetch_channel_dict(interaction.guild, case_dict["target_id"])
|
||||
if target_user["mention"]:
|
||||
|
@ -182,11 +163,7 @@ async def log_factory(
|
|||
target_name = f"`{target_user['name']}`"
|
||||
|
||||
moderator_user = await fetch_user_dict(interaction.client, case_dict["moderator_id"])
|
||||
moderator_name = (
|
||||
f"`{moderator_user['name']}`"
|
||||
if moderator_user["discriminator"] == "0"
|
||||
else f"`{moderator_user['name']}#{moderator_user['discriminator']}`"
|
||||
)
|
||||
moderator_name = f"`{moderator_user['name']}`" if moderator_user["discriminator"] == "0" else f"`{moderator_user['name']}#{moderator_user['discriminator']}`"
|
||||
|
||||
embed = Embed(
|
||||
title=f"📕 Case #{case_dict['moderation_id']:,}",
|
||||
|
@ -202,12 +179,9 @@ async def log_factory(
|
|||
["hours", "minutes", "seconds"],
|
||||
case_dict["duration"].split(":"),
|
||||
)
|
||||
}
|
||||
)
|
||||
embed.description = (
|
||||
embed.description
|
||||
+ f"\n**Duration:** {humanize_timedelta(timedelta=td)} | <t:{case_dict['end_timestamp']}:R>"
|
||||
},
|
||||
)
|
||||
embed.description = embed.description + f"\n**Duration:** {humanize_timedelta(timedelta=td)} | <t:{case_dict['end_timestamp']}:R>"
|
||||
|
||||
embed.add_field(name="Reason", value=box(case_dict["reason"]), inline=False)
|
||||
return embed
|
||||
|
@ -220,13 +194,10 @@ async def case_factory(interaction: Interaction, case_dict: dict) -> Embed:
|
|||
interaction (Interaction): The interaction object.
|
||||
case_dict (dict): The case dictionary.
|
||||
"""
|
||||
target_name = ""
|
||||
if case_dict["target_type"] == "USER":
|
||||
target_user = await fetch_user_dict(interaction.client, case_dict["target_id"])
|
||||
target_name = (
|
||||
f"`{target_user['name']}`"
|
||||
if target_user["discriminator"] == "0"
|
||||
else f"`{target_user['name']}#{target_user['discriminator']}`"
|
||||
)
|
||||
target_name = f"`{target_user['name']}`" if target_user["discriminator"] == "0" else f"`{target_user['name']}#{target_user['discriminator']}`"
|
||||
elif case_dict["target_type"] == "CHANNEL":
|
||||
target_user = await fetch_channel_dict(interaction.guild, case_dict["target_id"])
|
||||
if target_user["mention"]:
|
||||
|
@ -235,11 +206,7 @@ async def case_factory(interaction: Interaction, case_dict: dict) -> Embed:
|
|||
target_name = f"`{target_user['name']}`"
|
||||
|
||||
moderator_user = await fetch_user_dict(interaction.client, case_dict["moderator_id"])
|
||||
moderator_name = (
|
||||
f"`{moderator_user['name']}`"
|
||||
if moderator_user["discriminator"] == "0"
|
||||
else f"`{moderator_user['name']}#{moderator_user['discriminator']}`"
|
||||
)
|
||||
moderator_name = f"`{moderator_user['name']}`" if moderator_user["discriminator"] == "0" else f"`{moderator_user['name']}#{moderator_user['discriminator']}`"
|
||||
|
||||
embed = Embed(
|
||||
title=f"📕 Case #{case_dict['moderation_id']:,}",
|
||||
|
@ -252,41 +219,28 @@ async def case_factory(interaction: Interaction, case_dict: dict) -> Embed:
|
|||
**{
|
||||
unit: int(val)
|
||||
for unit, val in zip(
|
||||
["hours", "minutes", "seconds"], case_dict["duration"].split(":")
|
||||
["hours", "minutes", "seconds"],
|
||||
case_dict["duration"].split(":"),
|
||||
)
|
||||
}
|
||||
)
|
||||
duration_embed = (
|
||||
f"{humanize_timedelta(timedelta=td)} | <t:{case_dict['end_timestamp']}:R>"
|
||||
if bool(case_dict["expired"]) is False
|
||||
else str(humanize_timedelta(timedelta=td))
|
||||
},
|
||||
)
|
||||
duration_embed = f"{humanize_timedelta(timedelta=td)} | <t:{case_dict['end_timestamp']}:R>" if bool(case_dict["expired"]) is False else str(humanize_timedelta(timedelta=td))
|
||||
embed.description += f"\n**Duration:** {duration_embed}\n**Expired:** {bool(case_dict['expired'])}"
|
||||
|
||||
embed.description += (
|
||||
f"\n**Changes:** {len(case_dict['changes']) - 1}"
|
||||
if case_dict["changes"]
|
||||
else "\n**Changes:** 0"
|
||||
)
|
||||
embed.description += f"\n**Changes:** {len(case_dict['changes']) - 1}" if case_dict["changes"] else "\n**Changes:** 0"
|
||||
|
||||
if case_dict["role_id"]:
|
||||
embed.description += f"\n**Role:** <@&{case_dict['role_id']}>"
|
||||
|
||||
if case_dict["metadata"]:
|
||||
if case_dict["metadata"]["imported_from"]:
|
||||
embed.description += (
|
||||
f"\n**Imported From:** {case_dict['metadata']['imported_from']}"
|
||||
)
|
||||
embed.description += f"\n**Imported From:** {case_dict['metadata']['imported_from']}"
|
||||
|
||||
embed.add_field(name="Reason", value=box(case_dict["reason"]), inline=False)
|
||||
|
||||
if case_dict["resolved"] == 1:
|
||||
resolved_user = await fetch_user_dict(interaction.client, case_dict["resolved_by"])
|
||||
resolved_name = (
|
||||
f"`{resolved_user['name']}`"
|
||||
if resolved_user["discriminator"] == "0"
|
||||
else f"`{resolved_user['name']}#{resolved_user['discriminator']}`"
|
||||
)
|
||||
resolved_name = f"`{resolved_user['name']}`" if resolved_user["discriminator"] == "0" else f"`{resolved_user['name']}#{resolved_user['discriminator']}`"
|
||||
embed.add_field(
|
||||
name="Resolve Reason",
|
||||
value=f"Resolved by {resolved_name} ({resolved_user['id']}) for:\n{box(case_dict['resolve_reason'])}",
|
||||
|
@ -314,15 +268,12 @@ async def changes_factory(interaction: Interaction, case_dict: dict) -> Embed:
|
|||
for change in case_dict["changes"]:
|
||||
if change["user_id"] not in memory_dict:
|
||||
memory_dict[str(change["user_id"])] = await fetch_user_dict(
|
||||
interaction.client, change["user_id"]
|
||||
interaction.client,
|
||||
change["user_id"],
|
||||
)
|
||||
|
||||
user = memory_dict[str(change["user_id"])]
|
||||
name = (
|
||||
user["name"]
|
||||
if user["discriminator"] == "0"
|
||||
else f"{user['name']}#{user['discriminator']}"
|
||||
)
|
||||
name = user["name"] if user["discriminator"] == "0" else f"{user['name']}#{user['discriminator']}"
|
||||
|
||||
timestamp = f"<t:{change['timestamp']}> | <t:{change['timestamp']}:R>"
|
||||
|
||||
|
@ -360,24 +311,17 @@ async def evidenceformat_factory(interaction: Interaction, case_dict: dict) -> s
|
|||
interaction (Interaction): The interaction object.
|
||||
case_dict (dict): The case dictionary.
|
||||
"""
|
||||
target_name = ""
|
||||
if case_dict["target_type"] == "USER":
|
||||
target_user = await fetch_user_dict(interaction.client, case_dict["target_id"])
|
||||
target_name = (
|
||||
target_user["name"]
|
||||
if target_user["discriminator"] == "0"
|
||||
else f"{target_user['name']}#{target_user['discriminator']}"
|
||||
)
|
||||
target_name = target_user["name"] if target_user["discriminator"] == "0" else f"{target_user['name']}#{target_user['discriminator']}"
|
||||
|
||||
elif case_dict["target_type"] == "CHANNEL":
|
||||
target_user = await fetch_channel_dict(interaction.guild, case_dict["target_id"])
|
||||
target_name = target_user["name"]
|
||||
|
||||
moderator_user = await fetch_user_dict(interaction.client, case_dict["moderator_id"])
|
||||
moderator_name = (
|
||||
moderator_user["name"]
|
||||
if moderator_user["discriminator"] == "0"
|
||||
else f"{moderator_user['name']}#{moderator_user['discriminator']}"
|
||||
)
|
||||
moderator_name = moderator_user["name"] if moderator_user["discriminator"] == "0" else f"{moderator_user['name']}#{moderator_user['discriminator']}"
|
||||
|
||||
content = f"Case: {case_dict['moderation_id']:,} ({str.title(case_dict['moderation_type'])})\nTarget: {target_name} ({target_user['id']})\nModerator: {moderator_name} ({moderator_user['id']})"
|
||||
|
||||
|
@ -419,17 +363,11 @@ async def overrides_embed(ctx: commands.Context) -> Embed:
|
|||
}
|
||||
|
||||
override_str = [
|
||||
"- "
|
||||
+ bold("Auto Evidence Format: ")
|
||||
+ get_bool_emoji(override_settings["auto_evidenceformat"]),
|
||||
"- " + bold("Auto Evidence Format: ") + get_bool_emoji(override_settings["auto_evidenceformat"]),
|
||||
"- " + bold("Ephemeral: ") + get_bool_emoji(override_settings["ephemeral"]),
|
||||
"- " + bold("History Inline: ") + get_bool_emoji(override_settings["inline"]),
|
||||
"- "
|
||||
+ bold("History Inline Pagesize: ")
|
||||
+ get_pagesize_str(override_settings["inline_pagesize"]),
|
||||
"- "
|
||||
+ bold("History Pagesize: ")
|
||||
+ get_pagesize_str(override_settings["pagesize"]),
|
||||
"- " + bold("History Inline Pagesize: ") + get_pagesize_str(override_settings["inline_pagesize"]),
|
||||
"- " + bold("History Pagesize: ") + get_pagesize_str(override_settings["pagesize"]),
|
||||
]
|
||||
override_str = "\n".join(override_str)
|
||||
|
||||
|
@ -451,7 +389,7 @@ async def guild_embed(ctx: commands.Context) -> Embed:
|
|||
guild_settings = {
|
||||
"show_moderator": await config.guild(ctx.guild).show_moderator(),
|
||||
"use_discord_permissions": await config.guild(
|
||||
ctx.guild
|
||||
ctx.guild,
|
||||
).use_discord_permissions(),
|
||||
"ignore_modlog": await config.guild(ctx.guild).ignore_modlog(),
|
||||
"ignore_other_bots": await config.guild(ctx.guild).ignore_other_bots(),
|
||||
|
@ -461,7 +399,7 @@ async def guild_embed(ctx: commands.Context) -> Embed:
|
|||
"history_inline": await config.guild(ctx.guild).history_inline(),
|
||||
"history_pagesize": await config.guild(ctx.guild).history_pagesize(),
|
||||
"history_inline_pagesize": await config.guild(
|
||||
ctx.guild
|
||||
ctx.guild,
|
||||
).history_inline_pagesize(),
|
||||
"auto_evidenceformat": await config.guild(ctx.guild).auto_evidenceformat(),
|
||||
"respect_hierarchy": await config.guild(ctx.guild).respect_hierarchy(),
|
||||
|
@ -474,37 +412,17 @@ async def guild_embed(ctx: commands.Context) -> Embed:
|
|||
channel = channel.mention
|
||||
|
||||
guild_str = [
|
||||
"- "
|
||||
+ bold("Show Moderator: ")
|
||||
+ get_bool_emoji(guild_settings["show_moderator"]),
|
||||
"- "
|
||||
+ bold("Use Discord Permissions: ")
|
||||
+ get_bool_emoji(guild_settings["use_discord_permissions"]),
|
||||
"- "
|
||||
+ bold("Respect Hierarchy: ")
|
||||
+ get_bool_emoji(guild_settings["respect_hierarchy"]),
|
||||
"- "
|
||||
+ bold("Ignore Modlog: ")
|
||||
+ get_bool_emoji(guild_settings["ignore_modlog"]),
|
||||
"- "
|
||||
+ bold("Ignore Other Bots: ")
|
||||
+ get_bool_emoji(guild_settings["ignore_other_bots"]),
|
||||
"- " + bold("Show Moderator: ") + get_bool_emoji(guild_settings["show_moderator"]),
|
||||
"- " + bold("Use Discord Permissions: ") + get_bool_emoji(guild_settings["use_discord_permissions"]),
|
||||
"- " + bold("Respect Hierarchy: ") + get_bool_emoji(guild_settings["respect_hierarchy"]),
|
||||
"- " + bold("Ignore Modlog: ") + get_bool_emoji(guild_settings["ignore_modlog"]),
|
||||
"- " + bold("Ignore Other Bots: ") + get_bool_emoji(guild_settings["ignore_other_bots"]),
|
||||
"- " + bold("DM Users: ") + get_bool_emoji(guild_settings["dm_users"]),
|
||||
"- "
|
||||
+ bold("Auto Evidence Format: ")
|
||||
+ get_bool_emoji(guild_settings["auto_evidenceformat"]),
|
||||
"- "
|
||||
+ bold("Ephemeral: ")
|
||||
+ get_bool_emoji(guild_settings["history_ephemeral"]),
|
||||
"- "
|
||||
+ bold("History Inline: ")
|
||||
+ get_bool_emoji(guild_settings["history_inline"]),
|
||||
"- "
|
||||
+ bold("History Pagesize: ")
|
||||
+ get_pagesize_str(guild_settings["history_pagesize"]),
|
||||
"- "
|
||||
+ bold("History Inline Pagesize: ")
|
||||
+ get_pagesize_str(guild_settings["history_inline_pagesize"]),
|
||||
"- " + bold("Auto Evidence Format: ") + get_bool_emoji(guild_settings["auto_evidenceformat"]),
|
||||
"- " + bold("Ephemeral: ") + get_bool_emoji(guild_settings["history_ephemeral"]),
|
||||
"- " + bold("History Inline: ") + get_bool_emoji(guild_settings["history_inline"]),
|
||||
"- " + bold("History Pagesize: ") + get_pagesize_str(guild_settings["history_pagesize"]),
|
||||
"- " + bold("History Inline Pagesize: ") + get_pagesize_str(guild_settings["history_inline_pagesize"]),
|
||||
"- " + bold("Log Channel: ") + channel,
|
||||
]
|
||||
guild_str = "\n".join(guild_str)
|
||||
|
@ -528,17 +446,21 @@ async def addrole_embed(ctx: commands.Context) -> Embed:
|
|||
for role in whitelist:
|
||||
evalulated_role = ctx.guild.get_role(role) or error(f"`{role}` (Not Found)")
|
||||
if isinstance(evalulated_role, Role):
|
||||
roles.append({
|
||||
"id": evalulated_role.id,
|
||||
"mention": evalulated_role.mention,
|
||||
"position": evalulated_role.position
|
||||
})
|
||||
roles.append(
|
||||
{
|
||||
"id": evalulated_role.id,
|
||||
"mention": evalulated_role.mention,
|
||||
"position": evalulated_role.position,
|
||||
}
|
||||
)
|
||||
else:
|
||||
roles.append({
|
||||
"id": role,
|
||||
"mention": error(f"`{role}` (Not Found)"),
|
||||
"position": 0
|
||||
})
|
||||
roles.append(
|
||||
{
|
||||
"id": role,
|
||||
"mention": error(f"`{role}` (Not Found)"),
|
||||
"position": 0,
|
||||
}
|
||||
)
|
||||
|
||||
if roles:
|
||||
roles = sorted(roles, key=lambda x: x["position"], reverse=True)
|
||||
|
@ -549,9 +471,7 @@ async def addrole_embed(ctx: commands.Context) -> Embed:
|
|||
|
||||
e = await _config(ctx)
|
||||
e.title += ": Addrole Whitelist"
|
||||
e.description = (
|
||||
"Use the select menu below to manage this guild's addrole whitelist."
|
||||
)
|
||||
e.description = "Use the select menu below to manage this guild's addrole whitelist."
|
||||
|
||||
if len(whitelist_str) > 4000 and len(whitelist_str) < 5000:
|
||||
lines = whitelist_str.split("\n")
|
||||
|
@ -581,17 +501,21 @@ async def immune_embed(ctx: commands.Context) -> Embed:
|
|||
for role in immune_roles:
|
||||
evalulated_role = ctx.guild.get_role(role) or error(f"`{role}` (Not Found)")
|
||||
if isinstance(evalulated_role, Role):
|
||||
roles.append({
|
||||
"id": evalulated_role.id,
|
||||
"mention": evalulated_role.mention,
|
||||
"position": evalulated_role.position
|
||||
})
|
||||
roles.append(
|
||||
{
|
||||
"id": evalulated_role.id,
|
||||
"mention": evalulated_role.mention,
|
||||
"position": evalulated_role.position,
|
||||
}
|
||||
)
|
||||
else:
|
||||
roles.append({
|
||||
"id": role,
|
||||
"mention": error(f"`{role}` (Not Found)"),
|
||||
"position": 0
|
||||
})
|
||||
roles.append(
|
||||
{
|
||||
"id": role,
|
||||
"mention": error(f"`{role}` (Not Found)"),
|
||||
"position": 0,
|
||||
}
|
||||
)
|
||||
|
||||
if roles:
|
||||
roles = sorted(roles, key=lambda x: x["position"], reverse=True)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue