Fixing hardmode category searching.

cogs/message_listener/__init__.py

@@ -0,0 +1,43 @@
+"""
+Defines cog for on message listener.
+"""
+
+from nextcord.ext import commands
+import nextcord
+
+from highscores import submission_messages  # pylint: disable=import-error
+from highscores import highscores_data  # pylint: disable=import-error
+
+
+class SubmissionListener(commands.Cog, name="Message Listener"):
+    """Sets up message listener."""
+
+    def __init__(self, bot: commands.Bot):
+        self.bot = bot
+
+    @commands.Cog.listener()
+    async def on_message(self, proof_message: nextcord.Message):
+        """Listener for message creation. Adds score and attachments to submission."""
+        if proof_message.author.id in submission_messages:
+            message_id = submission_messages[proof_message.author.id]
+            submission_message: nextcord.Message = await self.bot.get_channel(
+                highscores_data["submission_channel_id"]
+            ).fetch_message(message_id)
+
+            # need check if correct user and correct channel
+            if proof_message.channel.id == highscores_data["submission_channel_id"]:
+
+                embed = submission_message.embeds[0]
+                embed.add_field(name="Score", value=proof_message.content, inline=False)
+                await submission_message.edit(
+                    files=[await attch.to_file() for attch in proof_message.attachments],
+                    embed=embed,
+                )
+                await proof_message.delete()
+
+
+# This function will be called when this extension is loaded.
+# It is necessary to add these functions to the bot.
+def setup(bot: commands.Bot):
+    """Adds function to bot"""
+    bot.add_cog(SubmissionListener(bot))

cogs/post_highscores/__init__.py

@@ -38,7 +38,7 @@ class PostHighscores(commands.Cog, name="Post Highscores"):
 
         for boss in highscores_config["bosses"]:
             message: nextcord.Message = await send_highscore_message(channel, boss["boss"])
-            await message.edit(view=SubmissionButton())
+            await message.edit(view=SubmissionButton(self.bot))
 
         save_highscores_data(highscores_data)
 

cogs/score/__init__.py

@@ -3,6 +3,7 @@ Bot command to submit a score
 """
 
 from nextcord.ext import commands
+
 from highscores import highscores_data  # pylint: disable=import-error
 from utilities.utils import submit_score  # pylint: disable=import-error
 from .verification_view import VerificationView

cogs/submission/submission_views.py

@@ -7,6 +7,7 @@ from nextcord.ext import commands
 
 from utilities.data_storage import open_message_map  # pylint: disable=import-error
 from highscores import highscores_data  # pylint: disable=import-error
+from highscores import submission_messages  # pylint: disable=import-error
 from .verification_view import VerificationView
 
 
@@ -36,19 +37,8 @@ class SubmissionButton(nextcord.ui.View):
             embed=embed,
         )
 
-        def wait_check(check_message: nextcord.Message):
-            return (
-                interaction.user.id == check_message.author.id
-                and interaction.channel == check_message.channel
-            )
-
-        proof_message = await self._bot.wait_for("message", check=wait_check)
-        embed = submission_message.embeds[0]
-        embed.add_field(name="Score", value=proof_message.content, inline=False)
-        await submission_message.edit(
-            files=[await attch.to_file() for attch in proof_message.attachments], embed=embed
-        )
-        await proof_message.delete()
+        # a user should only have 1 submission active at once.
+        submission_messages[interaction.user.id] = submission_message.id
 
     async def _category_select_options(self, boss_name: str) -> "list[nextcord.SelectOption]":
         options: list[nextcord.SelectOption] = []  # pylint: disable=unsubscriptable-object
@@ -76,7 +66,7 @@ class SubmissionDropdown(nextcord.ui.Select):
         embed = interaction.message.embeds[0]
         embed.add_field(name="Category", value=self.values[0], inline=False)
         await interaction.message.edit(
-            embed=embed,  # TODO solve ordering issue. currently have to choose category after score submission.
+            embed=embed,
         )
 
 
@@ -119,6 +109,7 @@ class SubmissionDropdownView(nextcord.ui.View):
             embed=interaction.message.embeds[0],
         )
         await interaction.message.edit(content=f"<@{interaction.user.id}> Submitted!", view=None)
+        submission_messages.pop(interaction.user.id)
 
     @nextcord.ui.button(
         label="Cancel", style=nextcord.ButtonStyle.red, custom_id="cancel-submission"
@@ -127,4 +118,5 @@ class SubmissionDropdownView(nextcord.ui.View):
         self, button: nextcord.ui.Button, interaction: nextcord.Interaction
     ):  # pylint: disable=unused-argument
         """Deletes message to cancel interaction."""
+        submission_messages.pop(interaction.user.id)
         await interaction.message.delete()

highscores.py

@@ -24,6 +24,8 @@ highscores_config = open_highscores_config()
 highscores_data = open_highscores_data()
 highscores_message_map = open_message_map()
 
+submission_messages: dict = {}
+
 
 def main():
     """Main function for bot."""
@@ -33,6 +35,7 @@ def main():
 
     # Required in order to read messages (eg. prefix commands)
     intents.message_content = True  # pylint: disable=assigning-non-slot
+    intents.messages = True  # pylint: disable=assigning-non-slot
 
     # To enable the guilds priveleged intent:
     # intents.guilds = True

utilities/utils.py

@@ -76,12 +76,21 @@ async def submit_score(
     """
     # TODO update user submission to not have dupe users
 
+    # hardmode category, must have different category variable for config access.
+    if category.find("Hardmode ") != -1:
+        config_category = category.replace("Hardmode ", "")
+    else:
+        config_category = category
+
     # create score tuple for either time or int
     # define sort index
-    if highscores_config["categories"][category]["is_time_record"]:
+    if highscores_config["categories"][config_category]["is_time_record"]:
+        if score.find(":") == -1:
+            score_seconds = float(score)
+        else:
             minutes = score.split(":")[0]
             seconds = score.split(":")[1]
-        score_seconds = int(minutes) * 60 + int(seconds)
+            score_seconds = int(minutes) * 60 + float(seconds)
         score_tuple = (user, score, score_seconds)
         sort_index = 2
 
@@ -95,7 +104,7 @@ async def submit_score(
     # sort scores.
     scores.sort(
         key=lambda x: x[sort_index],
-        reverse=not highscores_config["categories"][category]["ascending"],
+        reverse=not highscores_config["categories"][config_category]["ascending"],
     )
 
     # enforce highscore size