Update dependency pandas to v3

Reviewed-on: #107

.gitea/workflows/build_develop.yaml

@@ -5,19 +5,21 @@ on:
     branches:
       - '*'
       - '!main'
+    paths-ignore:
+        - "README.md"
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install Docker
         uses: https://github.com/papodaca/install-docker-action@v1
       - name: Log into container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: gitea.cheezers.org
           username: imcompiling

.gitea/workflows/build_latest.yaml

@@ -3,19 +3,21 @@ name: build_latest
 on:
   push:
     branches: [main]
+    paths-ignore:
+        - "README.md"
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install Docker
         uses: https://github.com/papodaca/install-docker-action@v1
       - name: Log into container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: gitea.cheezers.org
           username: imcompiling

.gitea/workflows/build_release.yaml

@@ -9,13 +9,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install Docker
         uses: https://github.com/papodaca/install-docker-action@v1
       - name: Log into container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: gitea.cheezers.org
           username: imcompiling

.gitignore

@@ -105,7 +105,6 @@ venv/
 ENV/
 env.bak/
 venv.bak/
-poetry.lock
 
 # Spyder project settings
 .spyderproject

.vscode/launch.json

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

.vscode/settings.json

@@ -3,6 +3,8 @@
         "aiofiles",
         "autofilled",
         "blurple",
+        "CAKEDAY",
+        "cakedays",
         "CLANLEADER",
         "Dakiny",
         "DISCORDMANAGER",

Dockerfile

@@ -1,10 +1,10 @@
-FROM python:3.12.3-slim
+FROM python:3.13.7-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.6.5 /uv /uvx /bin/
+COPY --from=ghcr.io/astral-sh/uv:0.9.28 /uv /uvx /bin/
 
 COPY . /home
 

dakiny_bot/DakinySettings.py

@@ -17,6 +17,7 @@ class ChannelIds:
     event_post: int
     general: int
     voting: int
+    ban: int
 
 
 @dataclass

dakiny_bot/app.py

@@ -1,6 +1,5 @@
 """Main file for bot."""
 
-import logging
 import os
 
 import nextcord
@@ -16,12 +15,6 @@ from .DakinySettings 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."""
@@ -38,8 +31,8 @@ def run() -> None:
     bot = commands.Bot(intents=intents)
 
     # Get the modules of all cogs whose directory structure is ./cogs/<module_name>
-    for folder in os.listdir("cogs"):
-        bot.load_extension(f"cogs.{folder}")
+    for folder in os.listdir("dakiny_bot/cogs"):
+        bot.load_extension(f"dakiny_bot.cogs.{folder}")
 
     @bot.listen()
     async def on_ready() -> None:

dakiny_bot/classes/election.py

@@ -5,9 +5,6 @@ from datetime import UTC, datetime, timedelta
 from pathlib import Path
 
 import nextcord
-from sqlalchemy import select, true, update
-from sqlalchemy.orm import Session
-
 from dakiny_bot.classes.nominate_highcouncil_views import NominateHighCouncilView
 from dakiny_bot.classes.nominate_views import NominateView
 from dakiny_bot.classes.voting_highcouncil_views import VoteHighcouncilView
@@ -19,6 +16,7 @@ from dakiny_bot.database.sql_data_classes import (
     Votes,
     engine,
 )
+from dakiny_bot.logger import dakiny_logger
 from dakiny_bot.utils import (
     TEMPLATES_DIR,
     VoteType,
@@ -28,6 +26,8 @@ from dakiny_bot.utils import (
     get_datetime,
     get_election_name,
 )
+from sqlalchemy import select, true, update
+from sqlalchemy.orm import Session
 
 REQUIRED_VOTES_TO_BE_ELECTED = 3
 
@@ -144,20 +144,29 @@ 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."""
@@ -201,7 +210,7 @@ class Election:
         election_thread: nextcord.Thread = self.guild.get_thread(self.get_election_info().ThreadId)
         await election_thread.send(message)
         vote_msg = await election_thread.send(
-            build_votes_str(settings, self.guild),
+            build_votes_str(self.guild),
             view=VoteView(self.guild),
         )
 

dakiny_bot/classes/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.ruff]
 # Extend the `pyproject.toml` file in the parent directory...
-extend = "../pyproject.toml"
+extend = "../../pyproject.toml"
 
 # Exclude a variety of commonly ignored directories.
 exclude = ["gitea_webhook.py"]

dakiny_bot/classes/voting_views.py

@@ -67,7 +67,7 @@ class VoteSelect(nextcord.ui.StringSelect):
                 session.execute(stmt)
                 session.commit()
 
-        vote_message_str = build_votes_str(settings, interaction.guild)
+        vote_message_str = build_votes_str(interaction.guild)
         vote_msg: nextcord.Message = await interaction.channel.fetch_message(vote_msg_id)
         await vote_msg.edit(content=vote_message_str)
 

dakiny_bot/cogs/clan_messages/__init__.py

@@ -6,10 +6,12 @@ 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.utils import REPO_DIR, edit_clan_council_info, update_clan_messages
 
 if TYPE_CHECKING:
@@ -55,7 +57,12 @@ 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}
 
-        self.origin.pull()
+        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()
         guild: nextcord.Guild = self.bot.get_guild(settings.params.guild_id)
 
         await update_clan_messages(guild, channel_updates)

dakiny_bot/cogs/commands/test.py

@@ -4,6 +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.utils import GUILDS, get_active_election_cycle, get_quarter_name
 
@@ -119,11 +120,8 @@ class TestCog(commands.Cog, name="Test commands."):
         Args:
             interaction (nextcord.Interaction): Interaction with the message.
         """
-        cycle = Election(
-            get_active_election_cycle(),
-            self.bot.get_guild(settings.params.guild_id),
-        )
-        await cycle.check_date()
+        dl = daily_loop.DailyLoop(self.bot)
+        await dl.daily_loop()
         await interaction.send("Test command sent.", ephemeral=True)
 
     @test.subcommand()

dakiny_bot/cogs/loops/daily_loop.py

@@ -13,6 +13,7 @@ from dakiny_bot.app import birthday_list
 from dakiny_bot.classes.election import Election
 from dakiny_bot.DakinySettings 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:
@@ -20,6 +21,8 @@ if TYPE_CHECKING:
 
 KANDY = 239547993106284544
 
+IGNORE_CAKEDAY = [266378407682506754]
+
 
 class DailyLoop(commands.Cog, name="Daily Loop"):
     """Class for performing daily functions."""
@@ -41,8 +44,10 @@ 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()
@@ -76,13 +81,17 @@ 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:
@@ -112,7 +121,11 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
         announce_channel: nextcord.TextChannel = guild.get_channel(settings.channel_ids.general)
 
         cakedays: list[nextcord.Member] = [
-            human for human in guild.humans if human.joined_at.month == today.month and human.joined_at.day == today.day
+            human
+            for human in guild.humans
+            if human.joined_at.month == today.month
+            and human.joined_at.day == today.day
+            and human.id not in IGNORE_CAKEDAY
         ]
 
         for member in cakedays:

dakiny_bot/cogs/message_listener/__init__.py

@@ -4,6 +4,7 @@ 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"):
@@ -16,7 +17,15 @@ 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:
+        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."
+            )
             return
 
         await birthday_action(message)
@@ -31,7 +40,7 @@ def setup(bot: commands.Bot) -> None:
 
 async def birthday_action(message: nextcord.Message) -> None:
     """
-    Checks a message's auther and mentions to see if they are in the birthday list.
+    Checks a message's author 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/database/__init__.py

@@ -0,0 +1 @@
+"""Module controls connection to Dakiny bot database."""

dakiny_bot/database/create_database.py

@@ -7,7 +7,7 @@ if not Path("database/dakiny.db").exists():
     with sqlite3.connect("database/dakiny.db") as con:
         cur = con.cursor()
 
-        with Path("database_setup/database.sql", encoding="utf-8").open() as file:
+        with Path("dakiny_bot/database/database.sql").open() as file:
             database_script = file.read()
             cur.executescript(database_script)
             con.commit()

dakiny_bot/database/pyproject.toml

@@ -1,7 +0,0 @@
-[tool.ruff]
-# Extend the `pyproject.toml` file in the parent directory...
-extend = "../pyproject.toml"
-
-[tool.ruff.lint]
-# ignore implicit-namespace-package in this directory.
-ignore = ["INP001"]

dakiny_bot/logger.py

@@ -0,0 +1,13 @@
+"""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,6 +20,7 @@ from dakiny_bot.database.sql_data_classes import (
     Votes,
     engine,
 )
+from dakiny_bot.logger import dakiny_logger
 
 from .DakinySettings import settings
 
@@ -34,20 +35,20 @@ VoteType = StrEnum("VoteType", ["COUNCIL", "DISCORDMANAGER", "CLANLEADER"])
 PointType = StrEnum("PointType", ["CLAN", "EVENT"])
 
 
-def get_datetime(day: str) -> datetime:
+def get_datetime(month_day: str) -> datetime:
     """
     Takes in a string month and day and returns a datetime object of that Month/Day this year.
 
     Args:
-        day (str): Month/Day in that format.
+        month_day (str): Month/Day in that format.
 
     Returns:
         datetime: Datetime representation of Month/Day.
     """
     today = datetime.now(tz=UTC).date()
     year = today.year
-    month = int(day.split("/")[0])
-    day = int(day.split("/")[1])
+    month = int(month_day.split("/")[0])
+    day = int(month_day.split("/")[1])
 
     # ensure that year rolls over if current month is December and the next month is less than 12.
     if today.month == calendar.DECEMBER and month < calendar.OCTOBER:
@@ -55,8 +56,10 @@ def get_datetime(day: str) -> datetime:
 
     if today.month == calendar.JANUARY and month > calendar.MARCH:
         year -= 1
-
-    return datetime(year, month, day, tzinfo=UTC)
+    try:
+        return datetime(year, month, day, tzinfo=UTC)
+    except ValueError:
+        dakiny_logger.warning("Invalid month day: %s.", month_day)
 
 
 def get_election_name() -> str:
@@ -92,12 +95,14 @@ 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
@@ -114,13 +119,16 @@ 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,17 +1,18 @@
 [project]
 authors = [{ name = "imcompiling", email = "[email protected]" }]
-requires-python = "<4.0,>=3.12"
+requires-python = "<4.0,>=3.13"
 dependencies = [
     "gitpython<4.0.0,>=3.1.43",
     "fastapi<1.0.0,>=0.111.0",
     "nextcord<3.0.0,>=2.6.0",
-    "pandas<3.0.0,>=2.2.2",
-    "pytz<2025.0,>=2024.1",
+    "pandas<3.1.0,>=3.0.6",
+    "pytz<2025.3,>=2025.2",
     "sqlalchemy<3.0.0,>=2.0.30",
     "aiofiles<24.0.0,>=23.2.1",
-    "setuptools<71.0.0,>=70.0.0",
+    "setuptools<80.10.3,>=80.10.2",
     "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"

renovate.json

@@ -0,0 +1,29 @@
+{
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "lockFileMaintenance": {
+        "automerge": true
+    },
+    "major": {
+        "automerge": false,
+        "automergeType": "pr"
+    },
+    "minor": {
+        "automerge": true,
+        "automergeType": "branch"
+    },
+    "patch": {
+        "automerge": true,
+        "automergeType": "branch"
+    },
+    "pin": {
+        "automerge": true,
+        "automergeType": "branch"
+    },
+    "ignoreTests": true,
+    "dockerfile": {
+        "minor": {
+            "automerge": false,
+            "automergeType": "pr"
+        }
+    }
+}