Merge commit '58c167bbe30fa422277bef9e1ad0aed7bc350fc4' into missed-election

lists won't ever happen, but pylance didn't like it.

.vscode/launch.json

@@ -9,10 +9,7 @@
             "type": "debugpy",
             "request": "launch",
             "module": "dakiny_bot",
-            "justMyCode": true,
-            "env": {
-                "DEBUG": "true"
-            }
+            "justMyCode": true
         }
     ]
 }

Dockerfile

@@ -1,10 +1,10 @@
-FROM python:3.13.7-slim
+FROM python:3.13.3-slim
 
 # install dependencies
 RUN apt-get update && apt-get -y upgrade && apt-get -y install git sqlite3
 
 # install uv
-COPY --from=ghcr.io/astral-sh/uv:0.9.28 /uv /uvx /bin/
+COPY --from=ghcr.io/astral-sh/uv:0.6.14 /uv /uvx /bin/
 
 COPY . /home
 

dakiny_bot/app.py

@@ -1,5 +1,6 @@
 """Main file for bot."""
 
+import logging
 import os
 
 import nextcord
@@ -11,10 +12,16 @@ from dakiny_bot.classes.voting_highcouncil_views import VoteHighcouncilView
 from dakiny_bot.classes.voting_views import VoteView
 from dakiny_bot.database import create_database
 
-from .DakinySettings import settings
+from .dakiny_settings import settings
 
 birthday_list: list[int] = []
 
+logger = logging.getLogger("nextcord")
+logger.setLevel(logging.DEBUG)
+handler = logging.FileHandler(filename="nextcord.log", encoding="utf-8", mode="w")
+handler.setFormatter(logging.Formatter("%(asctime)s:%(levelname)s:%(name)s: %(message)s"))
+logger.addHandler(handler)
+
 
 def run() -> None:
     """Builds and runs bot."""

dakiny_bot/classes/election.py

@@ -9,14 +9,13 @@ from dakiny_bot.classes.nominate_highcouncil_views import NominateHighCouncilVie
 from dakiny_bot.classes.nominate_views import NominateView
 from dakiny_bot.classes.voting_highcouncil_views import VoteHighcouncilView
 from dakiny_bot.classes.voting_views import VoteView
-from dakiny_bot.DakinySettings import settings
+from dakiny_bot.dakiny_settings import settings
 from dakiny_bot.database.sql_data_classes import (
     CouncilMembers,
     ElectionInformation,
     Votes,
     engine,
 )
-from dakiny_bot.logger import dakiny_logger
 from dakiny_bot.utils import (
     TEMPLATES_DIR,
     VoteType,
@@ -70,7 +69,7 @@ class Election:
             list[str]: A list of message contents in the correct order. Must be a string because the message is too
             long.
         """
-        with Path(f"{TEMPLATES_DIR}/election_announcement.txt", encoding="utf8").open() as file:
+        with Path(f"{TEMPLATES_DIR}/election_announcement.txt").open() as file:
             message = file.read()
 
             next_election = get_datetime(
@@ -98,7 +97,7 @@ class Election:
         Returns:
             str: Message to send.
         """
-        with Path(f"{TEMPLATES_DIR}/highcouncil_election.txt", encoding="utf8").open() as file:
+        with Path(f"{TEMPLATES_DIR}/highcouncil_election.txt").open() as file:
             message = file.read()
 
             return message.format(
@@ -116,7 +115,7 @@ class Election:
         Returns:
             str: Message to send.
         """
-        with Path(f"{TEMPLATES_DIR}/highcouncil_vote.txt", encoding="utf8").open() as file:
+        with Path(f"{TEMPLATES_DIR}/highcouncil_vote.txt").open() as file:
             message = file.read()
 
             return message.format(
@@ -131,7 +130,7 @@ class Election:
         Returns:
             str: Message to send
         """
-        with Path(f"{TEMPLATES_DIR}/vote_start.txt", encoding="utf8").open() as file:
+        with Path(f"{TEMPLATES_DIR}/vote_start.txt").open() as file:
             message = file.read()
             vote_end: datetime = get_datetime(settings.election_cycles[self.cycle].voting_end)
 
@@ -144,29 +143,20 @@ class Election:
     async def check_date(self) -> None:
         """Function checks current date to see if something needs to be run."""
         today = datetime.now(tz=UTC)
-        dakiny_logger.debug("Checking date.")
 
         # check all dates if action is needed
         if today.date() == self.election_start.date():
-            dakiny_logger.debug("Election start.")
             await self.election_start_action()
         elif today.date() == self.voting_start.date():
-            dakiny_logger.debug("Voting start.")
             await self.voting_start_action()
         elif (self.voting_end - timedelta(3)).date() <= today.date() < self.voting_end.date():
-            dakiny_logger.debug("Election reminder.")
             await self.election_reminder()
         elif today.date() == self.voting_end.date():
-            dakiny_logger.debug("Voting end.")
             await self.voting_end_action()
         elif today.date() == self.highcouncil_election_start.date():
-            dakiny_logger.debug("Highcouncil election start.")
             await self.highcouncil_election_start_action()
         elif today.date() == self.term_start.date():
-            dakiny_logger.debug("Term start")
             await self.term_start_action()
-        else:
-            dakiny_logger.warning("Check date didn't do anything. This should never happen.")
 
     async def election_start_action(self) -> None:
         """Performs required actions for when the election cycle starts."""

dakiny_bot/classes/nominate_highcouncil_views.py

@@ -1,11 +1,7 @@
 """Contains various views to be used in the high council nomination process."""
 
 import nextcord
-from nextcord.interactions import Interaction
-from sqlalchemy import select
-from sqlalchemy.orm import Session
-
-from dakiny_bot.DakinySettings import settings
+from dakiny_bot.dakiny_settings import settings
 from dakiny_bot.database.sql_data_classes import CouncilMembers, engine
 from dakiny_bot.utils import (
     NOMINEE_SPLITTER,
@@ -13,6 +9,9 @@ from dakiny_bot.utils import (
     decorate_dm_nomination,
     get_election_name,
 )
+from nextcord.interactions import Interaction
+from sqlalchemy import select
+from sqlalchemy.orm import Session
 
 
 class NominateDMModal(nextcord.ui.Modal):

dakiny_bot/classes/nominate_views.py

@@ -1,14 +1,13 @@
 """Contains various views to be used in the nomination process."""
 
 import nextcord
+from dakiny_bot.dakiny_settings import settings
+from dakiny_bot.database.sql_data_classes import CouncilMembers, engine
+from dakiny_bot.utils import NOMINEE_SPLITTER, decorate_nomination, get_election_name
 from nextcord.interactions import Interaction
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
-from dakiny_bot.DakinySettings import settings
-from dakiny_bot.database.sql_data_classes import CouncilMembers, engine
-from dakiny_bot.utils import NOMINEE_SPLITTER, decorate_nomination, get_election_name
-
 
 class NominateModal(nextcord.ui.Modal):
     """

dakiny_bot/classes/voting_highcouncil_views.py

@@ -1,12 +1,7 @@
 """Contains various views to be used while voting for high council. Controls the logic when performing the vote."""
 
 import nextcord
-from nextcord import SelectOption
-from nextcord.interactions import Interaction
-from sqlalchemy import exc, select, update
-from sqlalchemy.orm import Session
-
-from dakiny_bot.DakinySettings import settings
+from dakiny_bot.dakiny_settings import settings
 from dakiny_bot.database.sql_data_classes import (
     CouncilMembers,
     ElectionInformation,
@@ -14,6 +9,10 @@ from dakiny_bot.database.sql_data_classes import (
     engine,
 )
 from dakiny_bot.utils import VoteType, build_highcouncil_votes_str, get_election_name
+from nextcord import SelectOption
+from nextcord.interactions import Interaction
+from sqlalchemy import exc, select, update
+from sqlalchemy.orm import Session
 
 
 class VoteSelect(nextcord.ui.StringSelect):

dakiny_bot/classes/voting_views.py

@@ -1,12 +1,7 @@
 """Contains various views to be used while voting. Controls the logic when performing the vote."""
 
 import nextcord
-from nextcord import SelectOption
-from nextcord.interactions import Interaction
-from sqlalchemy import exc, select, update
-from sqlalchemy.orm import Session
-
-from dakiny_bot.DakinySettings import settings
+from dakiny_bot.dakiny_settings import settings
 from dakiny_bot.database.sql_data_classes import (
     CouncilMembers,
     ElectionInformation,
@@ -14,6 +9,10 @@ from dakiny_bot.database.sql_data_classes import (
     engine,
 )
 from dakiny_bot.utils import VoteType, build_votes_str, get_election_name
+from nextcord import SelectOption
+from nextcord.interactions import Interaction
+from sqlalchemy import exc, select, update
+from sqlalchemy.orm import Session
 
 
 class VoteSelect(nextcord.ui.StringSelect):

dakiny_bot/cogs/clan_messages/__init__.py

@@ -6,12 +6,10 @@ from typing import TYPE_CHECKING
 import uvicorn
 from fastapi import FastAPI
 from git import Repo
-from git.exc import GitCommandError
 from nextcord.ext import commands
 
 from dakiny_bot.classes.gitea_webhook import GiteaWebhook
-from dakiny_bot.DakinySettings import settings
-from dakiny_bot.logger import dakiny_logger
+from dakiny_bot.dakiny_settings import settings
 from dakiny_bot.utils import REPO_DIR, edit_clan_council_info, update_clan_messages
 
 if TYPE_CHECKING:
@@ -57,12 +55,7 @@ class ClanMessages(commands.Cog, name="Clan Messages"):
         template_updates = {file.split("/")[1] for file in modified_files if "message_templates" in file}
         channel_updates = {file.split("/")[1] for file in modified_files if file.split("/")[1] not in template_updates}
 
-        try:
-            self.origin.pull()
-        except GitCommandError:
-            # I think the git connection timed out. Get a new one.
-            dakiny_logger.info("Refreshing git connection.")
-            self.repo_setup()
+        self.origin.pull()
         guild: nextcord.Guild = self.bot.get_guild(settings.params.guild_id)
 
         await update_clan_messages(guild, channel_updates)

dakiny_bot/cogs/commands/record.py

@@ -4,7 +4,7 @@ import nextcord
 from discord import TextInputStyle
 from nextcord.ext import commands
 
-from dakiny_bot.DakinySettings import settings
+from dakiny_bot.dakiny_settings import settings
 from dakiny_bot.utils import GUILDS, MAX_DISCORD_MESSAGE_LENGTH, PointType, record_points
 
 

dakiny_bot/cogs/commands/request.py

@@ -4,7 +4,7 @@ import nextcord
 from nextcord.ext import commands
 from sqlalchemy.orm import Session
 
-from dakiny_bot.DakinySettings import settings
+from dakiny_bot.dakiny_settings import settings
 from dakiny_bot.database.sql_data_classes import Presences, engine
 
 

dakiny_bot/cogs/commands/settings.py

@@ -3,7 +3,7 @@
 import nextcord
 from nextcord.ext import commands
 
-from dakiny_bot.DakinySettings import settings
+from dakiny_bot.dakiny_settings import settings
 from dakiny_bot.utils import GUILDS
 
 

dakiny_bot/cogs/commands/test.py

@@ -4,8 +4,7 @@ import nextcord
 from nextcord.ext import application_checks, commands
 
 from dakiny_bot.classes.election import Election
-from dakiny_bot.cogs.loops import daily_loop
-from dakiny_bot.DakinySettings import settings
+from dakiny_bot.dakiny_settings import settings
 from dakiny_bot.utils import GUILDS, get_active_election_cycle, get_quarter_name
 
 ME = 206602713511886849
@@ -120,8 +119,11 @@ class TestCog(commands.Cog, name="Test commands."):
         Args:
             interaction (nextcord.Interaction): Interaction with the message.
         """
-        dl = daily_loop.DailyLoop(self.bot)
-        await dl.daily_loop()
+        cycle = Election(
+            get_active_election_cycle(),
+            self.bot.get_guild(settings.params.guild_id),
+        )
+        await cycle.check_date()
         await interaction.send("Test command sent.", ephemeral=True)
 
     @test.subcommand()

dakiny_bot/cogs/loops/daily_loop.py

@@ -11,9 +11,8 @@ from sqlalchemy.orm import Session
 
 from dakiny_bot.app import birthday_list
 from dakiny_bot.classes.election import Election
-from dakiny_bot.DakinySettings import settings
+from dakiny_bot.dakiny_settings import settings
 from dakiny_bot.database.sql_data_classes import UserBirthday, engine
-from dakiny_bot.logger import dakiny_logger
 from dakiny_bot.utils import get_active_election_cycle
 
 if TYPE_CHECKING:
@@ -44,10 +43,8 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
         an active election, runs the check_date() function for the election to perform actions. Finally checks if the
         election is over to delete the current election object.
         """
-        dakiny_logger.debug("Daily loop. Current election: %s.", self.current_election)
         if self.current_election is None:
             self.current_election = self.get_election()
-            dakiny_logger.debug("Current election: %s.", self.current_election)
 
         if self.current_election is not None:
             await self.current_election.check_date()
@@ -81,17 +78,13 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
             Election: Current election cycle, None if there is no election happening.
         """
         cycle = get_active_election_cycle()
-        dakiny_logger.debug("Current cycle: %s.", cycle)
 
         # prevent exception from using cycle as an Int in an array
         if cycle is None:
-            dakiny_logger.info("Cycle was None. Returning without an election.")
             return None
 
         election = Election(cycle, self.bot.get_guild(settings.params.guild_id))
 
-        dakiny_logger.debug("Election active: %s", election.active)
-
         return election if election.active else None
 
     def update_birthdays(self) -> None:

dakiny_bot/cogs/message_listener/__init__.py

@@ -4,7 +4,6 @@ import nextcord
 from nextcord.ext import commands
 
 from dakiny_bot.app import birthday_list
-from dakiny_bot.DakinySettings import settings
 
 
 class SubmissionListener(commands.Cog, name="Message Listener"):
@@ -17,15 +16,7 @@ class SubmissionListener(commands.Cog, name="Message Listener"):
     async def on_message(self, message: nextcord.Message) -> None:
         """Listener for message creation. Adds score and attachments to submission."""
         # don't want to process any messages from bot.
-        if message.author.id == self.bot.user.id:  # pyright: ignore[reportOptionalMemberAccess]
-            return
-
-        # Ban all members who message in this channel. Everyone in guild is a member, so shouldn't miss a ban
-        # due to message.author not being a nextcord.Member object.
-        if message.channel.id == settings.channel_ids.ban and isinstance(message.author, nextcord.Member):
-            await message.author.ban(
-                delete_message_seconds=30 * 60, reason="Probable spam. The ban channel was messaged."
-            )
+        if message.author.id == self.bot.user.id:
             return
 
         await birthday_action(message)
@@ -40,7 +31,7 @@ def setup(bot: commands.Bot) -> None:
 
 async def birthday_action(message: nextcord.Message) -> None:
     """
-    Checks a message's author and mentions to see if they are in the birthday list.
+    Checks a message's auther and mentions to see if they are in the birthday list.
 
     Args:
         message (nextcord.Message): The message to check for a birthday person.

dakiny_bot/dakiny_settings.py

@@ -17,7 +17,6 @@ class ChannelIds:
     event_post: int
     general: int
     voting: int
-    ban: int
 
 
 @dataclass
@@ -84,4 +83,5 @@ class DakinySettings(YAMLWizard):
         self.to_yaml_file(CONFIG_LOCATION)
 
 
-settings = DakinySettings.from_yaml_file(CONFIG_LOCATION)
+tmp = DakinySettings.from_yaml_file(CONFIG_LOCATION)
+settings: DakinySettings = tmp[0] if isinstance(tmp, list) else tmp

dakiny_bot/logger.py

@@ -1,13 +0,0 @@
-"""Creates logger for Dakiny bot."""
-
-import logging
-import os
-import sys
-
-dakiny_logger = logging.getLogger("default")
-dakiny_logger.setLevel(logging.DEBUG if os.getenv("DEBUG") == "true" else logging.INFO)
-handler = logging.StreamHandler(sys.stdout)
-handler.setFormatter(
-    logging.Formatter("%(asctime)s:%(levelname)s [%(filename)s:%(lineno)s - %(funcName)20s() ] %(message)s")
-)
-dakiny_logger.addHandler(handler)

dakiny_bot/utils.py

@@ -20,9 +20,8 @@ from dakiny_bot.database.sql_data_classes import (
     Votes,
     engine,
 )
-from dakiny_bot.logger import dakiny_logger
 
-from .DakinySettings import settings
+from .dakiny_settings import settings
 
 NOMINEE_SPLITTER = "========================================\n\n"
 REPO_DIR = "./dakiny-messages"
@@ -56,10 +55,8 @@ def get_datetime(month_day: str) -> datetime:
 
     if today.month == calendar.JANUARY and month > calendar.MARCH:
         year -= 1
-    try:
-        return datetime(year, month, day, tzinfo=UTC)
-    except ValueError:
-        dakiny_logger.warning("Invalid month day: %s.", month_day)
+
+    return datetime(year, month, day, tzinfo=UTC)
 
 
 def get_election_name() -> str:
@@ -69,7 +66,10 @@ def get_election_name() -> str:
     Returns:
         str: the name of the election cycle
     """
-    cycle = get_active_election_cycle()
+    if cycle := get_active_election_cycle() is None:
+        # undefined behavior
+        print("Did not find an active election cycle. Undefined behavior with return string.")  # noqa: T201
+        return "No-active-election-cycle"
     current_cycle = settings.election_cycles[cycle]
     return f"vote-{get_datetime(current_cycle.term_start).year}-{current_cycle.name}"
 
@@ -81,13 +81,16 @@ def get_quarter_name() -> str:
     Returns:
         str: the name of the cycle.
     """
-    cycle = get_quarter_cycle()
+    if cycle := get_quarter_cycle() is None:
+        # undefined behavior
+        print("Did not find a quarter cycle. Undefined behavior with return string.")  # noqa: T201
+        return "no-quarter-cycle"
     current_cycle = settings.election_cycles[cycle]
 
     return f"{get_datetime(current_cycle.term_start).year}-{current_cycle.name}"
 
 
-def get_active_election_cycle() -> int:
+def get_active_election_cycle() -> int | None:
     """
     Returns index for active election. An election is considered active between the election start and the term start.
 
@@ -95,21 +98,19 @@ def get_active_election_cycle() -> int:
         int: cycle index for active election. None for no active cycle
     """
     today = datetime.now(tz=UTC)
-    dakiny_logger.debug("Today is %s", today)
 
     for cycle, election in enumerate(settings.election_cycles):
         if (
             today.date() >= get_datetime(election.election_start).date()
             and today.date() <= get_datetime(election.term_start).date()
         ):
-            dakiny_logger.debug("Cycle is %d", cycle)
             return cycle
 
     # It isn't a current election, get the quarter
     return get_quarter_cycle()
 
 
-def get_quarter_cycle() -> int:
+def get_quarter_cycle() -> int | None:
     """
     Returns the index for the current cycle/quarter. Defined as between term start and end.
 
@@ -119,16 +120,13 @@ def get_quarter_cycle() -> int:
         int: cycle index for current cycle.
     """
     today = datetime.now(tz=UTC)
-    dakiny_logger.debug("Today is %s", today)
     for cycle, election in enumerate(settings.election_cycles):
         if (
             today.date() >= get_datetime(election.term_start).date()
             and today.date() <= get_datetime(election.term_end).date()
         ):
-            dakiny_logger.debug("Cycle is %d", cycle)
             return cycle
 
-    dakiny_logger.debug("Quarter cycle is None.")
     return None
 
 

pyproject.toml

@@ -1,18 +1,17 @@
 [project]
 authors = [{ name = "imcompiling", email = "[email protected]" }]
-requires-python = "<4.0,>=3.13"
+requires-python = "<4.0,>=3.12"
 dependencies = [
     "gitpython<4.0.0,>=3.1.43",
     "fastapi<1.0.0,>=0.111.0",
     "nextcord<3.0.0,>=2.6.0",
-    "pandas<3.1.0,>=3.0.6",
+    "pandas<3.0.0,>=2.2.2",
     "pytz<2025.3,>=2025.2",
     "sqlalchemy<3.0.0,>=2.0.30",
     "aiofiles<24.0.0,>=23.2.1",
-    "setuptools<80.10.3,>=80.10.2",
+    "setuptools<71.0.0,>=70.0.0",
     "dataclass-wizard[yaml]>=0.22.3,<1.0.0",
     "uvicorn>=0.34.0",
-    "audioop-lts>=0.2.1",
 ]
 name = "dakiny-bot"
 version = "0.1.0"
@@ -20,7 +19,12 @@ description = "Dakiny's Discord Bot."
 readme = "README.md"
 
 [dependency-groups]
-dev = ["ruff<1.0.0,>=0.6.9"]
+dev = [
+    "freezegun>=1.5.1",
+    "pytest>=8.3.5",
+    "pytest-cov>=6.1.1",
+    "ruff<1.0.0,>=0.6.9",
+]
 
 [tool.ruff]
 # Exclude a variety of commonly ignored directories.

renovate.json

@@ -1,11 +1,8 @@
 {
     "$schema": "https://docs.renovatebot.com/renovate-schema.json",
     "lockFileMaintenance": {
-        "automerge": true
-    },
-    "major": {
-        "automerge": false,
-        "automergeType": "pr"
+        "automerge": true,
+        "enabled": true
     },
     "minor": {
         "automerge": true,
@@ -19,11 +16,5 @@
         "automerge": true,
         "automergeType": "branch"
     },
-    "ignoreTests": true,
-    "dockerfile": {
-        "minor": {
-            "automerge": false,
-            "automergeType": "pr"
-        }
-    }
+    "ignoreTests": true
 }