From f6ae34c9e6eed95ee130761edf26f591c36c7be1 Mon Sep 17 00:00:00 2001
From: imcompiling <develop@imcompiling.com>
Date: Mon, 3 Mar 2025 23:29:46 -0500
Subject: [PATCH] Started fixing smells and updating model calls.

---
 cogs/loops/__init__.py     |  8 +++-----
 cogs/loops/bot_presence.py |  6 ++----
 cogs/loops/guild_data.py   | 25 ++++++++++---------------
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/cogs/loops/__init__.py b/cogs/loops/__init__.py
index 9ee014f..cec7fdb 100644
--- a/cogs/loops/__init__.py
+++ b/cogs/loops/__init__.py
@@ -1,6 +1,4 @@
-"""
-Initializing code for all loops.
-"""
+"""Initializing code for all loops."""
 
 from nextcord.ext import commands
 
@@ -10,7 +8,7 @@ from .guild_data import GuildData
 
 # 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"""
+def setup(bot: commands.Bot) -> None:
+    """Adds function to bot."""
     bot.add_cog(BotPresence(bot))
     bot.add_cog(GuildData(bot))
diff --git a/cogs/loops/bot_presence.py b/cogs/loops/bot_presence.py
index d752396..f64cfd9 100644
--- a/cogs/loops/bot_presence.py
+++ b/cogs/loops/bot_presence.py
@@ -1,6 +1,4 @@
-"""
-Functions for controlling the bot's presence. Also contains the loop.
-"""
+"""Functions for controlling the bot's presence. Also contains the loop."""
 
 import random
 
@@ -11,7 +9,7 @@ from nextcord.ext import commands, tasks
 class BotPresence(commands.Cog, name="Bot Presence"):
     """Class for bot presence functions."""
 
-    def __init__(self, bot: commands.Bot):
+    def __init__(self, bot: commands.Bot) -> None:
         self.bot = bot
 
     @commands.Cog.listener()
diff --git a/cogs/loops/guild_data.py b/cogs/loops/guild_data.py
index 3760731..356a4c9 100644
--- a/cogs/loops/guild_data.py
+++ b/cogs/loops/guild_data.py
@@ -1,13 +1,11 @@
-"""
-Contains a loop that updates guild data in the database periodically.
-"""
+"""Contains a loop that updates guild data in the database periodically."""
 
 from nextcord.ext import commands, tasks
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
-# pylint: disable=import-error
-from database.db import Guild, engine
+from database.db import engine
+from database.models import Guild
 
 
 class GuildData(commands.Cog, name="Guild Data"):
@@ -17,30 +15,27 @@ class GuildData(commands.Cog, name="Guild Data"):
         self.bot = bot
 
     @commands.Cog.listener()
-    async def on_ready(self):
+    async def on_ready(self) -> None:
         """Starts the loop when bot is ready."""
         await self.bot.wait_until_ready()
-        # pylint doesn't recognize that periodic_update_guild_data is subclassed from tasks.loop.
-        await self.periodic_update_guild_data.start()  # pylint: disable=no-member
+        await self.periodic_update_guild_data.start()
 
     @tasks.loop(hours=24)
-    async def periodic_update_guild_data(self):
+    async def periodic_update_guild_data(self) -> None:
         """Loops every day, calls update_guild_data."""
         self.update_guild_data()
 
-    def update_guild_data(self):
-        """
-        Updates all known guild's data in the database.
-        """
+    def update_guild_data(self) -> None:
+        """Updates all known guild's data in the database."""
         with Session(engine) as session:
             for guild in self.bot.guilds:
                 # update given guild name for guild id
-                stmt = select(Guild).where(Guild.GuildId == guild.id)
+                stmt = select(Guild).where(Guild.id == guild.id)
                 guild_data = session.scalar(stmt)
 
                 # just in case checking if the guild doesn't exist.
                 if guild_data is None:
-                    new_guild = Guild(GuildId=guild.id, GuildName=guild.name)
+                    new_guild = Guild(id=guild.id, name=guild.name)
                     session.add(new_guild)
                 else:
                     guild_data.GuildName = guild.name