Missed adding tables one place.

cogs/message_listener/__init__.py

@@ -2,11 +2,14 @@
 Defines cog for on message listener.
 """
 
+import re
+
 from nextcord.ext import commands
 import nextcord
 
 from cogs.submission.submission_views import SubmissionState  # pylint: disable=import-error
 from cogs.submission.submission_views import get_submission_embed  # pylint: disable=import-error
+from highscores import highscores_config  # pylint: disable=import-error
 from highscores import highscores_data  # pylint: disable=import-error
 from highscores import submission_objects  # pylint: disable=import-error
 
@@ -30,8 +33,39 @@ class SubmissionListener(commands.Cog, name="Message Listener"):
             if message.channel.id == highscores_data["submission_channel_id"]:
                 state = submission_objects[message.author.id]["submission_state"]
                 if state == SubmissionState.SCORE and message.content:
-                    submission_objects[message.author.id]["score"] = message.content
+
-                    embed = get_submission_embed(message.author.id)
+                    # check with regex if score matches correctly
+                    is_time_record = highscores_config["categories"][
+                        submission_objects[message.author.id]["category"]
+                    ]["is_time_record"]
+
+                    time_regex = re.search(
+                        "([0-9]{2}:)?[0-9]{2}(\.[0-9])?",  # pylint: disable=anomalous-backslash-in-string
+                        message.content,
+                    )
+                    int_regex = re.search("[0-9]+", message.content)
+                    if time_regex is None and is_time_record:
+                        embed = submission_message.embeds[0]
+                        embed.add_field(
+                            name="Error",
+                            value="Time record must follow format MM:SS.ms or SS.ms or SS.",
+                        )
+                    elif int_regex is None and not is_time_record:
+                        embed = submission_message.embeds[0]
+                        embed.add_field(name="Error", value="Number record must only be number.")
+                    else:
+                        score = message.content
+                        if is_time_record:
+                            # standardize time score format.
+                            # add colon if its not there
+                            if score.find(":") == -1:
+                                score = "00:" + score
+                            # add a 0 if there isn't 2 digits before a colon
+                            elif len(score.split(":", maxsplit=1)[0]) < 2:
+                                score = "0" + score
+                        submission_objects[message.author.id]["score"] = score
+                        embed = get_submission_embed(message.author.id)
+
                     await submission_message.edit(
                         embed=embed,
                     )

cogs/post_highscores/__init__.py

@@ -43,6 +43,7 @@ class PostHighscores(commands.Cog, name="Post Highscores"):
             message: nextcord.Message = await send_highscore_message(channel, boss)
             await message.edit(view=SubmissionCreateButton(self.bot))
 
+        # Saving in case new message was sent.
         save_highscores_data(highscores_data)
 
 

cogs/score/__init__.py

@@ -5,7 +5,6 @@ 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,9 +7,9 @@ import nextcord
 from nextcord import Embed
 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_objects  # pylint: disable=import-error
+from highscores import highscores_message_map  # pylint: disable=import-error
 from .verification_view import VerificationView
 
 
@@ -55,7 +55,7 @@ def get_submission_embed(userid: int) -> nextcord.Embed:
 def category_select_options(boss_name: str) -> "list[nextcord.SelectOption]":
     """Returns list of categories for a given boss."""
     options: "list[nextcord.SelectOption]" = []
-    boss_dict = highscores_data[boss_name]
+    boss_dict = highscores_data["tables"][boss_name]
     for category in boss_dict["categories"].items():
         options.append(nextcord.SelectOption(label=category[0]))
 
@@ -186,15 +186,12 @@ class SubmissionCreateButton(nextcord.ui.View):
         self, button: nextcord.ui.Button, interaction: nextcord.Interaction
     ):  # pylint: disable=unused-argument
         """Button for score submission."""
-        highscores_message_map = open_message_map()
+        boss_name = highscores_message_map[interaction.message.id]
-        boss_name = highscores_message_map[str(interaction.message.id)]
-        # embed = nextcord.Embed(title="Highscores Submission")
-        # embed.add_field(name="Boss", value=boss_name, inline=False)
-        # embed.add_field(name="User", value=interaction.user.display_name, inline=False)
         channel = self._bot.get_channel(highscores_data["submission_channel_id"])
 
         # a user should only have 1 submission active at once.
         # submitting with dummy message_id until message created
+        # split username on pipe.
         submission_objects[interaction.user.id] = {
             "message_id": 0,
             "submission_state": SubmissionState.CATEGORY,

example_config/runescape_bosses.json

@@ -212,8 +212,8 @@
             "Spooned Log"
         ],
         "Taraket the Necromancer": [
-            "Kill Count",
+            "Solo Kill Count",
-            "Kill Time",
+            "Solo Kill Time",
             "Group Kill Count",
             "Group Kill Time",
             "Spooned Log"
@@ -244,8 +244,8 @@
             "Spooned Log"
         ],
         "Verak Lith": [
-            "Kill Count",
+            "Solo Kill Count",
-            "Kill Time",
+            "Solo Kill Time",
             "Group Kill Count",
             "Group Kill Time",
             "Spooned Log"
@@ -318,10 +318,18 @@
             "ascending": true,
             "is_time_record": true
         },
+        "Solo Kill Count": {
+            "ascending": false,
+            "is_time_record": false
+        },
+        "Solo Kill Time": {
+            "ascending": true,
+            "is_time_record": true
+        },
         "Spooned Log": {
             "ascending": true,
             "is_time_record": false
         }
     },
     "highscore_size": 3
-}
+}

highscores.py

@@ -11,7 +11,7 @@ from nextcord.ext import commands
 import config
 from utilities.data_storage import open_highscores_config
 from utilities.data_storage import open_highscores_data
-from utilities.data_storage import open_message_map
+from utilities.data_storage import create_message_map
 
 logger = logging.getLogger("nextcord")
 logger.setLevel(logging.DEBUG)
@@ -22,7 +22,7 @@ logger.addHandler(handler)
 
 highscores_config = open_highscores_config()
 highscores_data = open_highscores_data()
-highscores_message_map = open_message_map()
+highscores_message_map = create_message_map(highscores_data)
 
 submission_objects: dict = {}
 

utilities/data_storage.py

@@ -5,7 +5,6 @@ import json
 
 HIGHSCORES_CONFIG_FILE = "highscores_config.json"
 HIGHSCORES_DATA_FILE = "highscores_data.json"
-HIGHSCORES_MESSAGE_MAP_FILE = "highscores_message_map.json"
 
 
 def open_highscores_config():
@@ -31,26 +30,28 @@ def open_highscores_data():
         data = {"highscore_channel_id": -1, "verification_channel_id": -1, "username_length": 12}
         config: dict = open_highscores_config()
         for boss, categories in config["highscore_table"].items():
-            data[boss] = {"message_id": 0}
+            data["tables"][boss] = {"message_id": 0}
             boss_categories = {}
             for category in categories:  # pylint: disable=unused-variable
                 rank_list = []
                 boss_categories[category] = rank_list
-            data[boss]["categories"] = boss_categories
+            data["tables"][boss]["categories"] = boss_categories
     return data
 
 
-def open_message_map():
+def create_message_map(data: dict):
     """
-    Opens a highscore_message_map.json file if one exists. Otherwise returns empty dict.
+    Creates a message map from input highscores data.
+
+    @param data: highscores_data dict to create map from.
     @return: dict message_map of message to boss.
     """
-    if os.path.exists(HIGHSCORES_MESSAGE_MAP_FILE):
+
-        with open(HIGHSCORES_MESSAGE_MAP_FILE, encoding="utf-8", mode="r") as file:
+    message_map = {}
-            message_map = json.load(file)
+
-    else:
+    for boss, info in data["tables"].items():
-        # create the json object
+        message_map[info["message_id"]] = boss
-        message_map = {}
+
     return message_map
 
 
@@ -61,12 +62,3 @@ def save_highscores_data(data):
     """
     with open(HIGHSCORES_DATA_FILE, encoding="utf-8", mode="w") as file:
         file.write(json.dumps(data, indent=4))
-
-
-def save_message_map(message_map):
-    """
-    Saves the highscores message mao data dict into a json file.
-    @param map: dict map of message to boss.
-    """
-    with open(HIGHSCORES_MESSAGE_MAP_FILE, encoding="utf-8", mode="w") as file:
-        file.write(json.dumps(message_map, indent=4))

utilities/utils.py

@@ -7,7 +7,6 @@ from highscores import highscores_config  # pylint: disable=import-error
 from highscores import highscores_data  # pylint: disable=import-error
 from highscores import highscores_message_map  # pylint: disable=import-error
 from utilities.data_storage import save_highscores_data  # pylint: disable=import-error
-from utilities.data_storage import save_message_map  # pylint: disable=import-error
 
 
 def format_highscore_message(boss_name: str):
@@ -17,7 +16,7 @@ def format_highscore_message(boss_name: str):
     @return the formatted string
     """
     ret_string = f"**{boss_name}**\n```"
-    boss_data = highscores_data[boss_name]
+    boss_data = highscores_data["tables"][boss_name]
 
     # Gather all categories and add to string
     for key, value in boss_data["categories"].items():
@@ -36,15 +35,11 @@ def format_highscore_message(boss_name: str):
                 username: str = score_pair[0].ljust(highscores_data["username_length"], " ")
                 score: str = str(score_pair[1])
 
-                # standardize time score format.
                 if highscores_config["categories"][key]["is_time_record"]:
-                    if score.find(":") == -1:
+                    # pad score to correct length
-                        score = "00:" + score
+                    # MM:SS.ms is 7 characters long
-                    elif len(score.split(":", maxsplit=1)[0]) < 2:
+                    score = score.ljust(7, " ")
-                        score = "0" + score
+
-                    if score.find(".") == -1:
-                        # insert 2 spaces to make up for period and ms
-                        score = score + "  "
                 line_str = f"{i+1}: {username} - "
                 ret_string += line_str + score.rjust(26 - len(line_str) - 1) + " "
             else:
@@ -63,7 +58,7 @@ async def send_highscore_message(channel, boss_name: str) -> nextcord.Message:
     """
     highscore_string = format_highscore_message(boss_name)
 
-    message_id = highscores_data[boss_name]["message_id"]
+    message_id = highscores_data["tables"][boss_name]["message_id"]
     try:
         message: nextcord.Message = await channel.fetch_message(message_id)
         await message.edit(content=highscore_string)
@@ -71,10 +66,9 @@ async def send_highscore_message(channel, boss_name: str) -> nextcord.Message:
         # message doesn't exist.
         message: nextcord.Message = await channel.send(highscore_string)
         message_id = message.id
-        highscores_data[boss_name]["message_id"] = message_id
+        highscores_data["tables"][boss_name]["message_id"] = message_id
         # save message -> boss_name in message_map
         highscores_message_map[str(message_id)] = boss_name
-        save_message_map(highscores_message_map)
 
     return message
 
@@ -92,13 +86,6 @@ async def submit_score(
 
     boss_category_config = highscores_config["categories"][category]
 
-    # Splitting on pipe. My discord has multiple names on account split by pipe.
-    # cap length to data defined length.
-    user = user.split("|")[0][: highscores_data["username_length"]]
-
-    # strip leading zeros and colon from score
-    score = score.lstrip("0:")
-
     # create score tuple for either time or int
     # define sort index
     if boss_category_config["is_time_record"]:
@@ -115,7 +102,7 @@ async def submit_score(
         score_tuple = (user, int(score))
         sort_index = 1
 
-    scores: "list[tuple]" = highscores_data[boss_name]["categories"][category]
+    scores: "list[tuple]" = highscores_data["tables"][boss_name]["categories"][category]
 
     # if user is in an existing tuple, delete it.
     users_scores: "list[tuple]" = [score_tuple]
@@ -149,7 +136,7 @@ async def submit_score(
     # enforce highscore size
     while len(scores) > highscores_config["highscore_size"]:
         scores.pop()
-    highscores_data[boss_name]["categories"][category] = scores
+    highscores_data["tables"][boss_name]["categories"][category] = scores
 
     # edit message
     highscore_channel_id = highscores_data["highscore_channel_id"]