Remove view for submit button.

Reviewed-on: #75
Reviewed-by: imcompiling <[email protected]>

.gitea/workflows/build_develop.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Install Docker
         uses: https://github.com/papodaca/install-docker-action@v1
       - name: Log into container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: gitea.cheezers.org
           username: imcompiling

.gitea/workflows/build_release.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Install Docker
         uses: https://github.com/papodaca/install-docker-action@v1
       - name: Log into container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: gitea.cheezers.org
           username: imcompiling

Dockerfile

@@ -1,7 +1,7 @@
 FROM python:3.12.3-slim
 
 # install uv
-COPY --from=ghcr.io/astral-sh/uv:0.4.30 /uv /uvx /bin/
+COPY --from=ghcr.io/astral-sh/uv:0.6.2 /uv /uvx /bin/
 
 RUN apt-get update && apt-get -y upgrade && apt-get -y install sqlite3
 

cogs/commands/create.py

@@ -5,7 +5,6 @@ from nextcord.ext import commands
 from sqlalchemy import exc, select
 from sqlalchemy.orm import Session
 
-from cogs.submission.submission_views import SubmissionCreateButton
 from database_setup.sql_data_classes import Category, CategoryGroup, engine
 from utilities.utils import MAX_LINE_LENGTH, autofill_groups, send_highscore_message
 
@@ -134,8 +133,7 @@ class CreateCog(commands.Cog, name="Create Cog"):
             try:
                 session.add(new_group)
                 session.commit()
-                message: nextcord.Message = await send_highscore_message(session, interaction.guild, new_group)
+                await send_highscore_message(session, interaction.guild, new_group)
-                await message.edit(view=SubmissionCreateButton(self._bot))
                 await interaction.response.send_message(f'"{group_name}" has been created!', ephemeral=True)
             except exc.IntegrityError:
                 # Category Group already exists in guild

cogs/commands/refresh.py

@@ -8,7 +8,6 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 # pylint: disable=import-error
-from cogs.submission.submission_views import SubmissionCreateButton
 from database_setup.sql_data_classes import CategoryGroup, engine
 from utilities.utils import autofill_groups, send_highscore_message
 
@@ -50,9 +49,7 @@ class RefreshCog(commands.Cog, name="Refresh Cog"):
             )
             group = session.scalar(stmt)
 
-            message: nextcord.Message = await send_highscore_message(session, interaction.guild, group)
+            await send_highscore_message(session, interaction.guild, group)
-            await message.edit(view=SubmissionCreateButton(self._bot))
-
             await interaction.response.send_message(f"Updated group {group.GroupName}!", ephemeral=True)
 
     @refresh.subcommand()
@@ -77,8 +74,7 @@ class RefreshCog(commands.Cog, name="Refresh Cog"):
             await interaction.response.defer(ephemeral=True)
 
             for group in session.scalars(stmt):
-                message: nextcord.Message = await send_highscore_message(session, interaction.guild, group)
+                await send_highscore_message(session, interaction.guild, group)
-                await message.edit(view=SubmissionCreateButton(self._bot))
 
         await interaction.send(f"Posted all groups in {interaction.guild.name}'s highscores.", ephemeral=True)
 

cogs/commands/submission.py

@@ -10,7 +10,7 @@ from sqlalchemy.orm import Session
 from cogs.submission.verification_view import VerificationView
 from database_setup.sql_data_classes import Category, CategoryGroup, Guild, Submission, engine
 from main import logger
-from utilities.utils import GUILDS, autofill_categories, autofill_groups, submit_score
+from utilities.utils import autofill_categories, autofill_groups, submit_score
 
 
 class SubmissionCog(commands.Cog):
@@ -19,7 +19,7 @@ class SubmissionCog(commands.Cog):
     def __init__(self) -> None:
         return
 
-    @nextcord.slash_command(guild_ids=GUILDS)
+    @nextcord.slash_command()
     async def submit(  # noqa: PLR0913
         self,
         interaction: nextcord.Interaction,
@@ -47,6 +47,7 @@ class SubmissionCog(commands.Cog):
             group_id (str): Is SlashOption. Group that the score category belongs in.
             category_id (str): Is SlashOption. Category to submit the score in.
             score (str): Is SlashOption. The score.
+            proof (nextcord.Attachment): Is SlashOption. Picture to provide proof of score.
             username (str, optional): Is SlashOption. Username to associate with the score.
         """
         # fill out username if not passed in

cogs/submission/verification_view.py

@@ -1,7 +1,7 @@
 """View for verification buttons."""
 
 import nextcord
-from sqlalchemy import select
+from sqlalchemy import delete, select
 from sqlalchemy.orm import Session
 
 from database_setup.sql_data_classes import Submission, engine
@@ -19,6 +19,14 @@ class VerificationView(nextcord.ui.View):
     @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) -> None:  # noqa: ARG002
         """Button for denying score submission."""
+        with Session(engine) as session:
+            stmt = (
+                delete(Submission)
+                .where(Submission.GuildId == interaction.guild_id)
+                .where(Submission.MessageId == interaction.message.id)
+            )
+            session.execute(stmt)
+            session.commit()
         await interaction.message.delete()
 
     @nextcord.ui.button(label="Approve", style=nextcord.ButtonStyle.green, custom_id="approve-button-submission")
@@ -41,6 +49,8 @@ class VerificationView(nextcord.ui.View):
             await submit_score(
                 interaction, submission.GroupId, submission.CategoryId, submission.UserName, submission.Score
             )
+            session.delete(submission)
+            session.commit()
             content = interaction.message.content
             content += f"\nApproved by <@{interaction.user.id}>."
             # remove the bot information embed. it should always be the first one.

main.py

@@ -33,9 +33,6 @@ def main() -> None:
     # These need to be enabled in the developer portal as well
     intents = nextcord.Intents.default()
 
-    # Required in order to read messages (eg. prefix commands)
-    intents.message_content = True
-
     bot = commands.Bot(
         commands.when_mentioned_or(config.BOT_PREFIX),
         intents=intents,

pyproject.toml

@@ -47,7 +47,6 @@ exclude = [
     "node_modules",
     "site-packages",
     "venv",
-    "dakiny-messages",    # Don't need to lint this git repo.
 ]
 
 # Same as Black.

utilities/utils.py

@@ -1,6 +1,4 @@
-"""
+"""Contains various utility functions for highscores bot."""
-Contains various utlity functions for highscores bot
-"""
 
 import time
 
@@ -14,12 +12,11 @@ from database_setup.sql_data_classes import Category, CategoryGroup, Guild, Scor
 
 MAX_LINE_LENGTH = 142
 
-GUILDS = [1000247361639030804]
-
 
 def autofill_categories(guild_id: int, group_id: int, category_begin: str) -> "dict[str, str]":
     """
     Returns all category names that start with category_begin.
+
     If category_begin is empty, returns list of all category names.
 
     Args: