Only add best score if its new, only delete worse scores if they exist.

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

@@ -19,6 +19,7 @@ class PostHighscores(commands.Cog, name="Post Highscores"):
         self.bot = bot
 
     @commands.command(name="post-scores")
+    @commands.has_permissions(administrator=True)
     async def post_highscores(self, ctx: commands.Context):
         """
         A command which posts the highscore in the designated channel.
@@ -38,7 +39,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
@@ -26,6 +27,7 @@ class Score(commands.Cog, name="Score"):
         Usage:
         ```
         ?score "Boss Name" "Category" "score"
+        This command still works if you prefer to use it over the ui.
         ```
         """
         verification_channel_id = highscores_data["verification_channel_id"]

cogs/score/verification_view.py

@@ -10,7 +10,9 @@ class VerificationView(nextcord.ui.View):
     def __init__(self):
         super().__init__(timeout=None)
 
-    @nextcord.ui.button(label="Approve", style=nextcord.ButtonStyle.green, custom_id="approve")
+    @nextcord.ui.button(
+        label="Approve", style=nextcord.ButtonStyle.green, custom_id="approve-score-command"
+    )
     async def approve_button(
         self, button: nextcord.ui.Button, interaction: nextcord.Interaction
     ):  # pylint: disable=unused-argument
@@ -28,7 +30,9 @@ class VerificationView(nextcord.ui.View):
             files=[await attch.to_file() for attch in interaction.message.attachments],
         )
 
-    @nextcord.ui.button(label="Deny", style=nextcord.ButtonStyle.red, custom_id="deny")
+    @nextcord.ui.button(
+        label="Deny", style=nextcord.ButtonStyle.red, custom_id="deny-score-command"
+    )
     async def deny_button(
         self, button: nextcord.ui.Button, interaction: nextcord.Interaction
     ):  # pylint: disable=unused-argument

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):
+        # a user should only have 1 submission active at once.
-            return (
+        submission_messages[interaction.user.id] = submission_message.id
-                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()
 
     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()

cogs/submission/verification_view.py

@@ -10,7 +10,9 @@ class VerificationView(nextcord.ui.View):
     def __init__(self):
         super().__init__(timeout=None)
 
-    @nextcord.ui.button(label="Approve", style=nextcord.ButtonStyle.green, custom_id="approve")
+    @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
@@ -34,7 +36,9 @@ class VerificationView(nextcord.ui.View):
             await interaction.send("Instruct user to submit with all fields.")
             await interaction.message.edit(view=None)
 
-    @nextcord.ui.button(label="Deny", style=nextcord.ButtonStyle.red, custom_id="deny")
+    @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

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

@@ -21,7 +21,7 @@ def format_highscore_message(boss_name: str):
 
     # Gather all categories and add to string
     for key, value in boss_data["categories"].items():
-        ret_string += f"{key}".ljust(30, " ")
+        ret_string += f"{key}".ljust(25, " ")
     ret_string += "\n"
 
     highscore_size = highscores_config["highscore_size"]
@@ -31,9 +31,9 @@ def format_highscore_message(boss_name: str):
         for key, value in boss_data["categories"].items():
             if len(value) > i:
                 score = value[i]
-                ret_string += f"{i+1}: {score[0]} - {score[1]}".ljust(30, " ")
+                ret_string += f"{i+1}: {score[0]} - {score[1]}".ljust(25, " ")
             else:
-                ret_string += f"{i+1}: submit your score".ljust(30, " ")
+                ret_string += f"{i+1}: submit your score".ljust(25, " ")
         ret_string += "\n"
 
     return ret_string + "```"
@@ -72,16 +72,32 @@ async def submit_score(
     @param boss: the boss to add score to
     @param category: the category to add score to
     @param user: user who submitted score
-    @param score: score (int) to add
+    @param score: score to add
     """
     # 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
+
+    # capping to 12 characters because runescape names are 12 characters long.
+    # Splitting on pipe. My discord has multiple names on account split by pipe.
+    user = user.split("|")[0][:12]
+
+    # strip leading zeros and colon from score
+    score = score.lstrip("0:")
+
     # 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"]:
-        minutes = score.split(":")[0]
+        if score.find(":") == -1:
-        seconds = score.split(":")[1]
+            score_seconds = float(score)
-        score_seconds = int(minutes) * 60 + int(seconds)
+        else:
+            minutes = score.split(":")[0]
+            seconds = score.split(":")[1]
+            score_seconds = int(minutes) * 60 + float(seconds)
         score_tuple = (user, score, score_seconds)
         sort_index = 2
 
@@ -89,13 +105,35 @@ async def submit_score(
         score_tuple = (user, int(score))
         sort_index = 1
 
-    scores = highscores_data[boss_name]["categories"][category]
+    scores: "list[tuple]" = highscores_data[boss_name]["categories"][category]
-    scores.append(score_tuple)
+
+    # if user is in an existing tuple, delete it.
+    users_scores: "list[tuple]" = [score_tuple]
+    for tup in scores:
+        if user == tup[0]:
+            # Add tup to users_scores, remove from scores
+            users_scores.append(tup)
+
+    # sort users_scores
+    users_scores.sort(
+        key=lambda x: x[sort_index],
+        reverse=not highscores_config["categories"][config_category]["ascending"],
+    )
+
+    for index, tup in enumerate(users_scores):
+        if index == 0:
+            # first score is the best score.
+            if tup not in scores:
+                scores.append(tup)
+        else:
+            # discard all other scores from scores list.
+            if tup in scores:
+                scores.remove(tup)
 
     # 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
@@ -110,7 +148,7 @@ async def submit_score(
 
     error_response = 'Registered Highscores channel does not exist or was never registered. \
             Register with "?register" command.'
-    assert channel is not None, await interaction.send(error_response)
+    assert channel is not None, await interaction.send(error_response, ephemeral=True)
 
     await send_highscore_message(channel, boss_name)