Convert bot to use a submissions table.
This commit is contained in:
@@ -10,7 +10,7 @@ from sqlalchemy.orm import Session, aliased
|
||||
# pylint: disable=import-error
|
||||
from classes.submission import Submission, SubmissionState
|
||||
from highscores import submission_objects
|
||||
from utilities.sql_data_classes import Category, CategoryGroup, Guild, engine
|
||||
from utilities.sql_data_classes import Category, CategoryGroup, Guild, Submissions, engine
|
||||
|
||||
from .verification_view import VerificationView
|
||||
|
||||
@@ -30,7 +30,7 @@ def category_select_options(group_id: int) -> "list[nextcord.SelectOption]":
|
||||
return options
|
||||
|
||||
|
||||
############ Items used in submission process ############
|
||||
# Items used in submission process ########################
|
||||
|
||||
|
||||
class SubmissionDropdown(nextcord.ui.Select):
|
||||
@@ -47,9 +47,14 @@ class SubmissionDropdown(nextcord.ui.Select):
|
||||
async def callback(self, interaction: nextcord.Interaction):
|
||||
submission = submission_objects.get_user_submission(interaction.user.id)
|
||||
submission.category_id = self.values[0]
|
||||
embeds = submission.get_embeds()
|
||||
|
||||
with Session(engine) as session:
|
||||
stmt = select(Category.IsTimeRecord).where(Category.CategoryId == submission.category_id)
|
||||
submission.is_time_record = session.scalar(stmt)
|
||||
|
||||
embed = submission.get_embed()
|
||||
await interaction.message.edit(
|
||||
embeds=embeds,
|
||||
embed=embed,
|
||||
)
|
||||
|
||||
|
||||
@@ -116,27 +121,40 @@ class SubmitButton(nextcord.ui.Button):
|
||||
stmt = select(Guild.VerificationChannel).where(Guild.GuildId == interaction.guild_id)
|
||||
verification_channel_id = session.scalar(stmt)
|
||||
channel = interaction.guild.get_channel(verification_channel_id)
|
||||
submission = submission_objects.get_user_submission(interaction.user.id)
|
||||
active_submission = submission_objects.get_user_submission(interaction.user.id)
|
||||
|
||||
error_response = "Registered Verification channel does not exist or was never registered. \
|
||||
Contact server admins."
|
||||
assert channel is not None, await channel.send(error_response)
|
||||
|
||||
submission.submission_state = SubmissionState.VERIFY
|
||||
active_submission.submission_state = SubmissionState.VERIFY
|
||||
|
||||
embeds = submission.get_embeds()
|
||||
embed = active_submission.get_embed()
|
||||
|
||||
await channel.send(
|
||||
verification_message = await channel.send(
|
||||
files=[await attch.to_file() for attch in interaction.message.attachments],
|
||||
view=VerificationView(),
|
||||
embeds=embeds,
|
||||
embed=embed,
|
||||
content=f"Submission from <@{interaction.user.id}>.",
|
||||
)
|
||||
await interaction.message.edit(content=f"<@{interaction.user.id}> Submitted!", view=None)
|
||||
|
||||
new_submission = Submissions(
|
||||
CategoryId=active_submission.category_id,
|
||||
GroupId=active_submission.group_id,
|
||||
IsTimeRecord=active_submission.is_time_record,
|
||||
Score=active_submission.score,
|
||||
SubmissionMessageId=interaction.message.id,
|
||||
UserName=active_submission.username,
|
||||
VerificationMessageId=verification_message.id,
|
||||
)
|
||||
submission_objects.remove_user_submission(interaction.user.id)
|
||||
with Session(engine) as session:
|
||||
session.add(new_submission)
|
||||
session.commit()
|
||||
|
||||
|
||||
############ Submission Views ############
|
||||
# Submission Views ########################
|
||||
|
||||
|
||||
class SubmissionCreateButton(nextcord.ui.View):
|
||||
@@ -175,7 +193,7 @@ class SubmissionCreateButton(nextcord.ui.View):
|
||||
|
||||
submission_objects.add_submission(interaction.user.id, submission)
|
||||
|
||||
embeds = submission.get_embeds()
|
||||
embed = submission.get_embed()
|
||||
|
||||
submission_message = await channel.send(
|
||||
f"<@{interaction.user.id}>",
|
||||
@@ -183,7 +201,7 @@ class SubmissionCreateButton(nextcord.ui.View):
|
||||
self._bot,
|
||||
interaction.user.id,
|
||||
),
|
||||
embeds=embeds,
|
||||
embed=embed,
|
||||
)
|
||||
|
||||
# update the message_id once its created
|
||||
|
||||
Reference in New Issue
Block a user