fix(aurora): ignore moderations with the id 0 in the history command
This commit is contained in:
parent
f8968e8e9e
commit
d7a8fbe367
1 changed files with 17 additions and 10 deletions
|
@ -20,7 +20,8 @@ from redbot.core import app_commands, commands, data_manager
|
||||||
from redbot.core.app_commands import Choice
|
from redbot.core.app_commands import Choice
|
||||||
from redbot.core.bot import Red
|
from redbot.core.bot import Red
|
||||||
from redbot.core.commands.converter import parse_relativedelta, parse_timedelta
|
from redbot.core.commands.converter import parse_relativedelta, parse_timedelta
|
||||||
from redbot.core.utils.chat_formatting import box, error, humanize_list, humanize_timedelta, warning
|
from redbot.core.utils.chat_formatting import (box, error, humanize_list,
|
||||||
|
humanize_timedelta, warning)
|
||||||
|
|
||||||
from aurora.importers.aurora import ImportAuroraView
|
from aurora.importers.aurora import ImportAuroraView
|
||||||
from aurora.importers.galacticbot import ImportGalacticBotView
|
from aurora.importers.galacticbot import ImportGalacticBotView
|
||||||
|
@ -30,11 +31,17 @@ from aurora.menus.immune import Immune
|
||||||
from aurora.menus.overrides import Overrides
|
from aurora.menus.overrides import Overrides
|
||||||
from aurora.models import Change, Moderation
|
from aurora.models import Change, Moderation
|
||||||
from aurora.utilities.config import config, register_config
|
from aurora.utilities.config import config, register_config
|
||||||
from aurora.utilities.database import connect, create_guild_table, fetch_case, mysql_log
|
from aurora.utilities.database import (connect, create_guild_table, fetch_case,
|
||||||
from aurora.utilities.factory import addrole_embed, case_factory, changes_factory, evidenceformat_factory, guild_embed, immune_embed, message_factory, overrides_embed
|
mysql_log)
|
||||||
|
from aurora.utilities.factory import (addrole_embed, case_factory,
|
||||||
|
changes_factory, evidenceformat_factory,
|
||||||
|
guild_embed, immune_embed,
|
||||||
|
message_factory, overrides_embed)
|
||||||
from aurora.utilities.json import dump
|
from aurora.utilities.json import dump
|
||||||
from aurora.utilities.logger import logger
|
from aurora.utilities.logger import logger
|
||||||
from aurora.utilities.utils import check_moddable, check_permissions, get_footer_image, log, send_evidenceformat, timedelta_from_relativedelta
|
from aurora.utilities.utils import (check_moddable, check_permissions,
|
||||||
|
get_footer_image, log, send_evidenceformat,
|
||||||
|
timedelta_from_relativedelta)
|
||||||
|
|
||||||
|
|
||||||
class Aurora(commands.Cog):
|
class Aurora(commands.Cog):
|
||||||
|
@ -1098,18 +1105,19 @@ class Aurora(commands.Cog):
|
||||||
if target:
|
if target:
|
||||||
query = f"""SELECT *
|
query = f"""SELECT *
|
||||||
FROM moderation_{interaction.guild.id}
|
FROM moderation_{interaction.guild.id}
|
||||||
WHERE target_id = ?
|
WHERE target_id = ? AND moderation_id != 0
|
||||||
ORDER BY moderation_id DESC;"""
|
ORDER BY moderation_id DESC;"""
|
||||||
cursor.execute(query, (target.id,))
|
cursor.execute(query, (target.id,))
|
||||||
elif moderator:
|
elif moderator:
|
||||||
query = f"""SELECT *
|
query = f"""SELECT *
|
||||||
FROM moderation_{interaction.guild.id}
|
FROM moderation_{interaction.guild.id}
|
||||||
WHERE moderator_id = ?
|
WHERE moderator_id = ? AND moderation_id != 0
|
||||||
ORDER BY moderation_id DESC;"""
|
ORDER BY moderation_id DESC;"""
|
||||||
cursor.execute(query, (moderator.id,))
|
cursor.execute(query, (moderator.id,))
|
||||||
else:
|
else:
|
||||||
query = f"""SELECT *
|
query = f"""SELECT *
|
||||||
FROM moderation_{interaction.guild.id}
|
FROM moderation_{interaction.guild.id}
|
||||||
|
WHERE moderation_id != 0
|
||||||
ORDER BY moderation_id DESC;"""
|
ORDER BY moderation_id DESC;"""
|
||||||
cursor.execute(query)
|
cursor.execute(query)
|
||||||
|
|
||||||
|
@ -1117,7 +1125,6 @@ class Aurora(commands.Cog):
|
||||||
moderation_list: List[Moderation] = []
|
moderation_list: List[Moderation] = []
|
||||||
|
|
||||||
for result in results:
|
for result in results:
|
||||||
if result["moderation_id"] != 0:
|
|
||||||
result.update({"guild_id": interaction.guild.id})
|
result.update({"guild_id": interaction.guild.id})
|
||||||
moderation = Moderation.from_dict(interaction.client, dict(result))
|
moderation = Moderation.from_dict(interaction.client, dict(result))
|
||||||
moderation_list.append(moderation)
|
moderation_list.append(moderation)
|
||||||
|
|
Loading…
Reference in a new issue