diff --git a/classes/submission.py b/classes/submission.py index dd932d2..54243c9 100644 --- a/classes/submission.py +++ b/classes/submission.py @@ -193,10 +193,9 @@ class Submission: embed = Embed(title="Highscores Submission", description=description) embed.add_field(name="User Name", value=self.username, inline=False) - embed.add_field(name="Table", value=self.group_id, inline=False) + embed.add_field(name="GroupId", value=self.group_id, inline=False) if self.category_id: - stmt = select(Category.CategoryName).where(Category.CategoryId == self.category_id) - embed.add_field(name="Category", value=session.scalar(stmt), inline=False) + embed.add_field(name="CategoryId", value=self.category_id, inline=False) if self.score: embed.add_field(name="Score", value=self.score, inline=False) return embed diff --git a/cogs/submission/verification_view.py b/cogs/submission/verification_view.py index c073490..4f27498 100644 --- a/cogs/submission/verification_view.py +++ b/cogs/submission/verification_view.py @@ -1,10 +1,9 @@ """View for verification buttons""" import nextcord -from classes.score import Score, ScoreTime # pylint: disable=import-error -from highscores import highscores_data # pylint: disable=import-error -from utilities.utils import submit_score # pylint: disable=import-error +# pylint: disable=import-error +from utilities.utils import submit_score class VerificationView(nextcord.ui.View): @@ -13,18 +12,14 @@ class VerificationView(nextcord.ui.View): def __init__(self): super().__init__(timeout=None) - @nextcord.ui.button( - label="Deny", style=nextcord.ButtonStyle.red, custom_id="deny-button-submission" - ) + @nextcord.ui.button(label="Deny", style=nextcord.ButtonStyle.red, custom_id="deny-button-submission") async def deny_button( self, button: nextcord.ui.Button, interaction: nextcord.Interaction ): # pylint: disable=unused-argument """Button for denying score submission.""" await interaction.message.delete() - @nextcord.ui.button( - label="Approve", style=nextcord.ButtonStyle.green, custom_id="approve-button-submission" - ) + @nextcord.ui.button(label="Approve", style=nextcord.ButtonStyle.green, custom_id="approve-button-submission") async def approve_button( self, button: nextcord.ui.Button, interaction: nextcord.Interaction ): # pylint: disable=unused-argument @@ -32,33 +27,18 @@ class VerificationView(nextcord.ui.View): content = interaction.message.embeds[0].to_dict() for field in content["fields"]: - if field["name"] == "Table": - table = field["value"] - elif field["name"] == "Category": - category = field["value"] + if field["name"] == "GroupId": + group_id = int(field["value"]) + elif field["name"] == "CategoryId": + category_id = int(field["value"]) elif field["name"] == "Score": - score = field["value"] + score = float(field["value"]) elif field["name"] == "User Name": user = field["value"] try: - submission_guild = highscores_data.get_guild(interaction.guild_id) - submission_table = submission_guild.get_table(table) - submission_category = submission_table.get_category(category) - if submission_category.time_record: - submission_score: ScoreTime = ScoreTime(user) - submission_score.set_value_str(score) - else: - submission_score: Score = Score(user) - submission_score.set_value_str(score) - await submit_score( - interaction, - submission_guild, - submission_table, - submission_category, - submission_score, - ) + await submit_score(interaction, group_id, category_id, user, score) content = interaction.message.content content += f"\nApproved by <@{interaction.user.id}>." await interaction.message.edit(content=content, view=None)