From 80e4602621c65e3fc2814a01670909521a337a41 Mon Sep 17 00:00:00 2001
From: alwayscompiling <ian.rettig13@gmail.com>
Date: Tue, 2 Aug 2022 21:52:12 -0400
Subject: [PATCH] Update submissin cog to new data class. Also clean up import
 lists.

---
 cogs/message_listener/__init__.py   |  9 +++++----
 cogs/submission/submission_views.py | 20 +++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/cogs/message_listener/__init__.py b/cogs/message_listener/__init__.py
index dd3d86b..2f180e0 100644
--- a/cogs/message_listener/__init__.py
+++ b/cogs/message_listener/__init__.py
@@ -9,10 +9,11 @@ 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_data  # pylint: disable=import-error
-from highscores import submission_objects  # pylint: disable=import-error
+from cogs.submission.submission_views import (  # pylint: disable=import-error
+    SubmissionState,
+    get_submission_embed,
+)
+from highscores import highscores_data, submission_objects  # pylint: disable=import-error
 
 
 class SubmissionListener(commands.Cog, name="Message Listener"):
diff --git a/cogs/submission/submission_views.py b/cogs/submission/submission_views.py
index 73518ad..83da25d 100644
--- a/cogs/submission/submission_views.py
+++ b/cogs/submission/submission_views.py
@@ -7,9 +7,11 @@ import nextcord
 from nextcord import Embed
 from nextcord.ext import commands
 
-from highscores import highscores_data  # pylint: disable=import-error
-from highscores import highscores_message_map  # pylint: disable=import-error
-from highscores import submission_objects  # pylint: disable=import-error
+from highscores import (  # pylint: disable=import-error
+    highscores_data,
+    highscores_message_map,
+    submission_objects,
+)
 from .verification_view import VerificationView
 
 
@@ -55,9 +57,9 @@ def get_submission_embed(userid: int) -> nextcord.Embed:
 def category_select_options(guild_id: int, boss_name: str) -> "list[nextcord.SelectOption]":
     """Returns list of categories for a given boss."""
     options: "list[nextcord.SelectOption]" = []
-    category_list = highscores_data.get_table_categories(guild_id, boss_name)
+    category_list = highscores_data.get_guild(guild_id).get_table(boss_name).categories
     for category in category_list:
-        options.append(nextcord.SelectOption(label=category))
+        options.append(nextcord.SelectOption(label=category.name))
 
     return options
 
@@ -148,9 +150,9 @@ class SubmitButton(nextcord.ui.Button):
         self._bot = bot
 
     async def callback(self, interaction: nextcord.Interaction):
-        verification_channel_id = highscores_data.get_guild_verification_channel(
+        verification_channel_id = highscores_data.get_guild(
             interaction.guild_id
-        )
+        ).verification_channel
         channel = interaction.guild.get_channel(verification_channel_id)
 
         error_response = "Registered Verification channel does not exist or was never registered. \
@@ -195,7 +197,7 @@ class SubmissionCreateButton(nextcord.ui.View):
 
         boss_name = highscores_message_map[interaction.guild.id][interaction.message.id]
         channel = interaction.guild.get_channel(
-            highscores_data.get_guild_submission_channel(interaction.guild_id)
+            highscores_data.get_guild(interaction.guild_id).submission_channel
         )
 
         # a user should only have 1 submission active at once.
@@ -209,7 +211,7 @@ class SubmissionCreateButton(nextcord.ui.View):
             "score": "",
             "category": "",
             "username": interaction.user.display_name.split("|")[0][
-                : highscores_data.get_guild_username_length(interaction.guild_id)
+                : highscores_data.get_guild(interaction.guild_id).username_length
             ],
         }